diff options
| author | Hierophect <hierophect@gmail.com> | 2019-12-12 17:53:04 -0500 |
|---|---|---|
| committer | Hierophect <hierophect@gmail.com> | 2019-12-12 17:53:04 -0500 |
| commit | 99c02b5afb9d79fa4e4c31067acca219f73ee4ff (patch) | |
| tree | 8e607ea76f2438372aefc92abb3dfc374df2debe /ports/stm32f4/supervisor/usb.c | |
| parent | e4fb414b913c9a5f0cdaa3aa0b715595a88ac3a9 (diff) | |
usb not working...
Diffstat (limited to 'ports/stm32f4/supervisor/usb.c')
| -rw-r--r-- | ports/stm32f4/supervisor/usb.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/ports/stm32f4/supervisor/usb.c b/ports/stm32f4/supervisor/usb.c index 3ebb74dc7..483dddcfc 100644 --- a/ports/stm32f4/supervisor/usb.c +++ b/ports/stm32f4/supervisor/usb.c @@ -36,15 +36,15 @@ #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 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 +// } void init_usb_hardware(void) { //TODO: if future chips overload this with options, move to peripherals management. @@ -92,8 +92,16 @@ void init_usb_hardware(void) { never_reset_pin_number(0, 8); #endif -#ifdef BOARD_NO_VBUS - disable_usb_vbus(); +// #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 */ |