diff options
| -rw-r--r-- | .gitmodules | 1 | ||||
| m--------- | lib/tinyusb | 0 | ||||
| -rw-r--r-- | ports/stm32f4/supervisor/internal_flash.c | 2 | ||||
| -rw-r--r-- | ports/stm32f4/supervisor/port.c | 6 | ||||
| -rw-r--r-- | supervisor/shared/usb/usb_msc_flash.c | 2 |
5 files changed, 1 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules index 2a97c81fc..7b57cab54 100644 --- a/.gitmodules +++ b/.gitmodules @@ -77,7 +77,6 @@ path = lib/tinyusb url = https://github.com/hathach/tinyusb.git branch = develop - ignore = dirty [submodule "tools/huffman"] path = tools/huffman url = https://github.com/tannewt/huffman.git diff --git a/lib/tinyusb b/lib/tinyusb -Subproject 97e2629d647584681b2883f2081fa2cddb3d61c +Subproject 1ee9ef4f2b7c6acfab6c398a4f57ca22036958f diff --git a/ports/stm32f4/supervisor/internal_flash.c b/ports/stm32f4/supervisor/internal_flash.c index fa776ae1d..e05236948 100644 --- a/ports/stm32f4/supervisor/internal_flash.c +++ b/ports/stm32f4/supervisor/internal_flash.c @@ -39,8 +39,6 @@ /*------------------------------------------------------------------*/ /* Internal Flash API *------------------------------------------------------------------*/ -static inline uint32_t lba2addr(uint32_t block) { -} void supervisor_flash_init(void) { } diff --git a/ports/stm32f4/supervisor/port.c b/ports/stm32f4/supervisor/port.c index af4d1b8d8..6030547ac 100644 --- a/ports/stm32f4/supervisor/port.c +++ b/ports/stm32f4/supervisor/port.c @@ -35,12 +35,6 @@ #include "stm32f4xx_hal.h" -//#include "shared-bindings/rtc/__init__.h" - -static void power_warning_handler(void) { - reset_into_safe_mode(BROWNOUT); -} - safe_mode_t port_init(void) { HAL_Init(); diff --git a/supervisor/shared/usb/usb_msc_flash.c b/supervisor/shared/usb/usb_msc_flash.c index a1ab46454..205cb7b50 100644 --- a/supervisor/shared/usb/usb_msc_flash.c +++ b/supervisor/shared/usb/usb_msc_flash.c @@ -197,7 +197,7 @@ bool tud_msc_test_unit_ready_cb(uint8_t lun) { // Invoked when received Start Stop Unit command // - Start = 0 : stopped power mode, if load_eject = 1 : unload disk storage // - Start = 1 : active mode, if load_eject = 1 : load disk storage -void tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, bool load_eject) { +bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, bool load_eject) { if (load_eject) { if (lun > 1) { return false; |