READ CAPACITY uses CFG_UF2_NUM_BLOCKS,

Therefore, use that existing configuration setting
for BPB_TOTAL_BLOCKS.

Author: henrygab

src/usb/uf2/ghostfat.c

@@ -68,7 +68,7 @@ struct TextFile {
 #define BPB_RESERVED_SECTORS      (   1)
 #define BPB_NUMBER_OF_FATS        (   2)
 #define BPB_ROOT_DIR_ENTRIES      (  64)
-#define BPB_TOTAL_SECTORS         (0x10109) // Use a fixed (near max) number of sectors for the FAT file system
+#define BPB_TOTAL_SECTORS         CFG_UF2_NUM_BLOCKS
 #define BPB_MEDIA_DESCRIPTOR_BYTE (0xF8)
 #define FAT_ENTRY_SIZE            (2)
 #define FAT_ENTRIES_PER_SECTOR    (BPB_SECTOR_SIZE / FAT_ENTRY_SIZE)
@@ -78,10 +78,6 @@ struct TextFile {
 #define DIRENTRIES_PER_SECTOR     (BPB_SECTOR_SIZE/sizeof(DirEntry))
 #define ROOT_DIR_SECTOR_COUNT     (BPB_ROOT_DIR_ENTRIES/DIRENTRIES_PER_SECTOR)
 
-#if defined(CFG_UF2_NUM_BLOCKS)
-  STATIC_ASSERT(BPB_TOTAL_SECTORS >= CFG_UF2_NUM_BLOCKS); // configuration used, and asked for a larger size GhostFAT?
-#endif
-
 STATIC_ASSERT(BPB_SECTOR_SIZE                              ==       512); // GhostFAT does not support other sector sizes (currently)
 STATIC_ASSERT(BPB_SECTORS_PER_CLUSTER                      ==         1); // GhostFAT presumes one sector == one cluster (for simplicity)
 STATIC_ASSERT(BPB_NUMBER_OF_FATS                           ==         2); // FAT highest compatibility

src/usb/uf2/uf2cfg.h

@@ -7,7 +7,7 @@
 // Family ID for updating Bootloader
 #define CFG_UF2_FAMILY_BOOT_ID    0xd663823c
 
-#define CFG_UF2_NUM_BLOCKS        8000        // at least 4,1 MB for FAT16
+#define CFG_UF2_NUM_BLOCKS        0x10109     // just under 32MB
 #define CFG_UF2_FLASH_SIZE        (1024*1024) // 1 MB
 
 // Application Address Space