Skip to content

Commit 1a3358d

Browse files
committed
Limit FatFs' ability to upper case paths
Only uppercase ASCII letters a-z. This saves ~900 bytes. Previously written files with other unicode letters will only be accessible from their upper cased path.
1 parent de5f58a commit 1a3358d

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

lib/oofatfs/ff.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,12 @@ typedef struct {
278278

279279

280280
/* SBCS up-case tables (\x80-\xFF) */
281+
// Optimize the 437-only case with a truncated lookup table.
282+
#if FF_CODE_PAGE == 437
283+
#define TBL_CT437 {0x80,0x9A,0x45,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \
284+
0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
285+
0x41,0x49,0x4F,0x55,0xA5}
286+
#else
281287
#define TBL_CT437 {0x80,0x9A,0x45,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F, \
282288
0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
283289
0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \
@@ -286,6 +292,7 @@ typedef struct {
286292
0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
287293
0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF, \
288294
0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
295+
#endif
289296
#define TBL_CT720 {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F, \
290297
0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
291298
0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF, \
@@ -2887,7 +2894,12 @@ static FRESULT create_name ( /* FR_OK: successful, FR_INVALID_NAME: could not
28872894
}
28882895
#elif FF_CODE_PAGE < 900 /* SBCS cfg */
28892896
wc = ff_uni2oem(wc, CODEPAGE); /* Unicode ==> ANSI/OEM code */
2897+
// Optimize the 437-only case with a truncated lookup table.
2898+
#if FF_CODE_PAGE == 437
2899+
if (wc & 0x80 && wc < (0xA5 - 0x80)) wc = ExCvt[wc & 0x7F]; /* Convert extended character to upper (SBCS) */
2900+
#else
28902901
if (wc & 0x80) wc = ExCvt[wc & 0x7F]; /* Convert extended character to upper (SBCS) */
2902+
#endif
28912903
#else /* DBCS cfg */
28922904
wc = ff_uni2oem(ff_wtoupper(wc), CODEPAGE); /* Unicode ==> Upper convert ==> ANSI/OEM code */
28932905
#endif

lib/oofatfs/ffunicode.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,13 @@ DWORD ff_wtoupper ( /* Returns up-converted code point */
499499
DWORD uni /* Unicode code point to be up-converted */
500500
)
501501
{
502+
#if FF_FS_ASCII_UPPER_ONLY
503+
// Only uppercase ASCII characters. Everything else will require the user to
504+
// pass in an uppercase version.
505+
if ('a' <= uni && uni <= 'z') {
506+
uni -= 32;
507+
}
508+
#else
502509
const WORD *p;
503510
WORD uc, bc, nc, cmd;
504511
static const WORD cvt1[] = { /* Compressed up conversion table for U+0000 - U+0FFF */
@@ -619,6 +626,7 @@ DWORD ff_wtoupper ( /* Returns up-converted code point */
619626
}
620627
uni = uc;
621628
}
629+
#endif
622630

623631
return uni;
624632
}

py/circuitpy_mpconfig.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,8 @@ void supervisor_run_background_tasks_if_tick(void);
594594
#define CIRCUITPY_DIGITALIO_HAVE_INVALID_DRIVE_MODE (0)
595595
#endif
596596

597+
#define FF_FS_ASCII_UPPER_ONLY (1)
598+
597599
#define FF_FS_MAKE_VOLID (1)
598600

599601
#define MICROPY_PY_OPTIMIZE_PROPERTY_FLASH_SIZE (CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE)

0 commit comments

Comments
 (0)