| Message ID | ad778fbd7f61105b273d2a49dc91662c4bb255d7.1452105878.git.shuahkh@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Wed, 6 Jan 2016 13:26:51 -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 | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > index 75cbe92..53a96ae 100644 > --- a/include/uapi/linux/media.h > +++ b/include/uapi/linux/media.h > @@ -89,6 +89,13 @@ struct media_device_info { > #define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33) > > /* > + * ALSA entities MEDIA_ENT_F_AUDIO_IO is for Capture and Playback > +*/ > +#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) Please document at KernelDoc. > + > +/* > * 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: > @@ -130,7 +137,7 @@ struct media_device_info { > #define MEDIA_ENT_T_DEVNODE MEDIA_ENT_F_OLD_BASE > #define MEDIA_ENT_T_DEVNODE_V4L MEDIA_ENT_F_IO_V4L > #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2) > -#define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_T_DEVNODE + 3) > +#define MEDIA_ENT_T_DEVNODE_ALSA MEDIA_ENT_F_AUDIO_IO Please preserve the old number here, as we don't want to break kABI. > #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) > > #define MEDIA_ENT_T_UNKNOWN MEDIA_ENT_F_UNKNOWN -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 75cbe92..53a96ae 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -89,6 +89,13 @@ struct media_device_info { #define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33) /* + * ALSA entities MEDIA_ENT_F_AUDIO_IO is for Capture and Playback +*/ +#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: @@ -130,7 +137,7 @@ struct media_device_info { #define MEDIA_ENT_T_DEVNODE MEDIA_ENT_F_OLD_BASE #define MEDIA_ENT_T_DEVNODE_V4L MEDIA_ENT_F_IO_V4L #define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2) -#define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_T_DEVNODE + 3) +#define MEDIA_ENT_T_DEVNODE_ALSA MEDIA_ENT_F_AUDIO_IO #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) #define MEDIA_ENT_T_UNKNOWN MEDIA_ENT_F_UNKNOWN
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 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)