aboutsummaryrefslogtreecommitdiff
path: root/src/platforms
diff options
context:
space:
mode:
authorBuFran2013-07-29 20:48:17 +0200
committerGareth McMullin2013-10-05 12:23:23 +0800
commite67192348f21fdc3952cabb214a031311a91a367 (patch)
tree00bf8fdf337bf58a5ce5f5a1a4979085fccf665a /src/platforms
parentc857165c12a80c3a2d4cc9d7a4398ec8ef95b1e8 (diff)
FIX: usbd_init compatibility fix
Updated compatibility with libopencm3 commit 113e5c22e6390ba072148315e83a5faa5ff7ce86
Diffstat (limited to 'src/platforms')
-rw-r--r--src/platforms/stm32/cdcacm.c6
-rw-r--r--src/platforms/stm32/dfucore.c5
2 files changed, 7 insertions, 4 deletions
diff --git a/src/platforms/stm32/cdcacm.c b/src/platforms/stm32/cdcacm.c
index edd20d7..010117f 100644
--- a/src/platforms/stm32/cdcacm.c
+++ b/src/platforms/stm32/cdcacm.c
@@ -536,8 +536,10 @@ void cdcacm_init(void)
get_dev_unique_id(serial_no);
- usbdev = usbd_init(&USB_DRIVER, &dev, &config, usb_strings, sizeof(usb_strings)/sizeof(char *));
- usbd_set_control_buffer_size(usbdev, sizeof(usbd_control_buffer));
+ usbdev = usbd_init(&USB_DRIVER, &dev, &config, usb_strings,
+ sizeof(usb_strings)/sizeof(char *),
+ usbd_control_buffer, sizeof(usbd_control_buffer));
+
usbd_register_set_config_callback(usbdev, cdcacm_set_config);
nvic_set_priority(USB_IRQ, IRQ_PRI_USB);
diff --git a/src/platforms/stm32/dfucore.c b/src/platforms/stm32/dfucore.c
index 834c0ad..a01616f 100644
--- a/src/platforms/stm32/dfucore.c
+++ b/src/platforms/stm32/dfucore.c
@@ -255,8 +255,9 @@ void dfu_init(const usbd_driver *driver)
{
get_dev_unique_id(serial_no);
- usbdev = usbd_init(driver, &dev, &config, usb_strings, 4);
- usbd_set_control_buffer_size(usbdev, sizeof(usbd_control_buffer));
+ usbdev = usbd_init(driver, &dev, &config, usb_strings, 4,
+ usbd_control_buffer, sizeof(usbd_control_buffer));
+
usbd_register_control_callback(usbdev,
USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,