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

merge Thach's suggestion

Browse Source
This commit is contained in:
Hierophect 2019-12-17 12:58:16 -05:00
commit 4bfb255a1c
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ports/stm32f4/supervisor/usb.c
View File

@ -36,15 +36,27 @@
#include "common-hal/microcontroller/Pin.h"
// STATIC void disable_usb_vbus(void) {
// #ifdef USB_OTG_GCCFG_VBDEN
// USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBDEN;
// #else
// USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_NOVBUSSENS;
// USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBUSBSEN;
// USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBUSASEN;
// #endif
// }
STATIC void init_usb_vbus_sense(void) {
#ifdef BOARD_NO_VBUS
// Disable VBUS sensing
#ifdef USB_OTG_GCCFG_VBDEN
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBDEN;
#else
USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_NOVBUSSENS;
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBUSBSEN;
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBUSASEN;
#endif
#else
// Enable VBUS hardware sensing
#ifdef USB_OTG_GCCFG_VBDEN
USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_VBDEN;
#else
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_NOVBUSSENS;
USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_VBUSBSEN; // B Device sense
#endif
#endif
}
void init_usb_hardware(void) {
//TODO: if future chips overload this with options, move to peripherals management.
@ -92,18 +104,8 @@ void init_usb_hardware(void) {
never_reset_pin_number(0, 8);
#endif
// #ifdef BOARD_NO_VBUS
// disable_usb_vbus();
// #endif
#ifdef USB_OTG_GCCFG_VBDEN
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBDEN;
#else
USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_NOVBUSSENS;
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBUSBSEN;
USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBUSASEN;
#endif
/* Peripheral clock enable */
__HAL_RCC_USB_OTG_FS_CLK_ENABLE();
init_usb_vbus_sense();
}