Messages in this thread | | | Date | Wed, 17 Feb 2016 10:25:05 -0200 | From | Mauro Carvalho Chehab <> | Subject | Re: [PATCH v3 04/22] media: Add ALSA Media Controller function entities |
| |
Em Thu, 11 Feb 2016 16:41:20 -0700 Shuah Khan <shuahkh@osg.samsung.com> escreveu:
> Add ALSA Media Controller capture, playback, and mixer > function entity defines. > > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> > --- > include/uapi/linux/media.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > index 3cc0366..449462e 100644 > --- a/include/uapi/linux/media.h > +++ b/include/uapi/linux/media.h > @@ -98,6 +98,13 @@ struct media_device_info { > #define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 42) > > /* > + * Audio Entity Functions > + */ > +#define MEDIA_ENT_F_AUDIO_CAPTURE (MEDIA_ENT_F_BASE + 200) > +#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 201) > +#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 202) > + > +/* > * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and > * MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility > * with the legacy v1 API.The number range is out of range by purpose:
Looks OK to me.
This won't apply anymore on master, because we changed the numberspace, but it is a trivial conflict. No need to rebase.
Takashi,
If OK for you, please ack.
-- Thanks, Mauro
| |