From f519bbe55f6917d86af6bb4946dfef073175d8f3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Mar 2021 17:25:36 +0000 Subject: cosmetic changes --- app/dfu.c | 2 -- app/usb.c | 3 ++- boot/usb.c | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/dfu.c b/app/dfu.c index 5aebe34..08e3bf9 100644 --- a/app/dfu.c +++ b/app/dfu.c @@ -60,8 +60,6 @@ dfu_control_request (usbd_device *usbd_dev, struct usb_setup_data *req, (void) len; (void) usbd_dev; - printf ("dfu_control_request %02x %02x\n", req->bmRequestType, req->bRequest); - if ((req->bmRequestType & 0x7F) != 0x21) { return 0; /* Only accept class request. */ } diff --git a/app/usb.c b/app/usb.c index ea432ef..fc9e6ea 100644 --- a/app/usb.c +++ b/app/usb.c @@ -60,6 +60,7 @@ static const struct usb_config_descriptor config = { .bMaxPower = 0x32, .interface = ifaces, }; +#define N_USB_STRINGS (sizeof(usb_strings)/sizeof(usb_strings[0])) static const char *usb_strings[] = { VENDOR_NAME, /*1*/ @@ -112,7 +113,7 @@ void usb_init (void) &dev, &config, usb_strings, - 6, + N_USB_STRINGS, usbd_control_buffer, sizeof (usbd_control_buffer)); diff --git a/boot/usb.c b/boot/usb.c index 1454750..7670491 100644 --- a/boot/usb.c +++ b/boot/usb.c @@ -51,6 +51,7 @@ static const char *usb_strings[] = { /* This string is used by ST Microelectronics' DfuSe utility. */ "@Internal Flash /0x08000000/04*016Kg,01*064Kg,07*128Kg", }; +#define N_USB_STRINGS (sizeof(usb_strings)/sizeof(usb_strings[0])) void usb_set_config (usbd_device *usbd_dev, uint16_t wValue) @@ -79,7 +80,7 @@ void usb (void) MAP_AF_100 (USB_DM, GPIO_AF10); - usbd_dev = usbd_init (&otgfs_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof (usbd_control_buffer)); + usbd_dev = usbd_init (&otgfs_usb_driver, &dev, &config, usb_strings, N_USB_STRINGS, usbd_control_buffer, sizeof (usbd_control_buffer)); OTG_FS_GCCFG |= OTG_GCCFG_NOVBUSSENS; OTG_FS_GCCFG &= ~OTG_GCCFG_VBUSASEN; -- cgit v1.2.3