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

Commit 69da9bcb authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

ALSA: usb-audio: unify UAC macros and struct names 



Get rid of the last occurances of _v1 suffixes, and move the version
number right after the "uac" string. Now things are consitent again.

Sorry for the forth and back, but it just looks much nicer this way.

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f22aa949

drivers/usb/gadget/f_audio.c

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ DECLARE_UAC_AC_HEADER_DESCRIPTOR(2); 
#define UAC_DT_TOTAL_LENGTH (UAC_DT_AC_HEADER_LENGTH + UAC_DT_INPUT_TERMINAL_SIZE \

	+ UAC_DT_OUTPUT_TERMINAL_SIZE + UAC_DT_FEATURE_UNIT_SIZE(0))

/* B.3.2  Class-Specific AC Interface Descriptor */

static struct uac_ac_header_descriptor_v1_2 ac_header_desc = {

static struct uac1_ac_header_descriptor_2 ac_header_desc = {

	.bLength =		UAC_DT_AC_HEADER_LENGTH,

	.bDescriptorType =	USB_DT_CS_INTERFACE,

	.bDescriptorSubtype =	UAC_HEADER,
@@ -125,7 +125,7 @@ static struct usb_audio_control_selector feature_unit = { 
};



#define OUTPUT_TERMINAL_ID	3

static struct uac_output_terminal_descriptor_v1 output_terminal_desc = {

static struct uac1_output_terminal_descriptor output_terminal_desc = {

	.bLength		= UAC_DT_OUTPUT_TERMINAL_SIZE,

	.bDescriptorType	= USB_DT_CS_INTERFACE,

	.bDescriptorSubtype	= UAC_OUTPUT_TERMINAL,
@@ -155,7 +155,7 @@ static struct usb_interface_descriptor as_interface_alt_1_desc = { 
};



/* B.4.2  Class-Specific AS Interface Descriptor */

static struct uac_as_header_descriptor_v1 as_header_desc = {

static struct uac1_as_header_descriptor as_header_desc = {

	.bLength =		UAC_DT_AS_HEADER_SIZE,

	.bDescriptorType =	USB_DT_CS_INTERFACE,

	.bDescriptorSubtype =	UAC_AS_GENERAL,

drivers/usb/gadget/gmidi.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static const struct usb_interface_descriptor ac_interface_desc = { 
};



/* B.3.2  Class-Specific AC Interface Descriptor */

static const struct uac_ac_header_descriptor_v1_1 ac_header_desc = {

static const struct uac1_ac_header_descriptor_1 ac_header_desc = {

	.bLength =		UAC_DT_AC_HEADER_SIZE(1),

	.bDescriptorType =	USB_DT_CS_INTERFACE,

	.bDescriptorSubtype =	USB_MS_HEADER,

include/linux/usb/audio-v2.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct uac2_feature_unit_descriptor { 


/* 4.9.2 Class-Specific AS Interface Descriptor */



struct uac_as_header_descriptor_v2 {

struct uac2_as_header_descriptor {

	__u8 bLength;

	__u8 bDescriptorType;

	__u8 bDescriptorSubtype;

include/linux/usb/audio.h

+6 −6
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
#define UAC_MIXER_UNIT			0x04

#define UAC_SELECTOR_UNIT		0x05

#define UAC_FEATURE_UNIT		0x06

#define UAC_PROCESSING_UNIT_V1		0x07

#define UAC_EXTENSION_UNIT_V1		0x08

#define UAC1_PROCESSING_UNIT		0x07

#define UAC1_EXTENSION_UNIT		0x08



/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */

#define UAC_AS_GENERAL			0x01
@@ -151,7 +151,7 @@ 


/* Terminal Control Selectors */

/* 4.3.2  Class-Specific AC Interface Descriptor */

struct uac_ac_header_descriptor_v1 {

struct uac1_ac_header_descriptor {

	__u8  bLength;			/* 8 + n */

	__u8  bDescriptorType;		/* USB_DT_CS_INTERFACE */

	__u8  bDescriptorSubtype;	/* UAC_MS_HEADER */
@@ -165,7 +165,7 @@ struct uac_ac_header_descriptor_v1 { 


/* As above, but more useful for defining your own descriptors: */

#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n)			\

struct uac_ac_header_descriptor_v1_##n {			\

struct uac1_ac_header_descriptor_##n {			\

	__u8  bLength;						\

	__u8  bDescriptorType;					\

	__u8  bDescriptorSubtype;				\
@@ -205,7 +205,7 @@ struct uac_input_terminal_descriptor { 
#define UAC_TERMINAL_CS_COPY_PROTECT_CONTROL		0x01



/* 4.3.2.2 Output Terminal Descriptor */

struct uac_output_terminal_descriptor_v1 {

struct uac1_output_terminal_descriptor {

	__u8  bLength;			/* in bytes: 9 */

	__u8  bDescriptorType;		/* CS_INTERFACE descriptor type */

	__u8  bDescriptorSubtype;	/* OUTPUT_TERMINAL descriptor subtype */
@@ -395,7 +395,7 @@ static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_desc 
}



/* 4.5.2 Class-Specific AS Interface Descriptor */

struct uac_as_header_descriptor_v1 {

struct uac1_as_header_descriptor {

	__u8  bLength;			/* in bytes: 7 */

	__u8  bDescriptorType;		/* USB_DT_CS_INTERFACE */

	__u8  bDescriptorSubtype;	/* AS_GENERAL */

sound/usb/card.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) 


	switch (protocol) {

	case UAC_VERSION_1: {

		struct uac_ac_header_descriptor_v1 *h1 = control_header;

		struct uac1_ac_header_descriptor *h1 = control_header;



		if (!h1->bInCollection) {

			snd_printk(KERN_INFO "skipping empty audio interface (v1)\n");