Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5af557a6 authored by Shuah Khan's avatar Shuah Khan Committed by Mauro Carvalho Chehab
Browse files

[media] uapi/media.h: Declare interface types for ALSA 



Declare the interface types to be used on alsa for
the new G_TOPOLOGY ioctl.

Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent ecd353a3

drivers/media/media-entity.c

+16 −0
Original line number Diff line number Diff line
@@ -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";

	}

include/uapi/linux/media.h

+10 −0
Original line number Diff line number Diff line
@@ -263,6 +263,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 */
@@ -278,6 +279,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

 *