Fix merge related issues

crypto-aes
Hierophect 3 years ago
parent 0c43bae01d
commit a635d46b1a
  1. 1
      .gitmodules
  2. 2
      lib/tinyusb
  3. 2
      ports/stm32f4/supervisor/internal_flash.c
  4. 6
      ports/stm32f4/supervisor/port.c
  5. 2
      supervisor/shared/usb/usb_msc_flash.c

1
.gitmodules vendored

@ -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

@ -1 +1 @@
Subproject commit 97e2629d647584681b2883f2081fa2cddb3d61cc
Subproject commit 1ee9ef4f2b7c6acfab6c398a4f57ca22036958f7

@ -39,8 +39,6 @@
/*------------------------------------------------------------------*/
/* Internal Flash API
*------------------------------------------------------------------*/
static inline uint32_t lba2addr(uint32_t block) {
}
void supervisor_flash_init(void) {
}

@ -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();

@ -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;

Loading…
Cancel
Save