bstanwell/wch-uf2-example
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

define AUTO_BOOT_BITMAP_NUM_HWORDS constant

Browse Source
This commit is contained in:
R
2024-04-21 05:53:46 +01:00
parent 7affb1b209
commit 01b147cbb2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootloader.c
+7 -6
View File
@@ -211,8 +211,9 @@ extern uint32_t USB_SECTOR_STASH[128];
// Files larger than this won't cause an auto-reboot // Files larger than this won't cause an auto-reboot
// (there is not enough USBD RAM to mark which blocks have been received) // (there is not enough USBD RAM to mark which blocks have been received)
#define MAX_AUTO_BOOT_BLOCKS (36 * 16 - 1) #define AUTO_BOOT_BITMAP_NUM_HWORDS 36
extern uint32_t UF2_GOT_BLOCKS[36]; #define MAX_AUTO_BOOT_BLOCKS (AUTO_BOOT_BITMAP_NUM_HWORDS * 16 - 1)
extern uint32_t UF2_GOT_BLOCKS[AUTO_BOOT_BITMAP_NUM_HWORDS];
// Constants for USBD registers // Constants for USBD registers
#define USB_EPTYPE_BULK 0b00 #define USB_EPTYPE_BULK 0b00
@@ -450,7 +451,7 @@ __attribute__((naked)) int main(void) {
uint32_t msc_state = STATE_WANT_CBW; uint32_t msc_state = STATE_WANT_CBW;
UF2_GOT_BLOCKS[35] = 0; UF2_GOT_BLOCKS[AUTO_BOOT_BITMAP_NUM_HWORDS - 1] = 0;
while (1) { while (1) {
@@ -834,13 +835,13 @@ __attribute__((naked)) int main(void) {
uint32_t blocknum = BLOCKNUM_LO; uint32_t blocknum = BLOCKNUM_LO;
uint32_t totblocks = TOTBLOCKS_LO; uint32_t totblocks = TOTBLOCKS_LO;
if (UF2_GOT_BLOCKS[35] & 0x8000) { if (UF2_GOT_BLOCKS[AUTO_BOOT_BITMAP_NUM_HWORDS - 1] & 0x8000) {
// not first uf2 block // not first uf2 block
UF2_GOT_BLOCKS[blocknum / 16] |= 1 << (blocknum % 16); UF2_GOT_BLOCKS[blocknum / 16] |= 1 << (blocknum % 16);
} else { } else {
// first uf2 block, or too big // first uf2 block, or too big
if (totblocks <= MAX_AUTO_BOOT_BLOCKS) { if (totblocks <= MAX_AUTO_BOOT_BLOCKS) {
for (int i = 0; i < 36; i++) for (int i = 0; i < AUTO_BOOT_BITMAP_NUM_HWORDS; i++)
UF2_GOT_BLOCKS[i] = 0; UF2_GOT_BLOCKS[i] = 0;
for (int i = totblocks; i <= MAX_AUTO_BOOT_BLOCKS; i++) { for (int i = totblocks; i <= MAX_AUTO_BOOT_BLOCKS; i++) {
// deliberate off-by-1 to set high bit // deliberate off-by-1 to set high bit
@@ -885,7 +886,7 @@ __attribute__((naked)) int main(void) {
uint32_t dCSWTag = CSWTAG_LO | (CSWTAG_HI << 16); uint32_t dCSWTag = CSWTAG_LO | (CSWTAG_HI << 16);
make_msc_csw(dCSWTag, 0); make_msc_csw(dCSWTag, 0);
uint32_t all_blocks = 0xffff; uint32_t all_blocks = 0xffff;
for (int i = 0; i < 36; i++) for (int i = 0; i < AUTO_BOOT_BITMAP_NUM_HWORDS; i++)
all_blocks &= UF2_GOT_BLOCKS[i]; all_blocks &= UF2_GOT_BLOCKS[i];
if (all_blocks == 0xffff) if (all_blocks == 0xffff)
msc_state = STATE_SENT_CSW_REBOOT; msc_state = STATE_SENT_CSW_REBOOT;