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/hwstub/stub | |
parent | 957613420e9c4906e8bb8ac685e10fc0c24329b8 (diff) | |
download | rockbox-910235b49a754fcd18157dbd22e125a32b482c9d.tar.gz rockbox-910235b49a754fcd18157dbd22e125a32b482c9d.zip |
hwstub: fix error in config descriptor, cleanup some code
Change-Id: I853340ed2c187a044726ca03ec52aed655707e27
Diffstat (limited to 'utils/hwstub/stub')
-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 |
3 files changed, 1 insertions, 6 deletions
diff --git a/utils/hwstub/stub/main.c b/utils/hwstub/stub/main.c index 37590e88f8..c831de0196 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) | |||
171 | } | 171 | } |
172 | else | 172 | else |
173 | { | 173 | { |
174 | max_packet_size=(usb_drv_port_speed() ? 64 : 512); | 174 | max_packet_size = (usb_drv_port_speed() ? 64 : 512); |
175 | config_descriptor.bDescriptorType = USB_DT_OTHER_SPEED_CONFIG; | 175 | config_descriptor.bDescriptorType = USB_DT_OTHER_SPEED_CONFIG; |
176 | } | 176 | } |
177 | size = sizeof(struct usb_config_descriptor); | 177 | size = sizeof(struct usb_config_descriptor); |
@@ -193,7 +193,6 @@ static void handle_std_dev_desc(struct usb_ctrlrequest *req) | |||
193 | /* target specific descriptors */ | 193 | /* target specific descriptors */ |
194 | target_get_config_desc(usb_buffer + size, &size); | 194 | target_get_config_desc(usb_buffer + size, &size); |
195 | /* fix config descriptor */ | 195 | /* fix config descriptor */ |
196 | config_descriptor.bNumInterfaces = 1; | ||
197 | config_descriptor.wTotalLength = size; | 196 | config_descriptor.wTotalLength = size; |
198 | memcpy(usb_buffer, (void *)&config_descriptor, sizeof(config_descriptor)); | 197 | memcpy(usb_buffer, (void *)&config_descriptor, sizeof(config_descriptor)); |
199 | 198 | ||
diff --git a/utils/hwstub/stub/rk27xx/target-config.h b/utils/hwstub/stub/rk27xx/target-config.h index 6af214efaf..d13e341060 100644 --- a/utils/hwstub/stub/rk27xx/target-config.h +++ b/utils/hwstub/stub/rk27xx/target-config.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #define CONFIG_RK27XX | 1 | #define CONFIG_RK27XX |
2 | #define IRAM_ORIG 0x60000000 | 2 | #define IRAM_ORIG 0x60000000 |
3 | #define IRAM_SIZE 0x8000 | 3 | #define IRAM_SIZE 0x8000 |
4 | #define DRAM_ORIG 0x60000000 | ||
5 | #define DRAM_SIZE (MEMORYSIZE * 0x100000) | ||
6 | #define CPU_ARM | 4 | #define CPU_ARM |
7 | #define ARM_ARCH 5 | 5 | #define ARM_ARCH 5 |
8 | #define USB_BASE 0x180A000 | 6 | #define USB_BASE 0x180A000 |
diff --git a/utils/hwstub/stub/stmp/target-config.h b/utils/hwstub/stub/stmp/target-config.h index aba2cf564b..da98652ef5 100644 --- a/utils/hwstub/stub/stmp/target-config.h +++ b/utils/hwstub/stub/stmp/target-config.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #define CONFIG_STMP | 1 | #define CONFIG_STMP |
2 | #define IRAM_ORIG 0 | 2 | #define IRAM_ORIG 0 |
3 | #define IRAM_SIZE 0x8000 | 3 | #define IRAM_SIZE 0x8000 |
4 | #define DRAM_ORIG 0x40000000 | ||
5 | #define DRAM_SIZE (MEMORYSIZE * 0x100000) | ||
6 | #define CPU_ARM | 4 | #define CPU_ARM |
7 | #define ARM_ARCH 5 | 5 | #define ARM_ARCH 5 |
8 | #define USB_BASE 0x80080000 | 6 | #define USB_BASE 0x80080000 |