Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (142 commits) USB: Fix sysfs paths in documentation USB: skeleton: fix coding style issues. USB: O_NONBLOCK in read path of skeleton USB: make usb-skeleton honor O_NONBLOCK in write path USB: skel_read really sucks royally USB: Add hub descriptor update hook for xHCI USB: xhci: Support USB hubs. USB: xhci: Set multi-TT field for LS/FS devices under hubs. USB: xhci: Set route string for all devices. USB: xhci: Fix command wait list handling. USB: xhci: Change how xHCI commands are handled. USB: xhci: Refactor input device context setup. USB: xhci: Endpoint representation refactoring. USB: gadget: ether needs to select CRC32 USB: fix USBTMC get_capabilities success handling USB: fix missing error check in probing USB: usbfs: add USBDEVFS_URB_BULK_CONTINUATION flag USB: support for autosuspend in sierra while online USB: ehci-dbgp,ehci: Allow dbpg to work with suspend/resume USB: ehci-dbgp,documentation: Documentation updates for ehci-dbgp ...
This commit is contained in:
Linus Torvalds
@@ -195,7 +195,7 @@ struct usb_interface {
|
||||
|
||||
struct device dev; /* interface specific device info */
|
||||
struct device *usb_dev;
|
||||
int pm_usage_cnt; /* usage counter for autosuspend */
|
||||
atomic_t pm_usage_cnt; /* usage counter for autosuspend */
|
||||
struct work_struct reset_ws; /* for resets in atomic context */
|
||||
};
|
||||
#define to_usb_interface(d) container_of(d, struct usb_interface, dev)
|
||||
@@ -551,13 +551,13 @@ extern void usb_autopm_put_interface_async(struct usb_interface *intf);
|
||||
|
||||
static inline void usb_autopm_enable(struct usb_interface *intf)
|
||||
{
|
||||
intf->pm_usage_cnt = 0;
|
||||
atomic_set(&intf->pm_usage_cnt, 0);
|
||||
usb_autopm_set_interface(intf);
|
||||
}
|
||||
|
||||
static inline void usb_autopm_disable(struct usb_interface *intf)
|
||||
{
|
||||
intf->pm_usage_cnt = 1;
|
||||
atomic_set(&intf->pm_usage_cnt, 1);
|
||||
usb_autopm_set_interface(intf);
|
||||
}
|
||||
|
||||
@@ -1036,9 +1036,10 @@ typedef void (*usb_complete_t)(struct urb *);
|
||||
* @transfer_flags: A variety of flags may be used to affect how URB
|
||||
* submission, unlinking, or operation are handled. Different
|
||||
* kinds of URB can use different flags.
|
||||
* @transfer_buffer: This identifies the buffer to (or from) which
|
||||
* the I/O request will be performed (unless URB_NO_TRANSFER_DMA_MAP
|
||||
* is set). This buffer must be suitable for DMA; allocate it with
|
||||
* @transfer_buffer: This identifies the buffer to (or from) which the I/O
|
||||
* request will be performed unless URB_NO_TRANSFER_DMA_MAP is set
|
||||
* (however, do not leave garbage in transfer_buffer even then).
|
||||
* This buffer must be suitable for DMA; allocate it with
|
||||
* kmalloc() or equivalent. For transfers to "in" endpoints, contents
|
||||
* of this buffer will be modified. This buffer is used for the data
|
||||
* stage of control transfers.
|
||||
@@ -1104,9 +1105,15 @@ typedef void (*usb_complete_t)(struct urb *);
|
||||
* allocate a DMA buffer with usb_buffer_alloc() or call usb_buffer_map().
|
||||
* When these transfer flags are provided, host controller drivers will
|
||||
* attempt to use the dma addresses found in the transfer_dma and/or
|
||||
* setup_dma fields rather than determining a dma address themselves. (Note
|
||||
* that transfer_buffer and setup_packet must still be set because not all
|
||||
* host controllers use DMA, nor do virtual root hubs).
|
||||
* setup_dma fields rather than determining a dma address themselves.
|
||||
*
|
||||
* Note that transfer_buffer must still be set if the controller
|
||||
* does not support DMA (as indicated by bus.uses_dma) and when talking
|
||||
* to root hub. If you have to trasfer between highmem zone and the device
|
||||
* on such controller, create a bounce buffer or bail out with an error.
|
||||
* If transfer_buffer cannot be set (is in highmem) and the controller is DMA
|
||||
* capable, assign NULL to it, so that usbmon knows not to use the value.
|
||||
* The setup_packet must always be set, so it cannot be located in highmem.
|
||||
*
|
||||
* Initialization:
|
||||
*
|
||||
|
||||
@@ -24,88 +24,78 @@
|
||||
#define USB_SUBCLASS_AUDIOCONTROL 0x01
|
||||
#define USB_SUBCLASS_AUDIOSTREAMING 0x02
|
||||
#define USB_SUBCLASS_MIDISTREAMING 0x03
|
||||
#define USB_SUBCLASS_VENDOR_SPEC 0xff
|
||||
|
||||
/* A.5 Audio Class-Specific AC interface Descriptor Subtypes*/
|
||||
#define HEADER 0x01
|
||||
#define INPUT_TERMINAL 0x02
|
||||
#define OUTPUT_TERMINAL 0x03
|
||||
#define MIXER_UNIT 0x04
|
||||
#define SELECTOR_UNIT 0x05
|
||||
#define FEATURE_UNIT 0x06
|
||||
#define PROCESSING_UNIT 0x07
|
||||
#define EXTENSION_UNIT 0x08
|
||||
/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
|
||||
#define UAC_HEADER 0x01
|
||||
#define UAC_INPUT_TERMINAL 0x02
|
||||
#define UAC_OUTPUT_TERMINAL 0x03
|
||||
#define UAC_MIXER_UNIT 0x04
|
||||
#define UAC_SELECTOR_UNIT 0x05
|
||||
#define UAC_FEATURE_UNIT 0x06
|
||||
#define UAC_PROCESSING_UNIT 0x07
|
||||
#define UAC_EXTENSION_UNIT 0x08
|
||||
|
||||
#define AS_GENERAL 0x01
|
||||
#define FORMAT_TYPE 0x02
|
||||
#define FORMAT_SPECIFIC 0x03
|
||||
/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
|
||||
#define UAC_AS_GENERAL 0x01
|
||||
#define UAC_FORMAT_TYPE 0x02
|
||||
#define UAC_FORMAT_SPECIFIC 0x03
|
||||
|
||||
#define EP_GENERAL 0x01
|
||||
/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
|
||||
#define UAC_EP_GENERAL 0x01
|
||||
|
||||
#define MS_GENERAL 0x01
|
||||
#define MIDI_IN_JACK 0x02
|
||||
#define MIDI_OUT_JACK 0x03
|
||||
/* A.9 Audio Class-Specific Request Codes */
|
||||
#define UAC_SET_ 0x00
|
||||
#define UAC_GET_ 0x80
|
||||
|
||||
/* endpoint attributes */
|
||||
#define EP_ATTR_MASK 0x0c
|
||||
#define EP_ATTR_ASYNC 0x04
|
||||
#define EP_ATTR_ADAPTIVE 0x08
|
||||
#define EP_ATTR_SYNC 0x0c
|
||||
#define UAC__CUR 0x1
|
||||
#define UAC__MIN 0x2
|
||||
#define UAC__MAX 0x3
|
||||
#define UAC__RES 0x4
|
||||
#define UAC__MEM 0x5
|
||||
|
||||
/* cs endpoint attributes */
|
||||
#define EP_CS_ATTR_SAMPLE_RATE 0x01
|
||||
#define EP_CS_ATTR_PITCH_CONTROL 0x02
|
||||
#define EP_CS_ATTR_FILL_MAX 0x80
|
||||
#define UAC_SET_CUR (UAC_SET_ | UAC__CUR)
|
||||
#define UAC_GET_CUR (UAC_GET_ | UAC__CUR)
|
||||
#define UAC_SET_MIN (UAC_SET_ | UAC__MIN)
|
||||
#define UAC_GET_MIN (UAC_GET_ | UAC__MIN)
|
||||
#define UAC_SET_MAX (UAC_SET_ | UAC__MAX)
|
||||
#define UAC_GET_MAX (UAC_GET_ | UAC__MAX)
|
||||
#define UAC_SET_RES (UAC_SET_ | UAC__RES)
|
||||
#define UAC_GET_RES (UAC_GET_ | UAC__RES)
|
||||
#define UAC_SET_MEM (UAC_SET_ | UAC__MEM)
|
||||
#define UAC_GET_MEM (UAC_GET_ | UAC__MEM)
|
||||
|
||||
/* Audio Class specific Request Codes */
|
||||
#define USB_AUDIO_SET_INTF 0x21
|
||||
#define USB_AUDIO_SET_ENDPOINT 0x22
|
||||
#define USB_AUDIO_GET_INTF 0xa1
|
||||
#define USB_AUDIO_GET_ENDPOINT 0xa2
|
||||
#define UAC_GET_STAT 0xff
|
||||
|
||||
#define SET_ 0x00
|
||||
#define GET_ 0x80
|
||||
/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
|
||||
#define UAC_MS_HEADER 0x01
|
||||
#define UAC_MIDI_IN_JACK 0x02
|
||||
#define UAC_MIDI_OUT_JACK 0x03
|
||||
|
||||
#define _CUR 0x1
|
||||
#define _MIN 0x2
|
||||
#define _MAX 0x3
|
||||
#define _RES 0x4
|
||||
#define _MEM 0x5
|
||||
/* MIDI - A.1 MS Class-Specific Endpoint Descriptor Subtypes */
|
||||
#define UAC_MS_GENERAL 0x01
|
||||
|
||||
#define SET_CUR (SET_ | _CUR)
|
||||
#define GET_CUR (GET_ | _CUR)
|
||||
#define SET_MIN (SET_ | _MIN)
|
||||
#define GET_MIN (GET_ | _MIN)
|
||||
#define SET_MAX (SET_ | _MAX)
|
||||
#define GET_MAX (GET_ | _MAX)
|
||||
#define SET_RES (SET_ | _RES)
|
||||
#define GET_RES (GET_ | _RES)
|
||||
#define SET_MEM (SET_ | _MEM)
|
||||
#define GET_MEM (GET_ | _MEM)
|
||||
|
||||
#define GET_STAT 0xff
|
||||
|
||||
#define USB_AC_TERMINAL_UNDEFINED 0x100
|
||||
#define USB_AC_TERMINAL_STREAMING 0x101
|
||||
#define USB_AC_TERMINAL_VENDOR_SPEC 0x1FF
|
||||
/* Terminals - 2.1 USB Terminal Types */
|
||||
#define UAC_TERMINAL_UNDEFINED 0x100
|
||||
#define UAC_TERMINAL_STREAMING 0x101
|
||||
#define UAC_TERMINAL_VENDOR_SPEC 0x1FF
|
||||
|
||||
/* Terminal Control Selectors */
|
||||
/* 4.3.2 Class-Specific AC Interface Descriptor */
|
||||
struct usb_ac_header_descriptor {
|
||||
struct uac_ac_header_descriptor {
|
||||
__u8 bLength; /* 8 + n */
|
||||
__u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
|
||||
__u8 bDescriptorSubtype; /* USB_MS_HEADER */
|
||||
__u8 bDescriptorSubtype; /* UAC_MS_HEADER */
|
||||
__le16 bcdADC; /* 0x0100 */
|
||||
__le16 wTotalLength; /* includes Unit and Terminal desc. */
|
||||
__u8 bInCollection; /* n */
|
||||
__u8 baInterfaceNr[]; /* [n] */
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define USB_DT_AC_HEADER_SIZE(n) (8 + (n))
|
||||
#define UAC_DT_AC_HEADER_SIZE(n) (8 + (n))
|
||||
|
||||
/* As above, but more useful for defining your own descriptors: */
|
||||
#define DECLARE_USB_AC_HEADER_DESCRIPTOR(n) \
|
||||
struct usb_ac_header_descriptor_##n { \
|
||||
#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n) \
|
||||
struct uac_ac_header_descriptor_##n { \
|
||||
__u8 bLength; \
|
||||
__u8 bDescriptorType; \
|
||||
__u8 bDescriptorSubtype; \
|
||||
@@ -116,7 +106,7 @@ struct usb_ac_header_descriptor_##n { \
|
||||
} __attribute__ ((packed))
|
||||
|
||||
/* 4.3.2.1 Input Terminal Descriptor */
|
||||
struct usb_input_terminal_descriptor {
|
||||
struct uac_input_terminal_descriptor {
|
||||
__u8 bLength; /* in bytes: 12 */
|
||||
__u8 bDescriptorType; /* CS_INTERFACE descriptor type */
|
||||
__u8 bDescriptorSubtype; /* INPUT_TERMINAL descriptor subtype */
|
||||
@@ -129,18 +119,19 @@ struct usb_input_terminal_descriptor {
|
||||
__u8 iTerminal;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define USB_DT_AC_INPUT_TERMINAL_SIZE 12
|
||||
#define UAC_DT_INPUT_TERMINAL_SIZE 12
|
||||
|
||||
#define USB_AC_INPUT_TERMINAL_UNDEFINED 0x200
|
||||
#define USB_AC_INPUT_TERMINAL_MICROPHONE 0x201
|
||||
#define USB_AC_INPUT_TERMINAL_DESKTOP_MICROPHONE 0x202
|
||||
#define USB_AC_INPUT_TERMINAL_PERSONAL_MICROPHONE 0x203
|
||||
#define USB_AC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE 0x204
|
||||
#define USB_AC_INPUT_TERMINAL_MICROPHONE_ARRAY 0x205
|
||||
#define USB_AC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY 0x206
|
||||
/* Terminals - 2.2 Input Terminal Types */
|
||||
#define UAC_INPUT_TERMINAL_UNDEFINED 0x200
|
||||
#define UAC_INPUT_TERMINAL_MICROPHONE 0x201
|
||||
#define UAC_INPUT_TERMINAL_DESKTOP_MICROPHONE 0x202
|
||||
#define UAC_INPUT_TERMINAL_PERSONAL_MICROPHONE 0x203
|
||||
#define UAC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE 0x204
|
||||
#define UAC_INPUT_TERMINAL_MICROPHONE_ARRAY 0x205
|
||||
#define UAC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY 0x206
|
||||
|
||||
/* 4.3.2.2 Output Terminal Descriptor */
|
||||
struct usb_output_terminal_descriptor {
|
||||
struct uac_output_terminal_descriptor {
|
||||
__u8 bLength; /* in bytes: 9 */
|
||||
__u8 bDescriptorType; /* CS_INTERFACE descriptor type */
|
||||
__u8 bDescriptorSubtype; /* OUTPUT_TERMINAL descriptor subtype */
|
||||
@@ -151,23 +142,24 @@ struct usb_output_terminal_descriptor {
|
||||
__u8 iTerminal;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define USB_DT_AC_OUTPUT_TERMINAL_SIZE 9
|
||||
#define UAC_DT_OUTPUT_TERMINAL_SIZE 9
|
||||
|
||||
#define USB_AC_OUTPUT_TERMINAL_UNDEFINED 0x300
|
||||
#define USB_AC_OUTPUT_TERMINAL_SPEAKER 0x301
|
||||
#define USB_AC_OUTPUT_TERMINAL_HEADPHONES 0x302
|
||||
#define USB_AC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO 0x303
|
||||
#define USB_AC_OUTPUT_TERMINAL_DESKTOP_SPEAKER 0x304
|
||||
#define USB_AC_OUTPUT_TERMINAL_ROOM_SPEAKER 0x305
|
||||
#define USB_AC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER 0x306
|
||||
#define USB_AC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER 0x307
|
||||
/* Terminals - 2.3 Output Terminal Types */
|
||||
#define UAC_OUTPUT_TERMINAL_UNDEFINED 0x300
|
||||
#define UAC_OUTPUT_TERMINAL_SPEAKER 0x301
|
||||
#define UAC_OUTPUT_TERMINAL_HEADPHONES 0x302
|
||||
#define UAC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO 0x303
|
||||
#define UAC_OUTPUT_TERMINAL_DESKTOP_SPEAKER 0x304
|
||||
#define UAC_OUTPUT_TERMINAL_ROOM_SPEAKER 0x305
|
||||
#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER 0x306
|
||||
#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER 0x307
|
||||
|
||||
/* Set bControlSize = 2 as default setting */
|
||||
#define USB_DT_AC_FEATURE_UNIT_SIZE(ch) (7 + ((ch) + 1) * 2)
|
||||
#define UAC_DT_FEATURE_UNIT_SIZE(ch) (7 + ((ch) + 1) * 2)
|
||||
|
||||
/* As above, but more useful for defining your own descriptors: */
|
||||
#define DECLARE_USB_AC_FEATURE_UNIT_DESCRIPTOR(ch) \
|
||||
struct usb_ac_feature_unit_descriptor_##ch { \
|
||||
#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch) \
|
||||
struct uac_feature_unit_descriptor_##ch { \
|
||||
__u8 bLength; \
|
||||
__u8 bDescriptorType; \
|
||||
__u8 bDescriptorSubtype; \
|
||||
@@ -179,7 +171,7 @@ struct usb_ac_feature_unit_descriptor_##ch { \
|
||||
} __attribute__ ((packed))
|
||||
|
||||
/* 4.5.2 Class-Specific AS Interface Descriptor */
|
||||
struct usb_as_header_descriptor {
|
||||
struct uac_as_header_descriptor {
|
||||
__u8 bLength; /* in bytes: 7 */
|
||||
__u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
|
||||
__u8 bDescriptorSubtype; /* AS_GENERAL */
|
||||
@@ -188,16 +180,17 @@ struct usb_as_header_descriptor {
|
||||
__le16 wFormatTag; /* The Audio Data Format */
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define USB_DT_AS_HEADER_SIZE 7
|
||||
#define UAC_DT_AS_HEADER_SIZE 7
|
||||
|
||||
#define USB_AS_AUDIO_FORMAT_TYPE_I_UNDEFINED 0x0
|
||||
#define USB_AS_AUDIO_FORMAT_TYPE_I_PCM 0x1
|
||||
#define USB_AS_AUDIO_FORMAT_TYPE_I_PCM8 0x2
|
||||
#define USB_AS_AUDIO_FORMAT_TYPE_I_IEEE_FLOAT 0x3
|
||||
#define USB_AS_AUDIO_FORMAT_TYPE_I_ALAW 0x4
|
||||
#define USB_AS_AUDIO_FORMAT_TYPE_I_MULAW 0x5
|
||||
/* Formats - A.1.1 Audio Data Format Type I Codes */
|
||||
#define UAC_FORMAT_TYPE_I_UNDEFINED 0x0
|
||||
#define UAC_FORMAT_TYPE_I_PCM 0x1
|
||||
#define UAC_FORMAT_TYPE_I_PCM8 0x2
|
||||
#define UAC_FORMAT_TYPE_I_IEEE_FLOAT 0x3
|
||||
#define UAC_FORMAT_TYPE_I_ALAW 0x4
|
||||
#define UAC_FORMAT_TYPE_I_MULAW 0x5
|
||||
|
||||
struct usb_as_format_type_i_continuous_descriptor {
|
||||
struct uac_format_type_i_continuous_descriptor {
|
||||
__u8 bLength; /* in bytes: 8 + (ns * 3) */
|
||||
__u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
|
||||
__u8 bDescriptorSubtype; /* FORMAT_TYPE */
|
||||
@@ -210,9 +203,9 @@ struct usb_as_format_type_i_continuous_descriptor {
|
||||
__u8 tUpperSamFreq[3];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define USB_AS_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE 14
|
||||
#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE 14
|
||||
|
||||
struct usb_as_formate_type_i_discrete_descriptor {
|
||||
struct uac_format_type_i_discrete_descriptor {
|
||||
__u8 bLength; /* in bytes: 8 + (ns * 3) */
|
||||
__u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
|
||||
__u8 bDescriptorSubtype; /* FORMAT_TYPE */
|
||||
@@ -224,8 +217,8 @@ struct usb_as_formate_type_i_discrete_descriptor {
|
||||
__u8 tSamFreq[][3];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define DECLARE_USB_AS_FORMAT_TYPE_I_DISCRETE_DESC(n) \
|
||||
struct usb_as_formate_type_i_discrete_descriptor_##n { \
|
||||
#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n) \
|
||||
struct uac_format_type_i_discrete_descriptor_##n { \
|
||||
__u8 bLength; \
|
||||
__u8 bDescriptorType; \
|
||||
__u8 bDescriptorSubtype; \
|
||||
@@ -237,18 +230,15 @@ struct usb_as_formate_type_i_discrete_descriptor_##n { \
|
||||
__u8 tSamFreq[n][3]; \
|
||||
} __attribute__ ((packed))
|
||||
|
||||
#define USB_AS_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n) (8 + (n * 3))
|
||||
#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n) (8 + (n * 3))
|
||||
|
||||
#define USB_AS_FORMAT_TYPE_UNDEFINED 0x0
|
||||
#define USB_AS_FORMAT_TYPE_I 0x1
|
||||
#define USB_AS_FORMAT_TYPE_II 0x2
|
||||
#define USB_AS_FORMAT_TYPE_III 0x3
|
||||
/* Formats - A.2 Format Type Codes */
|
||||
#define UAC_FORMAT_TYPE_UNDEFINED 0x0
|
||||
#define UAC_FORMAT_TYPE_I 0x1
|
||||
#define UAC_FORMAT_TYPE_II 0x2
|
||||
#define UAC_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 {
|
||||
struct uac_iso_endpoint_descriptor {
|
||||
__u8 bLength; /* in bytes: 7 */
|
||||
__u8 bDescriptorType; /* USB_DT_CS_ENDPOINT */
|
||||
__u8 bDescriptorSubtype; /* EP_GENERAL */
|
||||
@@ -256,30 +246,37 @@ struct usb_as_iso_endpoint_descriptor {
|
||||
__u8 bLockDelayUnits;
|
||||
__le16 wLockDelay;
|
||||
};
|
||||
#define USB_AS_ISO_ENDPOINT_DESC_SIZE 7
|
||||
#define UAC_ISO_ENDPOINT_DESC_SIZE 7
|
||||
|
||||
#define FU_CONTROL_UNDEFINED 0x00
|
||||
#define MUTE_CONTROL 0x01
|
||||
#define VOLUME_CONTROL 0x02
|
||||
#define BASS_CONTROL 0x03
|
||||
#define MID_CONTROL 0x04
|
||||
#define TREBLE_CONTROL 0x05
|
||||
#define GRAPHIC_EQUALIZER_CONTROL 0x06
|
||||
#define AUTOMATIC_GAIN_CONTROL 0x07
|
||||
#define DELAY_CONTROL 0x08
|
||||
#define BASS_BOOST_CONTROL 0x09
|
||||
#define LOUDNESS_CONTROL 0x0a
|
||||
#define UAC_EP_CS_ATTR_SAMPLE_RATE 0x01
|
||||
#define UAC_EP_CS_ATTR_PITCH_CONTROL 0x02
|
||||
#define UAC_EP_CS_ATTR_FILL_MAX 0x80
|
||||
|
||||
#define FU_MUTE (1 << (MUTE_CONTROL - 1))
|
||||
#define FU_VOLUME (1 << (VOLUME_CONTROL - 1))
|
||||
#define FU_BASS (1 << (BASS_CONTROL - 1))
|
||||
#define FU_MID (1 << (MID_CONTROL - 1))
|
||||
#define FU_TREBLE (1 << (TREBLE_CONTROL - 1))
|
||||
#define FU_GRAPHIC_EQ (1 << (GRAPHIC_EQUALIZER_CONTROL - 1))
|
||||
#define FU_AUTO_GAIN (1 << (AUTOMATIC_GAIN_CONTROL - 1))
|
||||
#define FU_DELAY (1 << (DELAY_CONTROL - 1))
|
||||
#define FU_BASS_BOOST (1 << (BASS_BOOST_CONTROL - 1))
|
||||
#define FU_LOUDNESS (1 << (LOUDNESS_CONTROL - 1))
|
||||
/* A.10.2 Feature Unit Control Selectors */
|
||||
#define UAC_FU_CONTROL_UNDEFINED 0x00
|
||||
#define UAC_MUTE_CONTROL 0x01
|
||||
#define UAC_VOLUME_CONTROL 0x02
|
||||
#define UAC_BASS_CONTROL 0x03
|
||||
#define UAC_MID_CONTROL 0x04
|
||||
#define UAC_TREBLE_CONTROL 0x05
|
||||
#define UAC_GRAPHIC_EQUALIZER_CONTROL 0x06
|
||||
#define UAC_AUTOMATIC_GAIN_CONTROL 0x07
|
||||
#define UAC_DELAY_CONTROL 0x08
|
||||
#define UAC_BASS_BOOST_CONTROL 0x09
|
||||
#define UAC_LOUDNESS_CONTROL 0x0a
|
||||
|
||||
#define UAC_FU_MUTE (1 << (UAC_MUTE_CONTROL - 1))
|
||||
#define UAC_FU_VOLUME (1 << (UAC_VOLUME_CONTROL - 1))
|
||||
#define UAC_FU_BASS (1 << (UAC_BASS_CONTROL - 1))
|
||||
#define UAC_FU_MID (1 << (UAC_MID_CONTROL - 1))
|
||||
#define UAC_FU_TREBLE (1 << (UAC_TREBLE_CONTROL - 1))
|
||||
#define UAC_FU_GRAPHIC_EQ (1 << (UAC_GRAPHIC_EQUALIZER_CONTROL - 1))
|
||||
#define UAC_FU_AUTO_GAIN (1 << (UAC_AUTOMATIC_GAIN_CONTROL - 1))
|
||||
#define UAC_FU_DELAY (1 << (UAC_DELAY_CONTROL - 1))
|
||||
#define UAC_FU_BASS_BOOST (1 << (UAC_BASS_BOOST_CONTROL - 1))
|
||||
#define UAC_FU_LOUDNESS (1 << (UAC_LOUDNESS_CONTROL - 1))
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
struct usb_audio_control {
|
||||
struct list_head list;
|
||||
@@ -290,18 +287,6 @@ struct usb_audio_control {
|
||||
int (*get)(struct usb_audio_control *con, u8 cmd);
|
||||
};
|
||||
|
||||
static inline int generic_set_cmd(struct usb_audio_control *con, u8 cmd, int value)
|
||||
{
|
||||
con->data[cmd] = value;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int generic_get_cmd(struct usb_audio_control *con, u8 cmd)
|
||||
{
|
||||
return con->data[cmd];
|
||||
}
|
||||
|
||||
struct usb_audio_control_selector {
|
||||
struct list_head list;
|
||||
struct list_head control;
|
||||
@@ -311,4 +296,6 @@ struct usb_audio_control_selector {
|
||||
struct usb_descriptor_header *desc;
|
||||
};
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* __LINUX_USB_AUDIO_H */
|
||||
|
||||
@@ -258,6 +258,8 @@ struct usb_device_descriptor {
|
||||
#define USB_CLASS_APP_SPEC 0xfe
|
||||
#define USB_CLASS_VENDOR_SPEC 0xff
|
||||
|
||||
#define USB_SUBCLASS_VENDOR_SPEC 0xff
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
/* USB_DT_CONFIG: Configuration descriptor information.
|
||||
@@ -348,6 +350,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
|
||||
|
||||
@@ -105,6 +105,7 @@ struct ehci_regs {
|
||||
#define PORT_WKDISC_E (1<<21) /* wake on disconnect (enable) */
|
||||
#define PORT_WKCONN_E (1<<20) /* wake on connect (enable) */
|
||||
/* 19:16 for port testing */
|
||||
#define PORT_TEST_PKT (0x4<<16) /* Port Test Control - packet test */
|
||||
#define PORT_LED_OFF (0<<14)
|
||||
#define PORT_LED_AMBER (1<<14)
|
||||
#define PORT_LED_GREEN (2<<14)
|
||||
@@ -132,6 +133,19 @@ struct ehci_regs {
|
||||
#define USBMODE_CM_HC (3<<0) /* host controller mode */
|
||||
#define USBMODE_CM_IDLE (0<<0) /* idle state */
|
||||
|
||||
/* Moorestown has some non-standard registers, partially due to the fact that
|
||||
* its EHCI controller has both TT and LPM support. HOSTPCx are extentions to
|
||||
* PORTSCx
|
||||
*/
|
||||
#define HOSTPC0 0x84 /* HOSTPC extension */
|
||||
#define HOSTPC_PHCD (1<<22) /* Phy clock disable */
|
||||
#define HOSTPC_PSPD (3<<25) /* Port speed detection */
|
||||
#define USBMODE_EX 0xc8 /* USB Device mode extension */
|
||||
#define USBMODE_EX_VBPS (1<<5) /* VBus Power Select On */
|
||||
#define USBMODE_EX_HC (3<<0) /* host controller mode */
|
||||
#define TXFILLTUNING 0x24 /* TX FIFO Tuning register */
|
||||
#define TXFIFO_DEFAULT (8<<16) /* FIFO burst threshold 8 */
|
||||
|
||||
/* Appendix C, Debug port ... intended for use with special "debug devices"
|
||||
* that can help if there's no serial console. (nonstandard enumeration.)
|
||||
*/
|
||||
@@ -157,4 +171,25 @@ struct ehci_dbg_port {
|
||||
#define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep))
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#ifdef CONFIG_EARLY_PRINTK_DBGP
|
||||
#include <linux/init.h>
|
||||
extern int __init early_dbgp_init(char *s);
|
||||
extern struct console early_dbgp_console;
|
||||
#endif /* CONFIG_EARLY_PRINTK_DBGP */
|
||||
|
||||
#ifdef CONFIG_EARLY_PRINTK_DBGP
|
||||
/* Call backs from ehci host driver to ehci debug driver */
|
||||
extern int dbgp_external_startup(void);
|
||||
extern int dbgp_reset_prep(void);
|
||||
#else
|
||||
static inline int dbgp_reset_prep(void)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
static inline int dbgp_external_startup(void)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __LINUX_USB_EHCI_DEF_H */
|
||||
|
||||
46
include/linux/usb/isp1362.h
Normal file
46
include/linux/usb/isp1362.h
Normal file
@@ -0,0 +1,46 @@
|
||||
/*
|
||||
* board initialization code should put one of these into dev->platform_data
|
||||
* and place the isp1362 onto platform_bus.
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_USB_ISP1362_H__
|
||||
#define __LINUX_USB_ISP1362_H__
|
||||
|
||||
struct isp1362_platform_data {
|
||||
/* Enable internal pulldown resistors on downstream ports */
|
||||
unsigned sel15Kres:1;
|
||||
/* Clock cannot be stopped */
|
||||
unsigned clknotstop:1;
|
||||
/* On-chip overcurrent protection */
|
||||
unsigned oc_enable:1;
|
||||
/* INT output polarity */
|
||||
unsigned int_act_high:1;
|
||||
/* INT edge or level triggered */
|
||||
unsigned int_edge_triggered:1;
|
||||
/* DREQ output polarity */
|
||||
unsigned dreq_act_high:1;
|
||||
/* DACK input polarity */
|
||||
unsigned dack_act_high:1;
|
||||
/* chip can be resumed via H_WAKEUP pin */
|
||||
unsigned remote_wakeup_connected:1;
|
||||
/* Switch or not to switch (keep always powered) */
|
||||
unsigned no_power_switching:1;
|
||||
/* Ganged port power switching (0) or individual port power switching (1) */
|
||||
unsigned power_switching_mode:1;
|
||||
/* Given port_power, msec/2 after power on till power good */
|
||||
u8 potpg;
|
||||
/* Hardware reset set/clear */
|
||||
void (*reset) (struct device *dev, int set);
|
||||
/* Clock start/stop */
|
||||
void (*clock) (struct device *dev, int start);
|
||||
/* Inter-io delay (ns). The chip is picky about access timings; it
|
||||
* expects at least:
|
||||
* 110ns delay between consecutive accesses to DATA_REG,
|
||||
* 300ns delay between access to ADDR_REG and DATA_REG (registers)
|
||||
* 462ns delay between access to ADDR_REG and DATA_REG (buffer memory)
|
||||
* WE MUST NOT be activated during these intervals (even without CS!)
|
||||
*/
|
||||
void (*delay) (struct device *dev, unsigned int delay);
|
||||
};
|
||||
|
||||
#endif
|
||||
18
include/linux/usb/isp1760.h
Normal file
18
include/linux/usb/isp1760.h
Normal file
@@ -0,0 +1,18 @@
|
||||
/*
|
||||
* board initialization should put one of these into dev->platform_data
|
||||
* and place the isp1760 onto platform_bus named "isp1760-hcd".
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_USB_ISP1760_H
|
||||
#define __LINUX_USB_ISP1760_H
|
||||
|
||||
struct isp1760_platform_data {
|
||||
unsigned is_isp1761:1; /* Chip is ISP1761 */
|
||||
unsigned bus_width_16:1; /* 16/32-bit data bus width */
|
||||
unsigned port1_otg:1; /* Port 1 supports OTG */
|
||||
unsigned analog_oc:1; /* Analog overcurrent */
|
||||
unsigned dack_polarity_high:1; /* DACK active high */
|
||||
unsigned dreq_polarity_high:1; /* DREQ active high */
|
||||
};
|
||||
|
||||
#endif /* __LINUX_USB_ISP1760_H */
|
||||
@@ -59,6 +59,7 @@ enum port_dev_state {
|
||||
* @bulk_out_buffer: pointer to the bulk out buffer for this port.
|
||||
* @bulk_out_size: the size of the bulk_out_buffer, in bytes.
|
||||
* @write_urb: pointer to the bulk out struct urb for this port.
|
||||
* @write_fifo: kfifo used to buffer outgoing data
|
||||
* @write_urb_busy: port`s writing status
|
||||
* @bulk_out_endpointAddress: endpoint address for the bulk out pipe for this
|
||||
* port.
|
||||
@@ -96,6 +97,7 @@ struct usb_serial_port {
|
||||
unsigned char *bulk_out_buffer;
|
||||
int bulk_out_size;
|
||||
struct urb *write_urb;
|
||||
struct kfifo *write_fifo;
|
||||
int write_urb_busy;
|
||||
__u8 bulk_out_endpointAddress;
|
||||
|
||||
|
||||
@@ -77,6 +77,7 @@ struct usbdevfs_connectinfo {
|
||||
|
||||
#define USBDEVFS_URB_SHORT_NOT_OK 0x01
|
||||
#define USBDEVFS_URB_ISO_ASAP 0x02
|
||||
#define USBDEVFS_URB_BULK_CONTINUATION 0x04
|
||||
#define USBDEVFS_URB_NO_FSBR 0x20
|
||||
#define USBDEVFS_URB_ZERO_PACKET 0x40
|
||||
#define USBDEVFS_URB_NO_INTERRUPT 0x80
|
||||
@@ -175,4 +176,6 @@ struct usbdevfs_ioctl32 {
|
||||
#define USBDEVFS_CLEAR_HALT _IOR('U', 21, unsigned int)
|
||||
#define USBDEVFS_DISCONNECT _IO('U', 22)
|
||||
#define USBDEVFS_CONNECT _IO('U', 23)
|
||||
#define USBDEVFS_CLAIM_PORT _IOR('U', 24, unsigned int)
|
||||
#define USBDEVFS_RELEASE_PORT _IOR('U', 25, unsigned int)
|
||||
#endif /* _LINUX_USBDEVICE_FS_H */
|
||||
|
||||
Reference in New Issue
Block a user