aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-10-13 13:28:36 +0200
committerBjørn Mork <bjorn@mork.no>2012-10-13 13:28:36 +0200
commit7656d7818169f567d19503f5413158c370e5bc49 (patch)
tree560d464eaf4e0da86da4193c87dad188eb1dd250
parent30f0379ea9581ed0f24f6a8fc554670fe5f041ef (diff)
usb-mbim: descriptors are *interface*, not device
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r--hw/usb/dev-mbim.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/usb/dev-mbim.c b/hw/usb/dev-mbim.c
index 46e1a4046..a2bf4b84f 100644
--- a/hw/usb/dev-mbim.c
+++ b/hw/usb/dev-mbim.c
@@ -68,13 +68,13 @@ static const USBDescStrings desc_strings = {
/* CDC functional descriptors: */
static const uint8_t cdc_header[] = {
0x05, /* bLength; */
- 0x21, /* bDescriptorType; Functional */
+ 0x24, /* bDescriptorType; Functional */
0x00, /* bDescriptorSubType */
0x10, 0x01, /* bcdCDC 1.10 */
};
static const uint8_t cdc_mbim[] = {
0x0c, /* bLength; */
- 0x21, /* bDescriptorType; Functional */
+ 0x24, /* bDescriptorType; Functional */
0x1b, /* bDescriptorSubType */
0x00, 0x01, /* bcdMBIMVersion 1.00 */
0x00, 0x06, /* wMaxControlMessage 1536 */
@@ -85,7 +85,7 @@ static const uint8_t cdc_mbim[] = {
};
static const uint8_t cdc_union[] = {
0x05, /* bLength; */
- 0x21, /* bDescriptorType; Functional */
+ 0x24, /* bDescriptorType; Functional */
0x06, /* bDescriptorSubType */
0x00, /* bMasterInterface 0 */
0x01, /* bSlaveInterface 1 */
@@ -93,7 +93,7 @@ static const uint8_t cdc_union[] = {
static const uint8_t cdc_ethernet[] = {
0x0d, /* bLength; */
- 0x21, /* bDescriptorType; Functional */
+ 0x24, /* bDescriptorType; Functional */
0x0f, /* bDescriptorSubType */
STR_MACADDRESS, /* iMacAddress */
0x00, 0x00, 0x00, 0x00, /* bmEthernetStatistics 0x00000000 */
@@ -103,14 +103,14 @@ static const uint8_t cdc_ethernet[] = {
};
static const uint8_t cdc_ncm[] = {
0x06, /* bLength; */
- 0x21, /* bDescriptorType; Functional */
+ 0x24, /* bDescriptorType; Functional */
0x1a, /* bDescriptorSubType */
0x00, 0x01, /* bcdNcmVersion 1.00 */
0x1b, /* bmNetworkCapabilities 0x1b */
};
static const uint8_t cdc_commandset[] = {
0x16, /* bLength; */
- 0x21, /* bDescriptorType; Functional */
+ 0x24, /* bDescriptorType; Functional */
0x16, /* bDescriptorSubType */
0x00, 0x01, /* bcdVersion 1.00 */
STR_COMMANDSET, /* iCommandSet 13 S_NCM_CMD_FUNC */