diff options
-rw-r--r-- | firmware/SOURCES | 10 | ||||
-rw-r--r-- | firmware/export/config-cowond2.h | 8 | ||||
-rw-r--r-- | firmware/export/usb-tcc.h (renamed from firmware/export/usb-tcc7xx.h) | 0 | ||||
-rw-r--r-- | firmware/target/arm/usb-tcc.c (renamed from firmware/target/arm/tcc77x/usb-tcc77x.c) | 2 | ||||
-rw-r--r-- | firmware/usbstack/usb_core.c | 12 |
5 files changed, 25 insertions, 7 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 9b576d435a..d0862ba37b 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1013,7 +1013,7 @@ target/arm/tcc77x/kernel-tcc77x.c | |||
1013 | target/arm/tcc77x/powermgmt-tcc77x.c | 1013 | target/arm/tcc77x/powermgmt-tcc77x.c |
1014 | target/arm/tcc77x/system-tcc77x.c | 1014 | target/arm/tcc77x/system-tcc77x.c |
1015 | target/arm/tcc77x/timer-tcc77x.c | 1015 | target/arm/tcc77x/timer-tcc77x.c |
1016 | target/arm/tcc77x/usb-tcc77x.c | 1016 | target/arm/usb-tcc.c |
1017 | target/arm/tcc77x/logikdax/button-logikdax.c | 1017 | target/arm/tcc77x/logikdax/button-logikdax.c |
1018 | target/arm/tcc77x/logikdax/power-logikdax.c | 1018 | target/arm/tcc77x/logikdax/power-logikdax.c |
1019 | #ifndef BOOTLOADER | 1019 | #ifndef BOOTLOADER |
@@ -1034,7 +1034,7 @@ target/arm/tcc77x/kernel-tcc77x.c | |||
1034 | target/arm/tcc77x/powermgmt-tcc77x.c | 1034 | target/arm/tcc77x/powermgmt-tcc77x.c |
1035 | target/arm/tcc77x/system-tcc77x.c | 1035 | target/arm/tcc77x/system-tcc77x.c |
1036 | target/arm/tcc77x/timer-tcc77x.c | 1036 | target/arm/tcc77x/timer-tcc77x.c |
1037 | target/arm/tcc77x/usb-tcc77x.c | 1037 | target/arm/usb-tcc.c |
1038 | target/arm/tcc77x/m200/button-m200.c | 1038 | target/arm/tcc77x/m200/button-m200.c |
1039 | target/arm/tcc77x/m200/power-m200.c | 1039 | target/arm/tcc77x/m200/power-m200.c |
1040 | #ifndef BOOTLOADER | 1040 | #ifndef BOOTLOADER |
@@ -1055,7 +1055,7 @@ target/arm/tcc77x/c100/lcd-S6B33B2.c | |||
1055 | target/arm/tcc77x/powermgmt-tcc77x.c | 1055 | target/arm/tcc77x/powermgmt-tcc77x.c |
1056 | target/arm/tcc77x/system-tcc77x.c | 1056 | target/arm/tcc77x/system-tcc77x.c |
1057 | target/arm/tcc77x/timer-tcc77x.c | 1057 | target/arm/tcc77x/timer-tcc77x.c |
1058 | target/arm/tcc77x/usb-tcc77x.c | 1058 | target/arm/usb-tcc.c |
1059 | target/arm/tcc77x/c100/button-c100.c | 1059 | target/arm/tcc77x/c100/button-c100.c |
1060 | target/arm/tcc77x/c100/power-c100.c | 1060 | target/arm/tcc77x/c100/power-c100.c |
1061 | #ifndef BOOTLOADER | 1061 | #ifndef BOOTLOADER |
@@ -1110,7 +1110,7 @@ target/arm/tcc77x/kernel-tcc77x.c | |||
1110 | target/arm/tcc77x/timer-tcc77x.c | 1110 | target/arm/tcc77x/timer-tcc77x.c |
1111 | target/arm/tcc77x/adc-tcc77x.c | 1111 | target/arm/tcc77x/adc-tcc77x.c |
1112 | target/arm/tcc77x/powermgmt-tcc77x.c | 1112 | target/arm/tcc77x/powermgmt-tcc77x.c |
1113 | target/arm/tcc77x/usb-tcc77x.c | 1113 | target/arm/usb-tcc.c |
1114 | target/arm/tcc77x/iaudio7/lcd-iaudio7.c | 1114 | target/arm/tcc77x/iaudio7/lcd-iaudio7.c |
1115 | target/arm/tcc77x/iaudio7/power-iaudio7.c | 1115 | target/arm/tcc77x/iaudio7/power-iaudio7.c |
1116 | target/arm/tcc77x/iaudio7/button-iaudio7.c | 1116 | target/arm/tcc77x/iaudio7/button-iaudio7.c |
@@ -1135,8 +1135,8 @@ target/arm/tcc780x/cowond2/button-cowond2.c | |||
1135 | target/arm/tcc780x/cowond2/lcd-cowond2.c | 1135 | target/arm/tcc780x/cowond2/lcd-cowond2.c |
1136 | target/arm/tcc780x/cowond2/power-cowond2.c | 1136 | target/arm/tcc780x/cowond2/power-cowond2.c |
1137 | target/arm/tcc780x/cowond2/powermgmt-cowond2.c | 1137 | target/arm/tcc780x/cowond2/powermgmt-cowond2.c |
1138 | target/arm/tcc780x/cowond2/usb-cowond2.c | ||
1139 | target/arm/tcc780x/cowond2/backlight-cowond2.c | 1138 | target/arm/tcc780x/cowond2/backlight-cowond2.c |
1139 | target/arm/usb-tcc.c | ||
1140 | #ifndef BOOTLOADER | 1140 | #ifndef BOOTLOADER |
1141 | target/arm/tcc780x/kernel-tcc780x.c | 1141 | target/arm/tcc780x/kernel-tcc780x.c |
1142 | target/arm/tcc780x/timer-tcc780x.c | 1142 | target/arm/tcc780x/timer-tcc780x.c |
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h index c6e4555f18..edeb834ef7 100644 --- a/firmware/export/config-cowond2.h +++ b/firmware/export/config-cowond2.h | |||
@@ -8,6 +8,14 @@ | |||
8 | 8 | ||
9 | #define MODEL_NAME "Cowon D2" | 9 | #define MODEL_NAME "Cowon D2" |
10 | 10 | ||
11 | #if 0 | ||
12 | #define HAVE_USBSTACK | ||
13 | #define USE_ROCKBOX_USB | ||
14 | #define USB_VENDOR_ID 0x0e21 | ||
15 | #define USB_PRODUCT_ID 0x0800 | ||
16 | #endif | ||
17 | |||
18 | |||
11 | /* Produce a dual-boot bootloader.bin for mktccboot */ | 19 | /* Produce a dual-boot bootloader.bin for mktccboot */ |
12 | #define TCCBOOT | 20 | #define TCCBOOT |
13 | 21 | ||
diff --git a/firmware/export/usb-tcc7xx.h b/firmware/export/usb-tcc.h index 787977312f..787977312f 100644 --- a/firmware/export/usb-tcc7xx.h +++ b/firmware/export/usb-tcc.h | |||
diff --git a/firmware/target/arm/tcc77x/usb-tcc77x.c b/firmware/target/arm/usb-tcc.c index f5bb7c9ff2..345f6bed78 100644 --- a/firmware/target/arm/tcc77x/usb-tcc77x.c +++ b/firmware/target/arm/usb-tcc.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include "config.h" | 22 | #include "config.h" |
23 | #include "usb.h" | 23 | #include "usb.h" |
24 | 24 | ||
25 | #include "usb-tcc7xx.h" | 25 | #include "usb-tcc.h" |
26 | 26 | ||
27 | #include "cpu.h" | 27 | #include "cpu.h" |
28 | #include "system.h" | 28 | #include "system.h" |
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index 6003c8d197..5f22d87c5e 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c | |||
@@ -314,7 +314,17 @@ static void set_serial_descriptor(void) | |||
314 | usb_string_iSerial.bLength=68; | 314 | usb_string_iSerial.bLength=68; |
315 | } | 315 | } |
316 | #else | 316 | #else |
317 | #error No set_serial_descriptor() implementation for this target | 317 | #warning No proper set_serial_descriptor() implementation for this target |
318 | static void set_serial_descriptor(void) | ||
319 | { | ||
320 | short* p = &usb_string_iSerial.wString[1]; | ||
321 | int i; | ||
322 | for (i = 0; i < 16; i++) { | ||
323 | *p++ = hex[(2*i)&0xF]; | ||
324 | *p++ = hex[(2*i+1)&0xF]; | ||
325 | } | ||
326 | usb_string_iSerial.bLength=68; | ||
327 | } | ||
318 | #endif | 328 | #endif |
319 | 329 | ||
320 | void usb_core_init(void) | 330 | void usb_core_init(void) |