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

Manual merge?

Browse Source 
Pickup a couple changes that don't seem to be propagating?
Possible that there's some git merge I missed, but it's simple enough to fix manually.
This commit is contained in:
Henry Gabryjelski 2019-03-19 00:57:24 -07:00
parent 1b54f0457d
commit 8ab4774c93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/usb/uf2/ghostfat.c
View File

@ -210,7 +210,7 @@ void read_block(uint32_t block_no, uint8_t *data) {
if (sectionIdx >= SECTORS_PER_FAT) if (sectionIdx >= SECTORS_PER_FAT)
sectionIdx -= SECTORS_PER_FAT; // second FAT is same as the first... sectionIdx -= SECTORS_PER_FAT; // second FAT is same as the first...
if (sectionIdx == 0) { if (sectionIdx == 0) {
data[0] = 0xf0; data[0] = 0xf8; // first FAT entry must match BPB MediaDescriptor
// WARNING -- code presumes only one NULL .content for .UF2 file // WARNING -- code presumes only one NULL .content for .UF2 file
// and all non-NULL .content fit in one sector // and all non-NULL .content fit in one sector
// and requires it be the last element of the array // and requires it be the last element of the array
@ -223,7 +223,7 @@ void read_block(uint32_t block_no, uint8_t *data) {
if (UF2_FIRST_SECTOR <= v && v <= UF2_LAST_SECTOR) if (UF2_FIRST_SECTOR <= v && v <= UF2_LAST_SECTOR)
((uint16_t *)(void *)data)[i] = v == UF2_LAST_SECTOR ? 0xffff : v + 1; ((uint16_t *)(void *)data)[i] = v == UF2_LAST_SECTOR ? 0xffff : v + 1;
} }
} else if (block_no < START_CLUSTERS) { } else if (block_no < START_CLUSTERS) { // Requested root directory sector
sectionIdx -= START_ROOTDIR; sectionIdx -= START_ROOTDIR;