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

Merge "fastbootd: Use FASTBOOT constants instead of ADB constants"

Browse source
This commit is contained in:
Elliott Hughes 2014-12-10 00:27:09 +00:00 • committed by Gerrit Code Review
commit e1fb089945
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fastbootd/usb_linux_client.c
View file

@ -103,9 +103,9 @@ struct func_desc fs_descriptors = {
.bDescriptorType = USB_DT_INTERFACE, .bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = 0, .bInterfaceNumber = 0,
.bNumEndpoints = 2, .bNumEndpoints = 2,
.bInterfaceClass = ADB_CLASS, .bInterfaceClass = FASTBOOT_CLASS,
.bInterfaceSubClass = ADB_SUBCLASS, .bInterfaceSubClass = FASTBOOT_SUBCLASS,
.bInterfaceProtocol = ADB_PROTOCOL, .bInterfaceProtocol = FASTBOOT_PROTOCOL,
.iInterface = 1, /* first string from the provided table */ .iInterface = 1, /* first string from the provided table */
}, },
.source = { .source = {
@ -130,9 +130,9 @@ struct func_desc hs_descriptors = {
.bDescriptorType = USB_DT_INTERFACE, .bDescriptorType = USB_DT_INTERFACE,
.bInterfaceNumber = 0, .bInterfaceNumber = 0,
.bNumEndpoints = 2, .bNumEndpoints = 2,
.bInterfaceClass = ADB_CLASS, .bInterfaceClass = FASTBOOT_CLASS,
.bInterfaceSubClass = ADB_SUBCLASS, .bInterfaceSubClass = FASTBOOT_SUBCLASS,
.bInterfaceProtocol = ADB_PROTOCOL, .bInterfaceProtocol = FASTBOOT_PROTOCOL,
.iInterface = 1, /* first string from the provided table */ .iInterface = 1, /* first string from the provided table */
}, },
.source = { .source = {
@ -202,7 +202,7 @@ static int init_functionfs(struct usb_transport *usb_transport)
v1_descriptor.header.hs_count = 3; v1_descriptor.header.hs_count = 3;
v1_descriptor.fs_descs = fs_descriptors; v1_descriptor.fs_descs = fs_descriptors;
v1_descriptor.hs_descs = hs_descriptors; v1_descriptor.hs_descs = hs_descriptors;
D("[ %s: Switching to V1_descriptor format errno=%d ]\n", USB_FFS_FASTBOOT_EP0, errno); D(ERR, "[ %s: Switching to V1_descriptor format errno=%d ]\n", USB_FFS_FASTBOOT_EP0, errno);
ret = write(usb_transport->control, &v1_descriptor, sizeof(v1_descriptor)); ret = write(usb_transport->control, &v1_descriptor, sizeof(v1_descriptor));
if (ret < 0) { if (ret < 0) {
D(ERR, "[ %s: write descriptors failed: errno=%d ]", USB_FFS_FASTBOOT_EP0, errno); D(ERR, "[ %s: write descriptors failed: errno=%d ]", USB_FFS_FASTBOOT_EP0, errno);