diff options
| -rw-r--r-- | drivers/usb/gadget/f_audio_source.c | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/drivers/usb/gadget/f_audio_source.c b/drivers/usb/gadget/f_audio_source.c index a455b6dab..4d2e1fdee 100644 --- a/drivers/usb/gadget/f_audio_source.c +++ b/drivers/usb/gadget/f_audio_source.c @@ -35,7 +35,7 @@ #define AUDIO_NUM_INTERFACES 2 /* B.3.1 Standard AC Interface Descriptor */ -static struct usb_interface_descriptor ac_interface_desc = { +static struct usb_interface_descriptor audio_ac_interface_desc = { .bLength = USB_DT_INTERFACE_SIZE, .bDescriptorType = USB_DT_INTERFACE, .bNumEndpoints = 0, @@ -51,7 +51,7 @@ DECLARE_UAC_AC_HEADER_DESCRIPTOR(2); + 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 uac1_ac_header_descriptor_2 ac_header_desc = { +static struct uac1_ac_header_descriptor_2 audio_ac_header_desc = { .bLength = UAC_DT_AC_HEADER_LENGTH, .bDescriptorType = USB_DT_CS_INTERFACE, .bDescriptorSubtype = UAC_HEADER, @@ -65,7 +65,7 @@ static struct uac1_ac_header_descriptor_2 ac_header_desc = { }; #define INPUT_TERMINAL_ID 1 -static struct uac_input_terminal_descriptor input_terminal_desc = { +static struct uac_input_terminal_descriptor audio_input_terminal_desc = { .bLength = UAC_DT_INPUT_TERMINAL_SIZE, .bDescriptorType = USB_DT_CS_INTERFACE, .bDescriptorSubtype = UAC_INPUT_TERMINAL, @@ -78,7 +78,7 @@ static struct uac_input_terminal_descriptor input_terminal_desc = { DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(0); #define FEATURE_UNIT_ID 2 -static struct uac_feature_unit_descriptor_0 feature_unit_desc = { +static struct uac_feature_unit_descriptor_0 audio_feature_unit_desc = { .bLength = UAC_DT_FEATURE_UNIT_SIZE(0), .bDescriptorType = USB_DT_CS_INTERFACE, .bDescriptorSubtype = UAC_FEATURE_UNIT, @@ -88,7 +88,7 @@ static struct uac_feature_unit_descriptor_0 feature_unit_desc = { }; #define OUTPUT_TERMINAL_ID 3 -static struct uac1_output_terminal_descriptor output_terminal_desc = { +static struct uac1_output_terminal_descriptor audio_output_terminal_desc = { .bLength = UAC_DT_OUTPUT_TERMINAL_SIZE, .bDescriptorType = USB_DT_CS_INTERFACE, .bDescriptorSubtype = UAC_OUTPUT_TERMINAL, @@ -99,7 +99,7 @@ static struct uac1_output_terminal_descriptor output_terminal_desc = { }; /* B.4.1 Standard AS Interface Descriptor */ -static struct usb_interface_descriptor as_interface_alt_0_desc = { +static struct usb_interface_descriptor audio_as_interface_alt_0_desc = { .bLength = USB_DT_INTERFACE_SIZE, .bDescriptorType = USB_DT_INTERFACE, .bAlternateSetting = 0, @@ -108,7 +108,7 @@ static struct usb_interface_descriptor as_interface_alt_0_desc = { .bInterfaceSubClass = USB_SUBCLASS_AUDIOSTREAMING, }; -static struct usb_interface_descriptor as_interface_alt_1_desc = { +static struct usb_interface_descriptor audio_as_interface_alt_1_desc = { .bLength = USB_DT_INTERFACE_SIZE, .bDescriptorType = USB_DT_INTERFACE, .bAlternateSetting = 1, @@ -118,7 +118,7 @@ static struct usb_interface_descriptor as_interface_alt_1_desc = { }; /* B.4.2 Class-Specific AS Interface Descriptor */ -static struct uac1_as_header_descriptor as_header_desc = { +static struct uac1_as_header_descriptor audio_as_header_desc = { .bLength = UAC_DT_AS_HEADER_SIZE, .bDescriptorType = USB_DT_CS_INTERFACE, .bDescriptorSubtype = UAC_AS_GENERAL, @@ -129,7 +129,7 @@ static struct uac1_as_header_descriptor as_header_desc = { DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(1); -static struct uac_format_type_i_discrete_descriptor_1 as_type_i_desc = { +static struct uac_format_type_i_discrete_descriptor_1 audio_as_type_i_desc = { .bLength = UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(1), .bDescriptorType = USB_DT_CS_INTERFACE, .bDescriptorSubtype = UAC_FORMAT_TYPE, @@ -140,7 +140,7 @@ static struct uac_format_type_i_discrete_descriptor_1 as_type_i_desc = { }; /* Standard ISO IN Endpoint Descriptor for highspeed */ -static struct usb_endpoint_descriptor hs_as_in_ep_desc = { +static struct usb_endpoint_descriptor audio_hs_as_in_ep_desc = { .bLength = USB_DT_ENDPOINT_AUDIO_SIZE, .bDescriptorType = USB_DT_ENDPOINT, .bEndpointAddress = USB_DIR_IN, @@ -151,7 +151,7 @@ static struct usb_endpoint_descriptor hs_as_in_ep_desc = { }; /* Standard ISO IN Endpoint Descriptor for highspeed */ -static struct usb_endpoint_descriptor fs_as_in_ep_desc = { +static struct usb_endpoint_descriptor audio_fs_as_in_ep_desc = { .bLength = USB_DT_ENDPOINT_AUDIO_SIZE, .bDescriptorType = USB_DT_ENDPOINT, .bEndpointAddress = USB_DIR_IN, @@ -162,7 +162,7 @@ static struct usb_endpoint_descriptor fs_as_in_ep_desc = { }; /* Class-specific AS ISO OUT Endpoint Descriptor */ -static struct uac_iso_endpoint_descriptor as_iso_in_desc = { +static struct uac_iso_endpoint_descriptor audio_as_iso_in_desc = { .bLength = UAC_ISO_ENDPOINT_DESC_SIZE, .bDescriptorType = USB_DT_CS_ENDPOINT, .bDescriptorSubtype = UAC_EP_GENERAL, @@ -172,40 +172,40 @@ static struct uac_iso_endpoint_descriptor as_iso_in_desc = { }; static struct usb_descriptor_header *hs_audio_desc[] = { - (struct usb_descriptor_header *)&ac_interface_desc, - (struct usb_descriptor_header *)&ac_header_desc, + (struct usb_descriptor_header *)&audio_ac_interface_desc, + (struct usb_descriptor_header *)&audio_ac_header_desc, - (struct usb_descriptor_header *)&input_terminal_desc, - (struct usb_descriptor_header *)&output_terminal_desc, - (struct usb_descriptor_header *)&feature_unit_desc, + (struct usb_descriptor_header *)&audio_input_terminal_desc, + (struct usb_descriptor_header *)&audio_output_terminal_desc, + (struct usb_descriptor_header *)&audio_feature_unit_desc, - (struct usb_descriptor_header *)&as_interface_alt_0_desc, - (struct usb_descriptor_header *)&as_interface_alt_1_desc, - (struct usb_descriptor_header *)&as_header_desc, + (struct usb_descriptor_header *)&audio_as_interface_alt_0_desc, + (struct usb_descriptor_header *)&audio_as_interface_alt_1_desc, + (struct usb_descriptor_header *)&audio_as_header_desc, - (struct usb_descriptor_header *)&as_type_i_desc, + (struct usb_descriptor_header *)&audio_as_type_i_desc, - (struct usb_descriptor_header *)&hs_as_in_ep_desc, - (struct usb_descriptor_header *)&as_iso_in_desc, + (struct usb_descriptor_header *)&audio_hs_as_in_ep_desc, + (struct usb_descriptor_header *)&audio_as_iso_in_desc, NULL, }; static struct usb_descriptor_header *fs_audio_desc[] = { - (struct usb_descriptor_header *)&ac_interface_desc, - (struct usb_descriptor_header *)&ac_header_desc, + (struct usb_descriptor_header *)&audio_ac_interface_desc, + (struct usb_descriptor_header *)&audio_ac_header_desc, - (struct usb_descriptor_header *)&input_terminal_desc, - (struct usb_descriptor_header *)&output_terminal_desc, - (struct usb_descriptor_header *)&feature_unit_desc, + (struct usb_descriptor_header *)&audio_input_terminal_desc, + (struct usb_descriptor_header *)&audio_output_terminal_desc, + (struct usb_descriptor_header *)&audio_feature_unit_desc, - (struct usb_descriptor_header *)&as_interface_alt_0_desc, - (struct usb_descriptor_header *)&as_interface_alt_1_desc, - (struct usb_descriptor_header *)&as_header_desc, + (struct usb_descriptor_header *)&audio_as_interface_alt_0_desc, + (struct usb_descriptor_header *)&audio_as_interface_alt_1_desc, + (struct usb_descriptor_header *)&audio_as_header_desc, - (struct usb_descriptor_header *)&as_type_i_desc, + (struct usb_descriptor_header *)&audio_as_type_i_desc, - (struct usb_descriptor_header *)&fs_as_in_ep_desc, - (struct usb_descriptor_header *)&as_iso_in_desc, + (struct usb_descriptor_header *)&audio_fs_as_in_ep_desc, + (struct usb_descriptor_header *)&audio_as_iso_in_desc, NULL, }; @@ -553,12 +553,12 @@ static void audio_build_desc(struct audio_dev *audio) int rate; /* Set channel numbers */ - input_terminal_desc.bNrChannels = 2; - as_type_i_desc.bNrChannels = 2; + audio_input_terminal_desc.bNrChannels = 2; + audio_as_type_i_desc.bNrChannels = 2; /* Set sample rates */ rate = SAMPLE_RATE; - sam_freq = as_type_i_desc.tSamFreq[0]; + sam_freq = audio_as_type_i_desc.tSamFreq[0]; memcpy(sam_freq, &rate, 3); } @@ -579,32 +579,32 @@ audio_bind(struct usb_configuration *c, struct usb_function *f) status = usb_interface_id(c, f); if (status < 0) goto fail; - ac_interface_desc.bInterfaceNumber = status; + audio_ac_interface_desc.bInterfaceNumber = status; /* AUDIO_AC_INTERFACE */ - ac_header_desc.baInterfaceNr[0] = status; + audio_ac_header_desc.baInterfaceNr[0] = status; status = usb_interface_id(c, f); if (status < 0) goto fail; - as_interface_alt_0_desc.bInterfaceNumber = status; - as_interface_alt_1_desc.bInterfaceNumber = status; + audio_as_interface_alt_0_desc.bInterfaceNumber = status; + audio_as_interface_alt_1_desc.bInterfaceNumber = status; /* AUDIO_AS_INTERFACE */ - ac_header_desc.baInterfaceNr[1] = status; + audio_ac_header_desc.baInterfaceNr[1] = status; status = -ENODEV; /* allocate our endpoint */ - ep = usb_ep_autoconfig(cdev->gadget, &fs_as_in_ep_desc); + ep = usb_ep_autoconfig(cdev->gadget, &audio_fs_as_in_ep_desc); if (!ep) goto fail; audio->in_ep = ep; ep->driver_data = audio; /* claim */ if (gadget_is_dualspeed(c->cdev->gadget)) - hs_as_in_ep_desc.bEndpointAddress = - fs_as_in_ep_desc.bEndpointAddress; + audio_hs_as_in_ep_desc.bEndpointAddress = + audio_fs_as_in_ep_desc.bEndpointAddress; f->fs_descriptors = fs_audio_desc; f->hs_descriptors = hs_audio_desc; |