On 19/11/12 18:36, Takashi Iwai wrote:
At Mon, 19 Nov 2012 18:12:42 +0000, Liam Girdwood wrote:
This patch adds initial support for firmware based kcontrols by allowing soc.h to be included by any userspace firmware generation tools and assigns IDs to the standard ASoC kcontrol types using the kcontrol_new index and IDs to kcontrol get/put/info functions.
Signed-off-by: Liam Girdwood lrg@ti.com
The user-space headers are recently moved to include/uapi/sound, so this new stuff should follow that rule.
For the sound stuff, the patch is queued for 3.8 in for-next branch. Please rebase on it.
Done, but I'm now seeing some type conflict errors when building my userspace tools (i.e. after moving to include uapi/sound/asound.h from sound/asound.h).
e.g.
#include <stdlib.h> #include <uapi/sound/asound.h>
int main () { }
gives :-
gcc uapi-test.c -I ~/source/linux.git/include In file included from /home/lrg/source/linux.git/include/uapi/sound/asound.h:26:0, from uapi-test.c:2: /home/lrg/source/linux.git/include/linux/types.h:14:26: error: conflicting types for ‘fd_set’ In file included from /usr/include/x86_64-linux-gnu/sys/types.h:220:0, from /usr/include/stdlib.h:320, from uapi-test.c:1: /usr/include/x86_64-linux-gnu/sys/select.h:76:5: note: previous declaration of ‘fd_set’ was here In file included from /home/lrg/source/linux.git/include/uapi/sound/asound.h:26:0, from uapi-test.c:2: /home/lrg/source/linux.git/include/linux/types.h:15:25: error: conflicting types for ‘dev_t’ In file included from /usr/include/stdlib.h:320:0, from uapi-test.c:1: /usr/include/x86_64-linux-gnu/sys/types.h:61:17: note: previous declaration of ‘dev_t’ was here
etc.....
I'm guessing here you have this building already with uapi alsa-lib ? Although I cant see any alsa-lib changes in git to use the new header.
Thanks
Liam