jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Move usbdfu to platforms/stm32 directory

Browse Source
This commit is contained in:
Uwe Bonnes 2013-01-12 23:06:40 +01:00
parent 67f8176c5b
commit 7188a4a8cb
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/platforms/native/usbdfu.c → src/platforms/stm32/usbdfu.c
View File

@ -29,11 +29,11 @@
#define APP_ADDRESS 0x08002000 #define APP_ADDRESS 0x08002000
/* Commands sent with wBlockNum == 0 as per ST implementation. */ /* Commands sent with wBlockNum == 0 as per ST implementation. */
#define CMD_SETADDR 0x21 #define CMD_SETADDR 0x21
#define CMD_ERASE 0x41 #define CMD_ERASE 0x41
#define FLASH_OBP_RDP 0x1FFFF800 #define FLASH_OBP_RDP 0x1FFFF800
#define FLASH_OBP_WRP10 0x1FFFF808 #define FLASH_OBP_WRP10 0x1FFFF808
#define FLASH_OBP_RDP_KEY 0x5aa5 #define FLASH_OBP_RDP_KEY 0x5aa5
@ -88,7 +88,7 @@ const struct usb_interface_descriptor iface = {
.bInterfaceSubClass = 1, .bInterfaceSubClass = 1,
.bInterfaceProtocol = 2, .bInterfaceProtocol = 2,
/* The ST Microelectronics DfuSe application needs this string. /* The ST Microelectronics DfuSe application needs this string.
* The format isn't documented... */ * The format isn't documented... */
.iInterface = 4, .iInterface = 4,
@ -128,7 +128,7 @@ static u8 usbdfu_getstatus(u32 *bwPollTimeout)
{ {
switch(usbdfu_state) { switch(usbdfu_state) {
case STATE_DFU_DNLOAD_SYNC: case STATE_DFU_DNLOAD_SYNC:
usbdfu_state = STATE_DFU_DNBUSY; usbdfu_state = STATE_DFU_DNBUSY;
*bwPollTimeout = 100; *bwPollTimeout = 100;
return DFU_STATUS_OK; return DFU_STATUS_OK;
@ -165,17 +165,17 @@ usbdfu_getstatus_complete(usbd_device *dev, struct usb_setup_data *req)
prog.addr = *(u32*)(prog.buf+1); prog.addr = *(u32*)(prog.buf+1);
} }
} else { } else {
u32 baseaddr = prog.addr + u32 baseaddr = prog.addr +
((prog.blocknum - 2) * ((prog.blocknum - 2) *
dfu_function.wTransferSize); dfu_function.wTransferSize);
for(i = 0; i < prog.len; i += 2) for(i = 0; i < prog.len; i += 2)
flash_program_half_word(baseaddr + i, flash_program_half_word(baseaddr + i,
*(u16*)(prog.buf+i)); *(u16*)(prog.buf+i));
} }
flash_lock(); flash_lock();
/* We jump straight to dfuDNLOAD-IDLE, /* We jump straight to dfuDNLOAD-IDLE,
* skipping dfuDNLOAD-SYNC * skipping dfuDNLOAD-SYNC
*/ */
usbdfu_state = STATE_DFU_DNLOAD_IDLE; usbdfu_state = STATE_DFU_DNLOAD_IDLE;
return; return;
@ -195,7 +195,7 @@ static int usbdfu_control_request(usbd_device *dev,
{ {
(void)dev; (void)dev;
if((req->bmRequestType & 0x7F) != 0x21) if((req->bmRequestType & 0x7F) != 0x21)
return 0; /* Only accept class request */ return 0; /* Only accept class request */
switch(req->bRequest) { switch(req->bRequest) {
@ -279,13 +279,13 @@ int main(void)
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO8); gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO8);
gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11); GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8); systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8);
systick_set_reload(900000); systick_set_reload(900000);
systick_interrupt_enable(); systick_interrupt_enable();
systick_counter_enable(); systick_counter_enable();
gpio_set_mode(GPIOB, GPIO_MODE_INPUT, gpio_set_mode(GPIOB, GPIO_MODE_INPUT,
GPIO_CNF_INPUT_FLOAT, GPIO2 | GPIO10); GPIO_CNF_INPUT_FLOAT, GPIO2 | GPIO10);
get_dev_unique_id(serial_no); get_dev_unique_id(serial_no);
@ -319,7 +319,7 @@ static char *get_dev_unique_id(char *s)
s[7-i] = ((unique_id >> (4*i)) & 0xF) + '0'; s[7-i] = ((unique_id >> (4*i)) & 0xF) + '0';
} }
for(i = 0; i < 8; 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; s[8] = 0;
@ -330,4 +330,3 @@ void sys_tick_handler()
{ {
gpio_toggle(GPIOB, GPIO11); /* LED2 on/off */ gpio_toggle(GPIOB, GPIO11); /* LED2 on/off */
} }