OSDN Git Service

Merge kernel uapi/sound/asound.h and asequencer.h
authorTakashi Iwai <tiwai@suse.de>
Mon, 26 Nov 2012 16:54:29 +0000 (17:54 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 26 Nov 2012 17:02:17 +0000 (18:02 +0100)
commit9b5beef1ddb3fa49e2c4b1d0770e70068ae93b1c
tree26896b049fd02ee0ef9bca7f47b03c881a9d3fa7
parent3fd4ab9be0db7c7430ebd258f2717a976381715d
Merge kernel uapi/sound/asound.h and asequencer.h

Instead of keeping modified asound.h and asequencer.h, copy the files
in the kernel include/uapi/sound as is, and give some renames for
avoiding conflicts with alsa-lib's definitions.

Some structs, unions and typedefs in asound.h and asequencer.h are
once renamed in local.h before inclusion, then renamed back again.

A bonus by this action is that some local codes don't have to refer to
sndrv_xxx any longer.  However, some codes like src/seq/seq.c need
explicit cast because of unavoidable conflicts of struct types.

Another significant change is that now snd_pcm_sw_params.period_event
field is removed.  Instead, try to access the last reserved field
internally.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
12 files changed:
include/local.h
include/sound/asequencer.h
include/sound/asound.h
src/control/control_hw.c
src/pcm/pcm.c
src/pcm/pcm_hw.c
src/pcm/pcm_local.h
src/pcm/pcm_params.c
src/seq/seq.c
src/seq/seq_hw.c
src/seq/seq_local.h
src/timer/timer_hw.c