nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move tcc77x/usb-tcc77x.c to usb-tcc.c as it is more general than just tcc77x (even usb-tcc is too specific, but I don't know anything better) 

Add #if0ed USB defines to config-cowond2.h, so experimenting with USB is easy
Add dummy set_serial_descriptor() implementation to usb_core.c. This one doesn't generate a unique serial, so it must never be used for non-testing purposes. When usaed, a compiler warning will be generated


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19273 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Frank Gevaerts 2008-11-30 15:43:15 +00:00
parent 5f7db212d5
commit caaf3c0b97
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/SOURCES
View File

@ -1013,7 +1013,7 @@ target/arm/tcc77x/kernel-tcc77x.c
target/arm/tcc77x/powermgmt-tcc77x.c
target/arm/tcc77x/system-tcc77x.c
target/arm/tcc77x/timer-tcc77x.c
target/arm/tcc77x/usb-tcc77x.c
target/arm/usb-tcc.c
target/arm/tcc77x/logikdax/button-logikdax.c
target/arm/tcc77x/logikdax/power-logikdax.c
#ifndef BOOTLOADER
@ -1034,7 +1034,7 @@ target/arm/tcc77x/kernel-tcc77x.c
target/arm/tcc77x/powermgmt-tcc77x.c
target/arm/tcc77x/system-tcc77x.c
target/arm/tcc77x/timer-tcc77x.c
target/arm/tcc77x/usb-tcc77x.c
target/arm/usb-tcc.c
target/arm/tcc77x/m200/button-m200.c
target/arm/tcc77x/m200/power-m200.c
#ifndef BOOTLOADER
@ -1055,7 +1055,7 @@ target/arm/tcc77x/c100/lcd-S6B33B2.c
target/arm/tcc77x/powermgmt-tcc77x.c
target/arm/tcc77x/system-tcc77x.c
target/arm/tcc77x/timer-tcc77x.c
target/arm/tcc77x/usb-tcc77x.c
target/arm/usb-tcc.c
target/arm/tcc77x/c100/button-c100.c
target/arm/tcc77x/c100/power-c100.c
#ifndef BOOTLOADER
@ -1110,7 +1110,7 @@ target/arm/tcc77x/kernel-tcc77x.c
target/arm/tcc77x/timer-tcc77x.c
target/arm/tcc77x/adc-tcc77x.c
target/arm/tcc77x/powermgmt-tcc77x.c
target/arm/tcc77x/usb-tcc77x.c
target/arm/usb-tcc.c
target/arm/tcc77x/iaudio7/lcd-iaudio7.c
target/arm/tcc77x/iaudio7/power-iaudio7.c
target/arm/tcc77x/iaudio7/button-iaudio7.c
@ -1135,8 +1135,8 @@ target/arm/tcc780x/cowond2/button-cowond2.c
target/arm/tcc780x/cowond2/lcd-cowond2.c
target/arm/tcc780x/cowond2/power-cowond2.c
target/arm/tcc780x/cowond2/powermgmt-cowond2.c
target/arm/tcc780x/cowond2/usb-cowond2.c
target/arm/tcc780x/cowond2/backlight-cowond2.c
target/arm/usb-tcc.c
#ifndef BOOTLOADER
target/arm/tcc780x/kernel-tcc780x.c
target/arm/tcc780x/timer-tcc780x.c

8
firmware/export/config-cowond2.h
View File

@ -8,6 +8,14 @@
#define MODEL_NAME "Cowon D2"
#if 0
#define HAVE_USBSTACK
#define USE_ROCKBOX_USB
#define USB_VENDOR_ID 0x0e21
#define USB_PRODUCT_ID 0x0800
#endif
/* Produce a dual-boot bootloader.bin for mktccboot */
#define TCCBOOT

0
firmware/export/usb-tcc7xx.h → firmware/export/usb-tcc.h
View File

2
firmware/target/arm/tcc77x/usb-tcc77x.c → firmware/target/arm/usb-tcc.c
View File

@ -22,7 +22,7 @@
#include "config.h"
#include "usb.h"
#include "usb-tcc7xx.h"
#include "usb-tcc.h"
#include "cpu.h"
#include "system.h"

12
firmware/usbstack/usb_core.c
View File

@ -314,7 +314,17 @@ static void set_serial_descriptor(void)
usb_string_iSerial.bLength=68;
}
#else
#error No set_serial_descriptor() implementation for this target
#warning No proper set_serial_descriptor() implementation for this target
static void set_serial_descriptor(void)
{
short* p = &usb_string_iSerial.wString[1];
int i;
for (i = 0; i < 16; i++) {
*p++ = hex[(2*i)&0xF];
*p++ = hex[(2*i+1)&0xF];
}
usb_string_iSerial.bLength=68;
}
#endif
void usb_core_init(void)