Skip to content

usbdfu small tidy up #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

usbdfu small tidy up #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65b1c38
usbdfu: Sync stm32-h103, other, and lisa-m-1 example
tormodvolden Sep 28, 2021
b9634e7
usbdfu: Update descriptor comments
tormodvolden Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions examples/stm32/f1/lisa-m-1/usb_dfu/usbdfu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const struct usb_dfu_descriptor dfu_function = {
.bmAttributes = USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH,
.wDetachTimeout = 255,
.wTransferSize = 1024,
.bcdDFUVersion = 0x011A,
.bcdDFUVersion = 0x011A, /* 1.1a is ST's DFU extension */
};

const struct usb_interface_descriptor iface = {
Expand All @@ -75,12 +75,12 @@ const struct usb_interface_descriptor iface = {
.bInterfaceNumber = 0,
.bAlternateSetting = 0,
.bNumEndpoints = 0,
.bInterfaceClass = 0xFE, /* Device Firmware Upgrade */
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 2,
.bInterfaceClass = 0xFE, /* Application Specific Class */
.bInterfaceSubClass = 1, /* Device Firmware Upgrade */
.bInterfaceProtocol = 2, /* DFU mode */

/* The ST Microelectronics DfuSe application needs this string.
* The format isn't documented... */
* The format is documented in ST's UM0424 section 10.3.2 */
.iInterface = 4,

.extra = &dfu_function,
Expand Down Expand Up @@ -266,7 +266,7 @@ int main(void)
rcc_periph_clock_enable(RCC_OTGFS);

gpio_set(GPIOC, GPIO2);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);

usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
Expand Down
18 changes: 10 additions & 8 deletions examples/stm32/f1/other/usb_dfu/usbdfu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const struct usb_dfu_descriptor dfu_function = {
.bmAttributes = USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH,
.wDetachTimeout = 255,
.wTransferSize = 1024,
.bcdDFUVersion = 0x011A,
.bcdDFUVersion = 0x011A, /* 1.1a is ST's DFU extension */
};

const struct usb_interface_descriptor iface = {
Expand All @@ -75,12 +75,12 @@ const struct usb_interface_descriptor iface = {
.bInterfaceNumber = 0,
.bAlternateSetting = 0,
.bNumEndpoints = 0,
.bInterfaceClass = 0xFE, /* Device Firmware Upgrade */
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 2,
.bInterfaceClass = 0xFE, /* Application Specific Class */
.bInterfaceSubClass = 1, /* Device Firmware Upgrade */
.bInterfaceProtocol = 2, /* DFU mode */

/* The ST Microelectronics DfuSe application needs this string.
* The format isn't documented... */
* The format is documented in ST's UM0424 section 10.3.2 */
.iInterface = 4,

.extra = &dfu_function,
Expand Down Expand Up @@ -270,13 +270,15 @@ int main(void)

rcc_periph_clock_enable(RCC_OTGFS);

usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, usbdfu_set_config);

gpio_set(GPIOA, GPIO15);
gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO15);

usbd_dev = usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, usbdfu_set_config);

gpio_clear(GPIOA, GPIO15);

while (1)
usbd_poll(usbd_dev);
}
22 changes: 11 additions & 11 deletions examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const struct usb_dfu_descriptor dfu_function = {
.bmAttributes = USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH,
.wDetachTimeout = 255,
.wTransferSize = 1024,
.bcdDFUVersion = 0x011A,
.bcdDFUVersion = 0x011A, /* 1.1a is ST's DFU extension */
};

const struct usb_interface_descriptor iface = {
Expand All @@ -75,12 +75,12 @@ const struct usb_interface_descriptor iface = {
.bInterfaceNumber = 0,
.bAlternateSetting = 0,
.bNumEndpoints = 0,
.bInterfaceClass = 0xFE, /* Device Firmware Upgrade */
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 2,
.bInterfaceClass = 0xFE, /* Application Specific Class */
.bInterfaceSubClass = 1, /* Device Firmware Upgrade */
.bInterfaceProtocol = 2, /* DFU mode */

/* The ST Microelectronics DfuSe application needs this string.
* The format isn't documented... */
* The format is documented in ST's UM0424 section 10.3.2 */
.iInterface = 4,

.extra = &dfu_function,
Expand Down Expand Up @@ -113,10 +113,8 @@ static const char *usb_strings[] = {
"@Internal Flash /0x08000000/8*001Ka,56*001Kg",
};

static uint8_t usbdfu_getstatus(usbd_device *usbd_dev, uint32_t *bwPollTimeout)
static uint8_t usbdfu_getstatus(uint32_t *bwPollTimeout)
{
(void)usbd_dev;

switch (usbdfu_state) {
case STATE_DFU_DNLOAD_SYNC:
usbdfu_state = STATE_DFU_DNBUSY;
Expand Down Expand Up @@ -181,6 +179,8 @@ static void usbdfu_getstatus_complete(usbd_device *usbd_dev, struct usb_setup_da
static enum usbd_request_return_codes usbdfu_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf,
uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{
(void)usbd_dev;

if ((req->bmRequestType & 0x7F) != 0x21)
return USBD_REQ_NOTSUPP; /* Only accept class request. */

Expand Down Expand Up @@ -210,7 +210,7 @@ static enum usbd_request_return_codes usbdfu_control_request(usbd_device *usbd_d
return USBD_REQ_NOTSUPP;
case DFU_GETSTATUS: {
uint32_t bwPollTimeout = 0; /* 24-bit integer in DFU class spec */
(*buf)[0] = usbdfu_getstatus(usbd_dev, &bwPollTimeout);
(*buf)[0] = usbdfu_getstatus(&bwPollTimeout);
(*buf)[1] = bwPollTimeout & 0xFF;
(*buf)[2] = (bwPollTimeout >> 8) & 0xFF;
(*buf)[3] = (bwPollTimeout >> 16) & 0xFF;
Expand Down Expand Up @@ -264,9 +264,9 @@ int main(void)

rcc_periph_clock_enable(RCC_GPIOC);

gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);
gpio_set(GPIOC, GPIO11);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO11);

usbd_dev = usbd_init(&st_usbfs_v1_usb_driver, &dev, &config, usb_strings, 4, usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, usbdfu_set_config);
Expand Down
19 changes: 9 additions & 10 deletions examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const struct usb_dfu_descriptor dfu_function = {
.bmAttributes = USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH,
.wDetachTimeout = 255,
.wTransferSize = 1024,
.bcdDFUVersion = 0x011A,
.bcdDFUVersion = 0x011A, /* 1.1a is ST's DFU extension */
};

const struct usb_interface_descriptor iface = {
Expand All @@ -75,12 +75,12 @@ const struct usb_interface_descriptor iface = {
.bInterfaceNumber = 0,
.bAlternateSetting = 0,
.bNumEndpoints = 0,
.bInterfaceClass = 0xFE, /* Device Firmware Upgrade */
.bInterfaceSubClass = 1,
.bInterfaceProtocol = 2,
.bInterfaceClass = 0xFE, /* Application Specific Class */
.bInterfaceSubClass = 1, /* Device Firmware Upgrade */
.bInterfaceProtocol = 2, /* DFU mode */

/* The ST Microelectronics DfuSe application needs this string.
* The format isn't documented... */
* The format is documented in ST's UM0424 section 10.3.2 */
.iInterface = 4,

.extra = &dfu_function,
Expand Down Expand Up @@ -113,10 +113,8 @@ static const char *usb_strings[] = {
"@Internal Flash /0x08000000/8*001Ka,56*001Kg",
};

static uint8_t usbdfu_getstatus(usbd_device *usbd_dev, uint32_t *bwPollTimeout)
static uint8_t usbdfu_getstatus(uint32_t *bwPollTimeout)
{
(void)usbd_dev;

switch (usbdfu_state) {
case STATE_DFU_DNLOAD_SYNC:
usbdfu_state = STATE_DFU_DNBUSY;
Expand Down Expand Up @@ -181,6 +179,8 @@ static void usbdfu_getstatus_complete(usbd_device *usbd_dev, struct usb_setup_da
static enum usbd_request_return_codes usbdfu_control_request(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t **buf,
uint16_t *len, void (**complete)(usbd_device *usbd_dev, struct usb_setup_data *req))
{
(void)usbd_dev;

if ((req->bmRequestType & 0x7F) != 0x21)
return USBD_REQ_NOTSUPP; /* Only accept class request. */

Expand Down Expand Up @@ -210,7 +210,7 @@ static enum usbd_request_return_codes usbdfu_control_request(usbd_device *usbd_d
return USBD_REQ_NOTSUPP;
case DFU_GETSTATUS: {
uint32_t bwPollTimeout = 0; /* 24-bit integer in DFU class spec */
(*buf)[0] = usbdfu_getstatus(usbd_dev, &bwPollTimeout);
(*buf)[0] = usbdfu_getstatus(&bwPollTimeout);
(*buf)[1] = bwPollTimeout & 0xFF;
(*buf)[2] = (bwPollTimeout >> 8) & 0xFF;
(*buf)[3] = (bwPollTimeout >> 16) & 0xFF;
Expand Down Expand Up @@ -241,7 +241,6 @@ static void usbdfu_set_config(usbd_device *usbd_dev, uint16_t wValue)
usbdfu_control_request);
}


int main(void)
{
usbd_device *usbd_dev;
Expand Down