diff options
author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-06-21 17:19:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-23 09:46:19 -0400 |
commit | 85e08ca54c5c203cd2638f0fc8fa899a539f6254 (patch) | |
tree | 145fef8b25d136293d3dc8eb2dfecd84ce1ea08e /include/linux/usb | |
parent | 81bf46f3034046c572714bdee1dc51beb3475082 (diff) |
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: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb')
-rw-r--r-- | include/linux/usb/audio.h | 10 | ||||
-rw-r--r-- | include/linux/usb/ch9.h | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h index b5744bc218a..bcf4fb4f5e8 100644 --- a/include/linux/usb/audio.h +++ b/include/linux/usb/audio.h | |||
@@ -46,12 +46,6 @@ | |||
46 | #define MIDI_IN_JACK 0x02 | 46 | #define MIDI_IN_JACK 0x02 |
47 | #define MIDI_OUT_JACK 0x03 | 47 | #define MIDI_OUT_JACK 0x03 |
48 | 48 | ||
49 | /* endpoint attributes */ | ||
50 | #define EP_ATTR_MASK 0x0c | ||
51 | #define EP_ATTR_ASYNC 0x04 | ||
52 | #define EP_ATTR_ADAPTIVE 0x08 | ||
53 | #define EP_ATTR_SYNC 0x0c | ||
54 | |||
55 | /* cs endpoint attributes */ | 49 | /* cs endpoint attributes */ |
56 | #define EP_CS_ATTR_SAMPLE_RATE 0x01 | 50 | #define EP_CS_ATTR_SAMPLE_RATE 0x01 |
57 | #define EP_CS_ATTR_PITCH_CONTROL 0x02 | 51 | #define EP_CS_ATTR_PITCH_CONTROL 0x02 |
@@ -244,10 +238,6 @@ struct usb_as_formate_type_i_discrete_descriptor_##n { \ | |||
244 | #define USB_AS_FORMAT_TYPE_II 0x2 | 238 | #define USB_AS_FORMAT_TYPE_II 0x2 |
245 | #define USB_AS_FORMAT_TYPE_III 0x3 | 239 | #define USB_AS_FORMAT_TYPE_III 0x3 |
246 | 240 | ||
247 | #define USB_AS_ENDPOINT_ASYNC (1 << 2) | ||
248 | #define USB_AS_ENDPOINT_ADAPTIVE (2 << 2) | ||
249 | #define USB_AS_ENDPOINT_SYNC (3 << 2) | ||
250 | |||
251 | struct usb_as_iso_endpoint_descriptor { | 241 | struct usb_as_iso_endpoint_descriptor { |
252 | __u8 bLength; /* in bytes: 7 */ | 242 | __u8 bLength; /* in bytes: 7 */ |
253 | __u8 bDescriptorType; /* USB_DT_CS_ENDPOINT */ | 243 | __u8 bDescriptorType; /* USB_DT_CS_ENDPOINT */ |
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h index 93223638f70..8f8b7411b87 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h | |||
@@ -348,6 +348,12 @@ struct usb_endpoint_descriptor { | |||
348 | #define USB_ENDPOINT_NUMBER_MASK 0x0f /* in bEndpointAddress */ | 348 | #define USB_ENDPOINT_NUMBER_MASK 0x0f /* in bEndpointAddress */ |
349 | #define USB_ENDPOINT_DIR_MASK 0x80 | 349 | #define USB_ENDPOINT_DIR_MASK 0x80 |
350 | 350 | ||
351 | #define USB_ENDPOINT_SYNCTYPE 0x0c | ||
352 | #define USB_ENDPOINT_SYNC_NONE (0 << 2) | ||
353 | #define USB_ENDPOINT_SYNC_ASYNC (1 << 2) | ||
354 | #define USB_ENDPOINT_SYNC_ADAPTIVE (2 << 2) | ||
355 | #define USB_ENDPOINT_SYNC_SYNC (3 << 2) | ||
356 | |||
351 | #define USB_ENDPOINT_XFERTYPE_MASK 0x03 /* in bmAttributes */ | 357 | #define USB_ENDPOINT_XFERTYPE_MASK 0x03 /* in bmAttributes */ |
352 | #define USB_ENDPOINT_XFER_CONTROL 0 | 358 | #define USB_ENDPOINT_XFER_CONTROL 0 |
353 | #define USB_ENDPOINT_XFER_ISOC 1 | 359 | #define USB_ENDPOINT_XFER_ISOC 1 |