diff options
| author | Ha Thach <thach@tinyusb.org> | 2019-12-24 10:16:31 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-24 10:16:31 +0700 |
| commit | 9ba40de538e2e303c2fb53488ed5345c435191bd (patch) | |
| tree | 88f008404b4064dcfe6d95d54bb80cfbcb95ee2d | |
| parent | 21cbd5ce96f1320a884ea9ea0a50f3f918bc0e04 (diff) | |
| parent | b49ecc52b9e41cbcc6943649217d8abea29b30a6 (diff) | |
Merge pull request #2424 from hierophect/vbus-rename
STM32: rename vbus flag
| -rw-r--r-- | ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h | 2 | ||||
| -rw-r--r-- | ports/stm32f4/supervisor/usb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h b/ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h index b8e374f05..05e2a384a 100644 --- a/ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h +++ b/ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h @@ -33,7 +33,7 @@ #define FLASH_PAGE_SIZE (0x4000) #define BOARD_OSC_DIV 25 -#define BOARD_NO_VBUS +#define BOARD_NO_VBUS_SENSE // On-board flash // #define SPI_FLASH_MOSI_PIN (&pin_PA07) diff --git a/ports/stm32f4/supervisor/usb.c b/ports/stm32f4/supervisor/usb.c index 23fff1a36..0d2d5cce9 100644 --- a/ports/stm32f4/supervisor/usb.c +++ b/ports/stm32f4/supervisor/usb.c @@ -38,7 +38,7 @@ STATIC void init_usb_vbus_sense(void) { -#ifdef BOARD_NO_VBUS +#ifdef BOARD_NO_VBUS_SENSE // Disable VBUS sensing #ifdef USB_OTG_GCCFG_VBDEN USB_OTG_FS->GCCFG &= ~USB_OTG_GCCFG_VBDEN; |