diff options
author | Christopher Ferris <cferris@google.com> | 2015-01-26 21:45:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-26 21:45:16 +0000 |
commit | 2d67a483ede93f1d3906e1d03f46af34887764ac (patch) | |
tree | 3960c40a7c0088726883f3eab367d434d2ad01b8 | |
parent | efa16af53ebc3ef4974ff791d0f03ec66b20a5e8 (diff) | |
parent | cdc38d0401f2798bb13e73d6ca290abab60fc2bf (diff) | |
download | bootable_recovery-2d67a483ede93f1d3906e1d03f46af34887764ac.zip bootable_recovery-2d67a483ede93f1d3906e1d03f46af34887764ac.tar.gz bootable_recovery-2d67a483ede93f1d3906e1d03f46af34887764ac.tar.bz2 |
am cdc38d04: Merge "Fix the v2 descriptor handling."
* commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf':
Fix the v2 descriptor handling.
-rw-r--r-- | minadbd/usb_linux_client.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/minadbd/usb_linux_client.c b/minadbd/usb_linux_client.c index e7d3c48..b3a38dc 100644 --- a/minadbd/usb_linux_client.c +++ b/minadbd/usb_linux_client.c @@ -69,14 +69,10 @@ struct desc_v1 { } __attribute__((packed)); struct desc_v2 { - struct usb_functionfs_descs_head_v2 { - __le32 magic; - __le32 length; - __le32 flags; - __le32 fs_count; - __le32 hs_count; - __le32 ss_count; - } __attribute__((packed)) header; + struct usb_functionfs_descs_head_v2 header; + // The rest of the structure depends on the flags in the header. + __le32 fs_count; + __le32 hs_count; struct func_desc fs_descs, hs_descs; } __attribute__((packed)); @@ -304,9 +300,8 @@ static void init_functionfs(struct usb_handle *h) v2_descriptor.header.magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2); 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.fs_count = 3; - v2_descriptor.header.hs_count = 3; - v2_descriptor.header.ss_count = 0; + v2_descriptor.fs_count = 3; + v2_descriptor.hs_count = 3; v2_descriptor.fs_descs = fs_descriptors; v2_descriptor.hs_descs = hs_descriptors; |