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

revert usb.c additions

Browse Source
This commit is contained in:
Hierophect 2019-12-10 15:07:39 -05:00
parent dd4d3a662d
commit 0e2a03e3bd
4 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/stm32f4/boards/stm32f411ce_blackpill/mpconfigboard.h
View File

@ -33,7 +33,6 @@
#define FLASH_PAGE_SIZE (0x4000) #define FLASH_PAGE_SIZE (0x4000)
#define BOARD_OSC_DIV 25 #define BOARD_OSC_DIV 25
#define BOARD_NO_VBUS
// On-board flash // On-board flash
// #define SPI_FLASH_MOSI_PIN (&pin_PA07) // #define SPI_FLASH_MOSI_PIN (&pin_PA07)

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

@ -43,7 +43,6 @@ void init_usb_hardware(void) {
PA11 ------> USB_OTG_FS_DM PA11 ------> USB_OTG_FS_DM
PA12 ------> USB_OTG_FS_DP PA12 ------> USB_OTG_FS_DP
*/ */
__HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOA_CLK_ENABLE();
/* Configure DM DP Pins */ /* Configure DM DP Pins */
@ -84,14 +83,3 @@ void init_usb_hardware(void) {
/* Peripheral clock enable */ /* Peripheral clock enable */
__HAL_RCC_USB_OTG_FS_CLK_ENABLE(); __HAL_RCC_USB_OTG_FS_CLK_ENABLE();
} }
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
}

7
supervisor/shared/usb/usb.c
View File

@ -33,8 +33,6 @@
#include "lib/utils/interrupt_char.h" #include "lib/utils/interrupt_char.h"
#include "lib/mp-readline/readline.h" #include "lib/mp-readline/readline.h"
#include "py/mpconfig.h"
#include "tusb.h" #include "tusb.h"
// Serial number as hex characters. This writes directly to the USB // Serial number as hex characters. This writes directly to the USB
@ -74,11 +72,6 @@ void usb_init(void) {
#if CIRCUITPY_USB_MIDI #if CIRCUITPY_USB_MIDI
usb_midi_init(); usb_midi_init();
#endif #endif
#ifdef BOARD_NO_VBUS
disable_usb_vbus();
#endif
} }
void usb_background(void) { void usb_background(void) {

2
supervisor/usb.h
View File

@ -37,8 +37,6 @@ void usb_background(void);
// TinyUSB. // TinyUSB.
void init_usb_hardware(void); void init_usb_hardware(void);
void disable_usb_vbus(void);
// Shared implementation. // Shared implementation.
bool usb_enabled(void); bool usb_enabled(void);
void usb_init(void); void usb_init(void);