diff options
Diffstat (limited to 'usb-dfu-experiment/main.c')
| -rw-r--r-- | usb-dfu-experiment/main.c | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/usb-dfu-experiment/main.c b/usb-dfu-experiment/main.c index 91c35b4..a939799 100644 --- a/usb-dfu-experiment/main.c +++ b/usb-dfu-experiment/main.c @@ -54,7 +54,6 @@ #include <usb/device/core/USBD.h> #include <usb/device/core/USBDDriver.h> -#include <usb/common/core/USBStringDescriptor.h> #include <usb/device/dfu/dfu.h> #include "dfu_desc.h" @@ -260,28 +259,6 @@ void USBDCallbacks_Suspended(void) USBState = STATE_SUSPEND; } - -static int to_usb_string(char *out, int out_len, const char *in) -{ - int in_len = strlen(in); - int num_out = USBStringDescriptor_LENGTH(in_len); - int i; - char *cur = out; - - if (num_out > out_len || num_out >= 255 || num_out < 0) - return -EINVAL; - - *cur++ = num_out; - *cur++ = USBGenericDescriptor_STRING; - - for (i = 0; i < in_len; i++) { - *cur++ = in[i]; - *cur++ = 0; - } - - return cur - out; -} - /* USBD callback */ void USBDCallbacks_RequestReceived(const USBGenericRequest *request) { @@ -315,6 +292,7 @@ int USBDFU_handle_dnload(uint8_t altif, unsigned int offset, uint8_t *buf, unsigned int len) { TRACE_INFO("DFU: handle_dnload(%u, %u, %u)\n\r", altif, offset, len); + return DFU_RET_ZLP; } @@ -324,7 +302,6 @@ void dfu_drv_updstatus(void) TRACE_INFO("DFU: updstatus()\n\r"); } - /*---------------------------------------------------------------------------- * Exported functions *----------------------------------------------------------------------------*/ @@ -341,6 +318,8 @@ int main(void) printf("-- %s\n\r", BOARD_NAME); printf("-- Compiled: %s %s --\n\r", __DATE__, __TIME__); + chipid_to_usbserial(); + /* If they are present, configure Vbus & Wake-up pins */ PIO_InitializeInterrupts(0); |