xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename msc_flash to msc_uf2

Browse Source
This commit is contained in:
hathach
2018-06-20 15:28:30 +07:00
parent 6d0b272858
commit 5dec2e2aab
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@@ -61,7 +61,7 @@
#include "tusb.h" #include "tusb.h"
#include "usb/tusb_descriptors.h" #include "usb/tusb_descriptors.h"
#include "usb/msc_flash.h" #include "usb/msc_uf2.h"
#define BOOTLOADER_VERSION_REGISTER NRF_TIMER2->CC[0] #define BOOTLOADER_VERSION_REGISTER NRF_TIMER2->CC[0]

2
src/make_common.mk
View File

@@ -83,7 +83,7 @@ remduplicates = $(strip $(if $1,$(firstword $1) $(call remduplicates,$(filter-ou
C_SOURCE_FILES += $(SRC_PATH)/main.c C_SOURCE_FILES += $(SRC_PATH)/main.c
C_SOURCE_FILES += $(SRC_PATH)/dfu_ble_svc.c C_SOURCE_FILES += $(SRC_PATH)/dfu_ble_svc.c
C_SOURCE_FILES += $(SRC_PATH)/usb/tusb_descriptors.c C_SOURCE_FILES += $(SRC_PATH)/usb/tusb_descriptors.c
C_SOURCE_FILES += $(SRC_PATH)/usb/msc_flash.c C_SOURCE_FILES += $(SRC_PATH)/usb/msc_uf2.c
# SDK 11 files # SDK 11 files
C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/bootloader.c C_SOURCE_FILES += $(SDK11_PATH)/libraries/bootloader_dfu/bootloader.c

4
src/segger/nrf52840_bootloader.emProject
View File

@@ -58,8 +58,6 @@
<file file_name="../pstorage_platform.h" /> <file file_name="../pstorage_platform.h" />
<file file_name="../sdk_config.h" /> <file file_name="../sdk_config.h" />
<folder Name="usb"> <folder Name="usb">
<file file_name="../usb/msc_flash.c" />
<file file_name="../usb/msc_flash.h" />
<file file_name="../usb/tusb_config.h" /> <file file_name="../usb/tusb_config.h" />
<file file_name="../usb/tusb_descriptors.c" /> <file file_name="../usb/tusb_descriptors.c" />
<file file_name="../usb/tusb_descriptors.h" /> <file file_name="../usb/tusb_descriptors.h" />
@@ -67,6 +65,8 @@
<file file_name="../usb/uf2/uf2cfg.h" /> <file file_name="../usb/uf2/uf2cfg.h" />
<file file_name="../usb/uf2/uf2.h" /> <file file_name="../usb/uf2/uf2.h" />
</folder> </folder>
<file file_name="../usb/msc_uf2.c" />
<file file_name="../usb/msc_uf2.h" />
</folder> </folder>
</folder> </folder>
<configuration <configuration

8
src/usb/msc_flash.c → src/usb/msc_uf2.c
View File

@@ -1,6 +1,6 @@
/**************************************************************************/ /**************************************************************************/
/*! /*!
@file msc_flash.c @file msc_uf2.c
@author hathach (tinyusb.org) @author hathach (tinyusb.org)
@section LICENSE @section LICENSE
@@ -34,7 +34,7 @@
*/ */
/**************************************************************************/ /**************************************************************************/
#include "msc_flash.h" #include "msc_uf2.h"
#if CFG_TUD_MSC #if CFG_TUD_MSC
@@ -468,8 +468,8 @@ fat12_boot_sector_t const _boot_sect =
static inline bool fat12_formatted(void) static inline bool fat12_formatted(void)
{ {
const uint8_t* boot_sect = (uint8_t* ) lba2addr(0);
return false; return false;
// const uint8_t* boot_sect = (uint8_t* ) lba2addr(0);
//return (boot_sect[510] == 0x55) && (boot_sect[511] == 0xAA); //return (boot_sect[510] == 0x55) && (boot_sect[511] == 0xAA);
} }
@@ -497,7 +497,7 @@ const char indexFile[] = //
"</body>" "</body>"
"</html>\n"; "</html>\n";
uint8_t const readme_contents[] = "Adafruit Feather nRF52840"; const char readme_contents[] = "Adafruit Feather nRF52840";
struct TextFile { struct TextFile {
const char name[11]; const char name[11];

2
src/usb/msc_flash.h → src/usb/msc_uf2.h
View File

@@ -1,6 +1,6 @@
/**************************************************************************/ /**************************************************************************/
/*! /*!
@file msc_flash.h @file msc_uf2.h
@author hathach (tinyusb.org) @author hathach (tinyusb.org)
@section LICENSE @section LICENSE