diff options
| author | Dave Hylands <dhylands@gmail.com> | 2015-12-30 23:36:41 -0800 |
|---|---|---|
| committer | Dave Hylands <dhylands@gmail.com> | 2015-12-30 23:36:41 -0800 |
| commit | 8c936edeb279ab9970130f97725ab300e3f3add4 (patch) | |
| tree | f1bd7d7c2cf912790480f486c8f98888c4287afd | |
| parent | 6dde019d933175b5c2608b8da2239846e1730838 (diff) | |
stmhal: Fix USB on the STM32F429DISC board
The USB REPL has been broken since commit 1be0fde45c8d84eaf04851af96f06aad8171b2b2
This patch allows the STM32F429DISC board (which uses the USB_HS PHY)
| -rw-r--r-- | stmhal/usb.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/stmhal/usb.c b/stmhal/usb.c index 3b4dff588..ca7741590 100644 --- a/stmhal/usb.c +++ b/stmhal/usb.c @@ -41,6 +41,14 @@ #include "usb.h" #include "pybioctl.h" +#if defined(USE_USB_FS) +#define USB_PHY_ID USB_PHY_FS_ID +#elif defined(USE_USB_HS) && defined(USE_USB_HS_IN_FS) +#define USB_PHY_ID USB_PHY_HS_ID +#else +#error Unable to determine proper USB_PHY_ID to use +#endif + // this will be persistent across a soft-reset mp_uint_t pyb_usb_flags = 0; @@ -102,7 +110,7 @@ bool pyb_usb_dev_init(uint16_t vid, uint16_t pid, usb_device_mode_t mode, USBD_H if (USBD_SelectMode(mode, hid_info) != 0) { return false; } - USBD_Init(&hUSBDDevice, (USBD_DescriptorsTypeDef*)&USBD_Descriptors, USB_PHY_FS_ID); + USBD_Init(&hUSBDDevice, (USBD_DescriptorsTypeDef*)&USBD_Descriptors, USB_PHY_ID); USBD_RegisterClass(&hUSBDDevice, &USBD_CDC_MSC_HID); USBD_CDC_RegisterInterface(&hUSBDDevice, (USBD_CDC_ItfTypeDef*)&USBD_CDC_fops); switch (pyb_usb_storage_medium) { |