Fix automount on Linux

Author: alex-dewar

usb_msc/fat_util.c

@@ -7,12 +7,12 @@ static struct fat_filesystem FILESYSTEM = {
     .boot_sec = {
         .jmp_cmd = {0xEB, 0x3C, 0x90},
         .oem_name = {0x4D, 0x53, 0x44, 0x4F, 0x53, 0x35, 0x2E, 0x30}, // OEM name
-        .bytes_per_sector = {LE_U16_TO_2U8(DISK_CLUSTER_SIZE)},
+        .bytes_per_sector = {LE_U16_TO_2U8(DISK_SECTOR_SIZE)},
         .sectors_per_cluster = DISK_SECTOR_PER_CLUSTER,
         .reserved_sectors = {LE_U16_TO_2U8(0x01)},
         .num_fat = NUM_FAT,
         .max_root_dir_entries = {LE_U16_TO_2U8(NUM_ROOT_DIR_ENTRIES)},
-        .total_sectors = {LE_U16_TO_2U8(0xFFFF)},
+        .total_sectors = {LE_U16_TO_2U8(DISK_REPORT_SECTOR_NUM)},
         .media_descriptor = 0xF8,
         .sectors_per_fat = {LE_U16_TO_2U8(DISK_SECTOR_PER_FAT)},
         .bios_drive_number = 0x80,

usb_msc/fat_util.h

@@ -13,16 +13,17 @@
 
 enum
 {
+    DISK_FULL_SIZE = 32*1024*1024,
     DISK_REAL_CLUSTER_NUM = 0x10,
-    DISK_REPORT_SECTOR_NUM = 0xFFFF,
-    DISK_SECTOR_PER_CLUSTER = 1, // 0x04
-    DISK_SECTOR_SIZE = 4096, // 512 // sector size
+    DISK_SECTOR_PER_CLUSTER = 4, // 0x04
+    DISK_SECTOR_SIZE = 1024, // 512 // sector size
     DISK_CLUSTER_SIZE = DISK_SECTOR_SIZE * DISK_SECTOR_PER_CLUSTER,
-    DISK_SECTOR_PER_FAT = 0x04, //0x40,
+    DISK_SECTOR_PER_FAT = (2 * DISK_FULL_SIZE) / (DISK_CLUSTER_SIZE * DISK_SECTOR_SIZE), //0x40,
     NUM_FAT = 1,
     DISK_REAL_SECTOR_NUM = (1 + NUM_FAT * DISK_SECTOR_PER_FAT + 1 + (DISK_REAL_CLUSTER_NUM * DISK_SECTOR_PER_CLUSTER)),
     DISK_BLOCK_NUM = DISK_SECTOR_SIZE + (DISK_SECTOR_PER_FAT * DISK_SECTOR_SIZE) + (DISK_SECTOR_SIZE) + (DISK_SECTOR_SIZE * DISK_SECTOR_PER_CLUSTER * DISK_REAL_CLUSTER_NUM),
     NUM_ROOT_DIR_ENTRIES = DISK_SECTOR_SIZE / 32,
+    DISK_REPORT_SECTOR_NUM = (DISK_FULL_SIZE / DISK_SECTOR_SIZE) + 1 + NUM_FAT * DISK_SECTOR_PER_FAT + 1,
 };
 
 #define FAT_NAME_SZ 8

usb_msc/msc_disk.c

@@ -145,6 +145,8 @@ uint32_t BITSTREAM_CRC32 = 0;
 
 uint32_t BLOCK_COUNTER = 0;
 
+// uint8_t LAST_SECTOR[DISK_CLUSTER_SIZE];
+
 uint32_t flash_calc_crc32(uint32_t addr)
 {
     spi_flash_read(addr, TEST_RD_BUF, 256);