Re: [PATCH 02/31] media: Add ALSA Media Controller function entities

From: Mauro Carvalho Chehab
Date: Thu Jan 28 2016 - 10:02:55 EST


Em Wed, 6 Jan 2016 13:26:51 -0700
Shuah Khan <shuahkh@xxxxxxxxxxxxxxx> escreveu:

> Add ALSA Media Controller capture, playback, and mixer
> function entity defines.
>
> Signed-off-by: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx>
> ---
> 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