ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 46f24955: am e3c02883: Merge "adbd: enable USB SuperSpeed (again)"

Browse source 
* commit '46f24955c8c30992c8b885fe2c4531777223315d':
  adbd: enable USB SuperSpeed (again)
This commit is contained in:
Badhri Jagan Sridharan 2015-08-24 17:45:38 +00:00 • committed by Android Git Automerger
commit ff490354f4
1 changed files with 49 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
adb/usb_linux_client.cpp
View file

@ -64,6 +64,14 @@ struct func_desc {
struct usb_endpoint_descriptor_no_audio sink; struct usb_endpoint_descriptor_no_audio sink;
} __attribute__((packed)); } __attribute__((packed));
struct ss_func_desc {
struct usb_interface_descriptor intf;
struct usb_endpoint_descriptor_no_audio source;
struct usb_ss_ep_comp_descriptor source_comp;
struct usb_endpoint_descriptor_no_audio sink;
struct usb_ss_ep_comp_descriptor sink_comp;
} __attribute__((packed));
struct desc_v1 { struct desc_v1 {
struct usb_functionfs_descs_head_v1 { struct usb_functionfs_descs_head_v1 {
__le32 magic; __le32 magic;
@ -79,7 +87,9 @@ struct desc_v2 {
// The rest of the structure depends on the flags in the header. // The rest of the structure depends on the flags in the header.
__le32 fs_count; __le32 fs_count;
__le32 hs_count; __le32 hs_count;
__le32 ss_count;
struct func_desc fs_descs, hs_descs; struct func_desc fs_descs, hs_descs;
struct ss_func_desc ss_descs;
} __attribute__((packed)); } __attribute__((packed));
static struct func_desc fs_descriptors = { static struct func_desc fs_descriptors = {
@ -136,6 +146,41 @@ static struct func_desc hs_descriptors = {
}, },
}; };
static struct ss_func_desc ss_descriptors = {
.intf = {
.bLength = sizeof(ss_descriptors.intf),
.bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = 0,
.bNumEndpoints = 2,
.bInterfaceClass = ADB_CLASS,
.bInterfaceSubClass = ADB_SUBCLASS,
.bInterfaceProtocol = ADB_PROTOCOL,
.iInterface = 1, /* first string from the provided table */
},
.source = {
.bLength = sizeof(ss_descriptors.source),
.bDescriptorType = USB_DT_ENDPOINT,
.bEndpointAddress = 1 | USB_DIR_OUT,
.bmAttributes = USB_ENDPOINT_XFER_BULK,
.wMaxPacketSize = MAX_PACKET_SIZE_SS,
},
.source_comp = {
.bLength = sizeof(ss_descriptors.source_comp),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
},
.sink = {
.bLength = sizeof(ss_descriptors.sink),
.bDescriptorType = USB_DT_ENDPOINT,
.bEndpointAddress = 2 | USB_DIR_IN,
.bmAttributes = USB_ENDPOINT_XFER_BULK,
.wMaxPacketSize = MAX_PACKET_SIZE_SS,
},
.sink_comp = {
.bLength = sizeof(ss_descriptors.sink_comp),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
},
};
#define STR_INTERFACE_ "ADB Interface" #define STR_INTERFACE_ "ADB Interface"
static const struct { static const struct {
@ -284,11 +329,14 @@ static void init_functionfs(struct usb_handle *h)
v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2); v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2);
v2_descriptor.header.length = cpu_to_le32(sizeof(v2_descriptor)); v2_descriptor.header.length = cpu_to_le32(sizeof(v2_descriptor));
v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC; v2_descriptor.header.flags = FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC |
FUNCTIONFS_HAS_SS_DESC;
v2_descriptor.fs_count = 3; v2_descriptor.fs_count = 3;
v2_descriptor.hs_count = 3; v2_descriptor.hs_count = 3;
v2_descriptor.ss_count = 5;
v2_descriptor.fs_descs = fs_descriptors; v2_descriptor.fs_descs = fs_descriptors;
v2_descriptor.hs_descs = hs_descriptors; v2_descriptor.hs_descs = hs_descriptors;
v2_descriptor.ss_descs = ss_descriptors;
if (h->control < 0) { // might have already done this before if (h->control < 0) { // might have already done this before
D("OPENING %s\n", USB_FFS_ADB_EP0); D("OPENING %s\n", USB_FFS_ADB_EP0);