Commit 85e08ca5 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Greg Kroah-Hartman
Browse files

USB: Move endpoint sync type definitions from usb/audio.h to usb/ch9.h 



And use the new definitions in the USB Audio Class gadget driver.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 81bf46f3

drivers/usb/gadget/f_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static struct usb_endpoint_descriptor as_out_ep_desc __initdata = { 
	.bLength =		USB_DT_ENDPOINT_AUDIO_SIZE,

	.bDescriptorType =	USB_DT_ENDPOINT,

	.bEndpointAddress =	USB_DIR_OUT,

	.bmAttributes =		USB_AS_ENDPOINT_ADAPTIVE

	.bmAttributes =		USB_ENDPOINT_SYNC_ADAPTIVE

				| USB_ENDPOINT_XFER_ISOC,

	.wMaxPacketSize =	__constant_cpu_to_le16(OUT_EP_MAX_PACKET_SIZE),

	.bInterval =		4,

include/linux/usb/audio.h

+0 −10
Original line number Diff line number Diff line
@@ -46,12 +46,6 @@ 
#define MIDI_IN_JACK			0x02

#define MIDI_OUT_JACK			0x03



/* endpoint attributes */

#define EP_ATTR_MASK			0x0c

#define EP_ATTR_ASYNC			0x04

#define EP_ATTR_ADAPTIVE		0x08

#define EP_ATTR_SYNC			0x0c



/* cs endpoint attributes */

#define EP_CS_ATTR_SAMPLE_RATE		0x01

#define EP_CS_ATTR_PITCH_CONTROL	0x02
@@ -244,10 +238,6 @@ struct usb_as_formate_type_i_discrete_descriptor_##n { \ 
#define USB_AS_FORMAT_TYPE_II		0x2

#define USB_AS_FORMAT_TYPE_III		0x3



#define USB_AS_ENDPOINT_ASYNC		(1 << 2)

#define USB_AS_ENDPOINT_ADAPTIVE	(2 << 2)

#define USB_AS_ENDPOINT_SYNC		(3 << 2)



struct usb_as_iso_endpoint_descriptor {

	__u8  bLength;			/* in bytes: 7 */

	__u8  bDescriptorType;		/* USB_DT_CS_ENDPOINT */

include/linux/usb/ch9.h

+6 −0
Original line number Diff line number Diff line
@@ -348,6 +348,12 @@ struct usb_endpoint_descriptor { 
#define USB_ENDPOINT_NUMBER_MASK	0x0f	/* in bEndpointAddress */

#define USB_ENDPOINT_DIR_MASK		0x80



#define USB_ENDPOINT_SYNCTYPE		0x0c

#define USB_ENDPOINT_SYNC_NONE		(0 << 2)

#define USB_ENDPOINT_SYNC_ASYNC		(1 << 2)

#define USB_ENDPOINT_SYNC_ADAPTIVE	(2 << 2)

#define USB_ENDPOINT_SYNC_SYNC		(3 << 2)



#define USB_ENDPOINT_XFERTYPE_MASK	0x03	/* in bmAttributes */

#define USB_ENDPOINT_XFER_CONTROL	0

#define USB_ENDPOINT_XFER_ISOC		1