djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/usb: Allow board to select which USBD is used as the main one.

Browse Source 
By defining MICROPY_HW_USB_MAIN_DEV a given board can select to use either
USB_PHY_FS_ID or USB_PHY_HS_ID as the main USBD peripheral, on which the
REPL will appear.  If not defined this will be automatically configured.
This commit is contained in:
Damien George 2018-02-01 17:47:28 +11:00
parent e708e87139
commit 71312d0bd1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/stm32/usb.c
View File

@ -42,12 +42,15 @@
#include "bufhelper.h"
#include "usb.h"
// Work out which USB device to use as the main one (the one with the REPL)
#if !defined(MICROPY_HW_USB_MAIN_DEV)
#if defined(USE_USB_FS)
#define USB_PHY_ID USB_PHY_FS_ID
#define MICROPY_HW_USB_MAIN_DEV (USB_PHY_FS_ID)
#elif defined(USE_USB_HS) && defined(USE_USB_HS_IN_FS)
#define USB_PHY_ID USB_PHY_HS_ID
#define MICROPY_HW_USB_MAIN_DEV (USB_PHY_HS_ID)
#else
#error Unable to determine proper USB_PHY_ID to use
#error Unable to determine proper MICROPY_HW_USB_MAIN_DEV to use
#endif
#endif
// this will be persistent across a soft-reset
@ -123,7 +126,7 @@ bool pyb_usb_dev_init(uint16_t vid, uint16_t pid, usb_device_mode_t mode, USBD_H
// set up the USBD state
USBD_HandleTypeDef *usbd = &usb_dev->hUSBDDevice;
usbd->id = USB_PHY_ID;
usbd->id = MICROPY_HW_USB_MAIN_DEV;
usbd->dev_state = USBD_STATE_DEFAULT;
usbd->pDesc = (USBD_DescriptorsTypeDef*)&USBD_Descriptors;
usbd->pClass = &USBD_CDC_MSC_HID;