Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1336377

Re: [PATCH v3 02/22] uapi/media.h: Declare interface types for ALSA

Show all headers | View raw

Em Thu, 11 Feb 2016 16:41:18 -0700
Shuah Khan <shuahkh@osg.samsung.com> escreveu:

> Declare the interface types to be used on alsa for
> the new G_TOPOLOGY ioctl.
> 
> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> ---
>  drivers/media/media-entity.c | 16 ++++++++++++++++
>  include/uapi/linux/media.h   | 10 ++++++++++
>  2 files changed, 26 insertions(+)
> 
> diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
> index f2e4360..6179543 100644
> --- a/drivers/media/media-entity.c
> +++ b/drivers/media/media-entity.c
> @@ -65,6 +65,22 @@ static inline const char *intf_type(struct media_interface *intf)
>  		return "v4l2-subdev";
>  	case MEDIA_INTF_T_V4L_SWRADIO:
>  		return "swradio";
> +	case MEDIA_INTF_T_ALSA_PCM_CAPTURE:
> +		return "pcm-capture";
> +	case MEDIA_INTF_T_ALSA_PCM_PLAYBACK:
> +		return "pcm-playback";
> +	case MEDIA_INTF_T_ALSA_CONTROL:
> +		return "alsa-control";
> +	case MEDIA_INTF_T_ALSA_COMPRESS:
> +		return "compress";
> +	case MEDIA_INTF_T_ALSA_RAWMIDI:
> +		return "rawmidi";
> +	case MEDIA_INTF_T_ALSA_HWDEP:
> +		return "hwdep";
> +	case MEDIA_INTF_T_ALSA_SEQUENCER:
> +		return "sequencer";
> +	case MEDIA_INTF_T_ALSA_TIMER:
> +		return "timer";
>  	default:
>  		return "unknown-intf";
>  	}
> diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
> index c9eb42a..3cc0366 100644
> --- a/include/uapi/linux/media.h
> +++ b/include/uapi/linux/media.h
> @@ -265,6 +265,7 @@ struct media_links_enum {
>  
>  #define MEDIA_INTF_T_DVB_BASE	0x00000100
>  #define MEDIA_INTF_T_V4L_BASE	0x00000200
> +#define MEDIA_INTF_T_ALSA_BASE	0x00000300
>  
>  /* Interface types */
>  
> @@ -280,6 +281,15 @@ struct media_links_enum {
>  #define MEDIA_INTF_T_V4L_SUBDEV (MEDIA_INTF_T_V4L_BASE + 3)
>  #define MEDIA_INTF_T_V4L_SWRADIO (MEDIA_INTF_T_V4L_BASE + 4)
>  
> +#define MEDIA_INTF_T_ALSA_PCM_CAPTURE   (MEDIA_INTF_T_ALSA_BASE)
> +#define MEDIA_INTF_T_ALSA_PCM_PLAYBACK  (MEDIA_INTF_T_ALSA_BASE + 1)
> +#define MEDIA_INTF_T_ALSA_CONTROL       (MEDIA_INTF_T_ALSA_BASE + 2)
> +#define MEDIA_INTF_T_ALSA_COMPRESS      (MEDIA_INTF_T_ALSA_BASE + 3)
> +#define MEDIA_INTF_T_ALSA_RAWMIDI       (MEDIA_INTF_T_ALSA_BASE + 4)
> +#define MEDIA_INTF_T_ALSA_HWDEP         (MEDIA_INTF_T_ALSA_BASE + 5)
> +#define MEDIA_INTF_T_ALSA_SEQUENCER     (MEDIA_INTF_T_ALSA_BASE + 6)
> +#define MEDIA_INTF_T_ALSA_TIMER         (MEDIA_INTF_T_ALSA_BASE + 7)
> +
>  /*
>   * MC next gen API definitions
>   *

Looks OK to me.

Takashi,

If this is OK for you too, would you mind acking it?

Thanks,
Mauro

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/22] Sharing media resources across ALSA and au0828 drivers Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
  [PATCH v3 02/22] uapi/media.h: Declare interface types for ALSA Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
    Re: [PATCH v3 02/22] uapi/media.h: Declare interface types for ALSA Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-02-17 13:30 +0100
  [PATCH v3 18/22] media: au0828-core register entity_notify hook Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
  [PATCH v3 16/22] media: au0828 create tuner to decoder link in disabled state Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
  [PATCH v3 03/22] [media] Docbook: media-types.xml: Add Audio Function Entities Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
    Re: [PATCH v3 03/22] [media] Docbook: media-types.xml: Add Audio  Function Entities Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-02-17 13:30 +0100
  [PATCH v3 05/22] media: Media Controller register/unregister entity_notify API Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
  [PATCH v3 21/22] media: au0828 video change to use v4l_enable_media_source() Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
  [PATCH v3 20/22] media: dvb-frontend invoke enable/disable_source handlers Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
  [PATCH v3 01/22] [media] Docbook: media-types.xml: Add ALSA Media Controller Intf types Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
    Re: [PATCH v3 01/22] [media] Docbook: media-types.xml: Add ALSA  Media Controller Intf types Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2016-02-17 13:30 +0100
      Re: [PATCH v3 01/22] [media] Docbook: media-types.xml: Add ALSA Media  Controller Intf types Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-17 16:00 +0100
  [PATCH v3 22/22] sound/usb: Use Media Controller API to share media resources Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 00:50 +0100
  [PATCH v3 12/22] media: au0828 Use au8522_media_pads enum for pad defines Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 01:00 +0100
  [PATCH v3 06/22] media: Media Controller enable/disable source handler API Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 01:00 +0100
  [PATCH v3 09/22] media: v4l-core add enable/disable source common interfaces Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 01:00 +0100
  [PATCH v3 08/22] media: Media Controller non-locking __media_entity_pipeline_start/stop() Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 01:00 +0100
  [PATCH v3 11/22] media: au8522 change to create MC pad for ALSA Audio Out Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 01:00 +0100
  [PATCH v3 07/22] media: Media Controller export non locking __media_entity_setup_link() Shuah Khan <shuahkh@osg.samsung.com> - 2016-02-12 01:00 +0100

csiph-web