Merge pull request #8580 from eightycc/part_type

dhalbert · web-flow · commit fed12a1b123a · 2023-11-10T15:54:17.000-05:00
Allow CIRCUITPY to mount on Android
diff --git a/supervisor/shared/flash.c b/supervisor/shared/flash.c
@@ -95,7 +95,8 @@ static mp_uint_t flash_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t n
             dest[i] = 0;
         }
 
-        build_partition(dest + 446, 0, 0x01 /* FAT12 */, PART1_START_BLOCK, supervisor_flash_get_block_count());
+        // Specifying "Big FAT12/16 CHS" allows mounting by Android
+        build_partition(dest + 446, 0, 0x06 /* Big FAT12/16 CHS */, PART1_START_BLOCK, supervisor_flash_get_block_count());
         build_partition(dest + 462, 0, 0, 0, 0);
         build_partition(dest + 478, 0, 0, 0, 0);
         build_partition(dest + 494, 0, 0, 0, 0);

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,8 @@ static mp_uint_t flash_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t n`
`95`	`95`	`dest[i] = 0;`
`96`	`96`	`}`
`97`	`97`
`98`		`- build_partition(dest + 446, 0, 0x01 /* FAT12 */, PART1_START_BLOCK, supervisor_flash_get_block_count());`
	`98`	`+ // Specifying "Big FAT12/16 CHS" allows mounting by Android`
	`99`	`+ build_partition(dest + 446, 0, 0x06 /* Big FAT12/16 CHS */, PART1_START_BLOCK, supervisor_flash_get_block_count());`
`99`	`100`	`build_partition(dest + 462, 0, 0, 0, 0);`
`100`	`101`	`build_partition(dest + 478, 0, 0, 0, 0);`
`101`	`102`	`build_partition(dest + 494, 0, 0, 0, 0);`