sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use our new USB VID/PID. Thanks OpenMoko, Inc. 

DFU now uses the same short serial number as application.
This commit is contained in:
Gareth McMullin 2012-05-26 15:20:23 +12:00
parent 01bf5e6b44
commit e533812c32
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stm32/cdcacm.c
View File

@ -55,9 +55,9 @@ static const struct usb_device_descriptor dev = {
.bDeviceSubClass = 2, /* Common Class */ .bDeviceSubClass = 2, /* Common Class */
.bDeviceProtocol = 1, /* Interface Association */ .bDeviceProtocol = 1, /* Interface Association */
.bMaxPacketSize0 = 64, .bMaxPacketSize0 = 64,
.idVendor = 0x0483, .idVendor = 0x1D50,
.idProduct = 0x5740, .idProduct = 0x6018,
.bcdDevice = 0x0200, .bcdDevice = 0x0100,
.iManufacturer = 1, .iManufacturer = 1,
.iProduct = 2, .iProduct = 2,
.iSerialNumber = 3, .iSerialNumber = 3,

21
src/stm32/usbdfu.c
View File

@ -59,9 +59,9 @@ const struct usb_device_descriptor dev = {
.bDeviceSubClass = 0, .bDeviceSubClass = 0,
.bDeviceProtocol = 0, .bDeviceProtocol = 0,
.bMaxPacketSize0 = 64, .bMaxPacketSize0 = 64,
.idVendor = 0x0483, .idVendor = 0x1D50,
.idProduct = 0xDF11, .idProduct = 0x6017,
.bcdDevice = 0x0200, .bcdDevice = 0x0100,
.iManufacturer = 1, .iManufacturer = 1,
.iProduct = 2, .iProduct = 2,
.iSerialNumber = 3, .iSerialNumber = 3,
@ -113,7 +113,7 @@ const struct usb_config_descriptor config = {
.interface = ifaces, .interface = ifaces,
}; };
static char serial_no[25]; static char serial_no[9];
static const char *usb_strings[] = { static const char *usb_strings[] = {
"x", "x",
@ -304,17 +304,20 @@ int main(void)
static char *get_dev_unique_id(char *s) static char *get_dev_unique_id(char *s)
{ {
volatile uint8_t *unique_id = (volatile uint8_t *)0x1FFFF7E8; volatile uint32_t *unique_id_p = (volatile uint32_t *)0x1FFFF7E8;
uint32_t unique_id = *unique_id_p +
*(unique_id_p + 1) +
*(unique_id_p + 2);
int i; int i;
/* Fetch serial number from chip's unique ID */ /* Fetch serial number from chip's unique ID */
for(i = 0; i < 24; i+=2) { for(i = 0; i < 8; i++) {
s[i] = ((*unique_id >> 4) & 0xF) + '0'; s[7-i] = ((unique_id >> (4*i)) & 0xF) + '0';
s[i+1] = (*unique_id++ & 0xF) + '0';
} }
for(i = 0; i < 24; i++) for(i = 0; i < 8; i++)
if(s[i] > '9') if(s[i] > '9')
s[i] += 'A' - '9' - 1; s[i] += 'A' - '9' - 1;
s[8] = 0;
return s; return s;
} }