diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-04-12 00:06:31 +0200 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-04-12 00:11:13 +0200 |
| commit | 910235b49a754fcd18157dbd22e125a32b482c9d (patch) | |
| tree | c7d6bce9ed7c73d27c5bae4c42564c6745417c74 /utils | |
| parent | 957613420e9c4906e8bb8ac685e10fc0c24329b8 (diff) | |
| download | rockbox-910235b49a754fcd18157dbd22e125a32b482c9d.zip rockbox-910235b49a754fcd18157dbd22e125a32b482c9d.tar.gz rockbox-910235b49a754fcd18157dbd22e125a32b482c9d.tar.bz2 rockbox-910235b49a754fcd18157dbd22e125a32b482c9d.tar.xz | |
hwstub: fix error in config descriptor, cleanup some code
Change-Id: I853340ed2c187a044726ca03ec52aed655707e27
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/hwstub/hwstub_protocol.h | 2 | ||||
| -rw-r--r-- | utils/hwstub/stub/main.c | 3 | ||||
| -rw-r--r-- | utils/hwstub/stub/rk27xx/target-config.h | 2 | ||||
| -rw-r--r-- | utils/hwstub/stub/stmp/target-config.h | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/utils/hwstub/hwstub_protocol.h b/utils/hwstub/hwstub_protocol.h index a34c65b..67945cd 100644 --- a/utils/hwstub/hwstub_protocol.h +++ b/utils/hwstub/hwstub_protocol.h @@ -27,7 +27,7 @@ #define HWSTUB_VERSION_MAJOR 3 #define HWSTUB_VERSION_MINOR 0 -#define HWSTUB_VERSION_REV 0 +#define HWSTUB_VERSION_REV 1 #define HWSTUB_USB_VID 0xfee1 #define HWSTUB_USB_PID 0xdead diff --git a/utils/hwstub/stub/main.c b/utils/hwstub/stub/main.c index 37590e8..c831de0 100644 --- a/utils/hwstub/stub/main.c +++ b/utils/hwstub/stub/main.c @@ -171,7 +171,7 @@ static void handle_std_dev_desc(struct usb_ctrlrequest *req) } else { - max_packet_size=(usb_drv_port_speed() ? 64 : 512); + max_packet_size = (usb_drv_port_speed() ? 64 : 512); config_descriptor.bDescriptorType = USB_DT_OTHER_SPEED_CONFIG; } size = sizeof(struct usb_config_descriptor); @@ -193,7 +193,6 @@ static void handle_std_dev_desc(struct usb_ctrlrequest *req) /* target specific descriptors */ target_get_config_desc(usb_buffer + size, &size); /* fix config descriptor */ - config_descriptor.bNumInterfaces = 1; config_descriptor.wTotalLength = size; memcpy(usb_buffer, (void *)&config_descriptor, sizeof(config_descriptor)); diff --git a/utils/hwstub/stub/rk27xx/target-config.h b/utils/hwstub/stub/rk27xx/target-config.h index 6af214e..d13e341 100644 --- a/utils/hwstub/stub/rk27xx/target-config.h +++ b/utils/hwstub/stub/rk27xx/target-config.h @@ -1,8 +1,6 @@ #define CONFIG_RK27XX #define IRAM_ORIG 0x60000000 #define IRAM_SIZE 0x8000 -#define DRAM_ORIG 0x60000000 -#define DRAM_SIZE (MEMORYSIZE * 0x100000) #define CPU_ARM #define ARM_ARCH 5 #define USB_BASE 0x180A000 diff --git a/utils/hwstub/stub/stmp/target-config.h b/utils/hwstub/stub/stmp/target-config.h index aba2cf5..da98652 100644 --- a/utils/hwstub/stub/stmp/target-config.h +++ b/utils/hwstub/stub/stmp/target-config.h @@ -1,8 +1,6 @@ #define CONFIG_STMP #define IRAM_ORIG 0 #define IRAM_SIZE 0x8000 -#define DRAM_ORIG 0x40000000 -#define DRAM_SIZE (MEMORYSIZE * 0x100000) #define CPU_ARM #define ARM_ARCH 5 #define USB_BASE 0x80080000 |