From 1100333487227a0ecf38a6eb102f710f893780df Mon Sep 17 00:00:00 2001 From: david Date: Wed, 10 Jun 2009 16:30:46 +0200 Subject: [PATCH] addd bugs, clean code --- ...fab33a68ffbeb19f1e9fa4856101996759255.yaml | 22 + ...8cae9de5e51829e5dbb6b8fcaa20c7a647aa6.yaml | 21 + ...e09d1da472e76501325424bc586f78980199e.yaml | 20 + snes/fatfstest/PPU.c | 122 +- snes/fatfstest/crc.c | 52 +- snes/fatfstest/debug.c | 229 +- snes/fatfstest/diskio.c | 230 +- snes/fatfstest/event.c | 139 +- snes/fatfstest/ff.c | 4502 +++++++++-------- snes/fatfstest/main.c | 49 +- snes/fatfstest/myEvents.c | 136 +- snes/fatfstest/pad.c | 33 +- 12 files changed, 3042 insertions(+), 2513 deletions(-) create mode 100644 bugs/issue-032fab33a68ffbeb19f1e9fa4856101996759255.yaml create mode 100644 bugs/issue-6498cae9de5e51829e5dbb6b8fcaa20c7a647aa6.yaml create mode 100644 bugs/issue-99ae09d1da472e76501325424bc586f78980199e.yaml diff --git a/bugs/issue-032fab33a68ffbeb19f1e9fa4856101996759255.yaml b/bugs/issue-032fab33a68ffbeb19f1e9fa4856101996759255.yaml new file mode 100644 index 0000000..ba0aa97 --- /dev/null +++ b/bugs/issue-032fab33a68ffbeb19f1e9fa4856101996759255.yaml @@ -0,0 +1,22 @@ +--- !ditz.rubyforge.org,2008-03-06/issue +title: relocate code +desc: |- + move main code to upper page like 0xe4 and use 0x4f as shared mem window + or even combine this + code seems to reloacte and start, but ram doesn't seem accessable. broked + sprintfs +type: :bugfix +component: fatfs +release: +reporter: David +status: :unstarted +disposition: +creation_time: 2009-06-10 14:22:10.400739 Z +references: [] + +id: 032fab33a68ffbeb19f1e9fa4856101996759255 +log_events: +- - 2009-06-10 14:22:11.288638 Z + - David + - created + - "" diff --git a/bugs/issue-6498cae9de5e51829e5dbb6b8fcaa20c7a647aa6.yaml b/bugs/issue-6498cae9de5e51829e5dbb6b8fcaa20c7a647aa6.yaml new file mode 100644 index 0000000..ac37f76 --- /dev/null +++ b/bugs/issue-6498cae9de5e51829e5dbb6b8fcaa20c7a647aa6.yaml @@ -0,0 +1,21 @@ +--- !ditz.rubyforge.org,2008-03-06/issue +title: "debug ram mapping " +desc: |- + global vars seem to be borked or miss used. seems all kind of buffers are overlapping + just reordering global var order renders the code unusable. + also the strange sprintf buffer conflicts seem to related to this issue +type: :bugfix +component: fatfs +release: +reporter: David +status: :unstarted +disposition: +creation_time: 2009-06-10 14:23:44.121219 Z +references: [] + +id: 6498cae9de5e51829e5dbb6b8fcaa20c7a647aa6 +log_events: +- - 2009-06-10 14:23:45.632999 Z + - David + - created + - "" diff --git a/bugs/issue-99ae09d1da472e76501325424bc586f78980199e.yaml b/bugs/issue-99ae09d1da472e76501325424bc586f78980199e.yaml new file mode 100644 index 0000000..4d58710 --- /dev/null +++ b/bugs/issue-99ae09d1da472e76501325424bc586f78980199e.yaml @@ -0,0 +1,20 @@ +--- !ditz.rubyforge.org,2008-03-06/issue +title: debug sta return val +desc: |- + debug the sta value in diskio.c + never seems to take the correct value, looks like global,local scope problem +type: :bugfix +component: fatfs +release: +reporter: David +status: :unstarted +disposition: +creation_time: 2009-06-10 14:20:20.608109 Z +references: [] + +id: 99ae09d1da472e76501325424bc586f78980199e +log_events: +- - 2009-06-10 14:20:24.343929 Z + - David + - created + - "" diff --git a/snes/fatfstest/PPU.c b/snes/fatfstest/PPU.c index bfc0956..a0fd197 100644 --- a/snes/fatfstest/PPU.c +++ b/snes/fatfstest/PPU.c @@ -3,78 +3,88 @@ byte tileMapLocation[4]; word characterLocation[4]; -void waitForVBlank(void) { - byte Status; - do { - Status = *(byte*)0x4210; - } while (!(Status & 0x80)); +void waitForVBlank(void) +{ + byte Status; + do { + Status = *(byte *) 0x4210; + } while (!(Status & 0x80)); } -void setTileMapLocation(word vramDst, byte screenProp, byte bgNumber) { - tileMapLocation[bgNumber] = ((vramDst >> 8) & 0xfc) | ( screenProp & 0x03 ); - *(byte*) (0x2107+bgNumber) = tileMapLocation[bgNumber]; +void setTileMapLocation(word vramDst, byte screenProp, byte bgNumber) +{ + tileMapLocation[bgNumber] = ((vramDst >> 8) & 0xfc) | (screenProp & 0x03); + *(byte *) (0x2107 + bgNumber) = tileMapLocation[bgNumber]; } -void restoreTileMapLocation(byte bgNumber) { - *(byte*) (0x2107+bgNumber) = tileMapLocation[bgNumber]; +void restoreTileMapLocation(byte bgNumber) +{ + *(byte *) (0x2107 + bgNumber) = tileMapLocation[bgNumber]; } -void setCharacterLocation(word vramDst, byte bgNumber) { - characterLocation[bgNumber] = vramDst; - if(bgNumber < 2) { - *(byte*) 0x210b = (characterLocation[1] >> 8 & 0xf0 ) + (characterLocation[0] >> 12); - } else { - *(byte*) 0x210c = (characterLocation[3] >> 8 & 0xf0 ) + (characterLocation[2] >> 12); - } +void setCharacterLocation(word vramDst, byte bgNumber) +{ + characterLocation[bgNumber] = vramDst; + if (bgNumber < 2) { + *(byte *) 0x210b = + (characterLocation[1] >> 8 & 0xf0) + (characterLocation[0] >> 12); + } else { + *(byte *) 0x210c = + (characterLocation[3] >> 8 & 0xf0) + (characterLocation[2] >> 12); + } } -void restoreCharacterLocation(byte bgNumber) { - setCharacterLocation(characterLocation[bgNumber], bgNumber); +void restoreCharacterLocation(byte bgNumber) +{ + setCharacterLocation(characterLocation[bgNumber], bgNumber); } -void VRAMByteWrite(byte value, word vramDst) { - *(byte*)0x2115 = 0x80; - *(word*)0x2116 = vramDst; +void VRAMByteWrite(byte value, word vramDst) +{ + *(byte *) 0x2115 = 0x80; + *(word *) 0x2116 = vramDst; - *(byte*)0x2118 = value; + *(byte *) 0x2118 = value; } -void VRAMLoad(word src, word vramDst, word size) { - // set address in VRam for read or write ($2116) + block size transfer ($2115) - *(byte*)0x2115 = 0x80; - *(word*)0x2116 = vramDst; +void VRAMLoad(word src, word vramDst, word size) +{ + // set address in VRam for read or write ($2116) + block size transfer ($2115) + *(byte *) 0x2115 = 0x80; + *(word *) 0x2116 = vramDst; - *(word*)0x4300 = 0x1801; // set DMA control register (1 word inc) - // and destination ($21xx xx -> 0x18) - *(word*)0x4302 = src; // DMA channel x source address offset - // (low $4302 and high $4303 optimisation) - *(byte*)0x4304 = 0x01; // DMA channel x source address bank - *(word*)0x4305 = size; // DMA channel x transfer size - // (low $4305 and high $4306 optimisation) + *(word *) 0x4300 = 0x1801; // set DMA control register (1 word inc) + // and destination ($21xx xx -> 0x18) + *(word *) 0x4302 = src; // DMA channel x source address offset + // (low $4302 and high $4303 optimisation) + *(byte *) 0x4304 = 0x01; // DMA channel x source address bank + *(word *) 0x4305 = size; // DMA channel x transfer size + // (low $4305 and high $4306 optimisation) - // Turn on DMA transfer for this channel - waitForVBlank(); - *(byte*)0x2100 = 0x80; - *(byte*)0x420b = 0x01; - *(byte*)0x2100 = 0x00; + // Turn on DMA transfer for this channel + waitForVBlank(); + *(byte *) 0x2100 = 0x80; + *(byte *) 0x420b = 0x01; + *(byte *) 0x2100 = 0x00; } -void CGRAMLoad(word src, byte cgramDst, word size) { - - // set address in VRam for read or write + block size - *(byte*)0x2121 = cgramDst; +void CGRAMLoad(word src, byte cgramDst, word size) +{ - *(word*)0x4300 = 0x2200; // set DMA control register (1 byte inc) - // and destination ($21xx xx -> 022) - *(word*)0x4302 = src; // DMA channel x source address offset - // (low $4302 and high $4303 optimisation) - *(byte*)0x4304 = 0x01; // DMA channel x source address bank - *(word*)0x4305 = size; // DMA channel x transfer size - // (low $4305 and high $4306 optimisation) + // set address in VRam for read or write + block size + *(byte *) 0x2121 = cgramDst; - // Turn on DMA transfer for this channel - waitForVBlank(); - *(byte*)0x2100 = 0x80; - *(byte*)0x420b = 0x01; - *(byte*)0x2100 = 0x00; -} \ No newline at end of file + *(word *) 0x4300 = 0x2200; // set DMA control register (1 byte inc) + // and destination ($21xx xx -> 022) + *(word *) 0x4302 = src; // DMA channel x source address offset + // (low $4302 and high $4303 optimisation) + *(byte *) 0x4304 = 0x01; // DMA channel x source address bank + *(word *) 0x4305 = size; // DMA channel x transfer size + // (low $4305 and high $4306 optimisation) + + // Turn on DMA transfer for this channel + waitForVBlank(); + *(byte *) 0x2100 = 0x80; + *(byte *) 0x420b = 0x01; + *(byte *) 0x2100 = 0x00; +} diff --git a/snes/fatfstest/crc.c b/snes/fatfstest/crc.c index 8c951a0..12749a3 100644 --- a/snes/fatfstest/crc.c +++ b/snes/fatfstest/crc.c @@ -1,37 +1,37 @@ #include "data.h" -word crc_update (char far *data, word size) +word crc_update(char far * data, word size) { - word i; + word i; word j; - word crc=0; - for (j=0; j=33 && packet[i+j]<=126 ) - printfc("%c", packet[i+j]); - else - printfc("."); - } - printfc("|\n"); - } +void printc_packet(unsigned long addr, unsigned int len, byte * packet) +{ + unsigned int i, j; + unsigned int sum = 0; + unsigned int clear = 0; + + for (i = 0; i < len; i += 16) { + + sum = 0; + for (j = 0; j < 16; j++) { + sum += packet[i + j]; + } + if (!sum) { + clear = 1; + continue; + } + if (clear) { + printfc("*\n"); + clear = 0; + } + printfc("%lx:", addr + i); + for (j = 0; j < 16; j++) { + printfc(" %x", packet[i + j]); + } + printfc(" |"); + for (j = 0; j < 16; j++) { + if (packet[i + j] >= 33 && packet[i + j] <= 126) + printfc("%c", packet[i + j]); + else + printfc("."); + } + printfc("|\n"); + } } -/* keep the linker happy */ -int open(const char * _name, int _mode){ +/* + * keep the linker happy + */ +int open(const char *_name, int _mode) +{ _print_console("open called\n"); return -1; } -int close(int fd){ +int close(int fd) +{ _print_console("close called\n"); return -1; - -} -size_t read(int fd, void * buff, size_t len){ +} + +size_t read(int fd, void *buff, size_t len) +{ _print_console("read called\n"); return 0; -} +} -size_t write(int fd, void * buffer, size_t len){ +size_t write(int fd, void *buffer, size_t len) +{ _print_console("write called\n"); return 0; } -long lseek(int fd, long off, int count){ +long lseek(int fd, long off, int count) +{ _print_console("lseek called\n"); return 0; -} +} -int unlink(const char * name){ +int unlink(const char *name) +{ _print_console("unlink called\n"); return -1; } -int isatty(){ +int isatty() +{ _print_console("isatty called\n"); return 1; } - diff --git a/snes/fatfstest/diskio.c b/snes/fatfstest/diskio.c index ed558cd..0a98f82 100644 --- a/snes/fatfstest/diskio.c +++ b/snes/fatfstest/diskio.c @@ -7,25 +7,18 @@ -/* Interface -** Scratch Buffer -addr 3 byte -size 1 byte - -** Call Interface -cmd 1 byte -sector 4 bytes -count 1 byte -return 1 byte - -** Commands - * disk_init - * disk_read - * disk_write -*/ +/* + * Interface ** Scratch Buffer addr 3 byte size 1 byte + * + * ** Call Interface cmd 1 byte sector 4 bytes count 1 byte return 1 byte + * + * ** Commands * disk_init * disk_read * disk_write + */ /*-----------------------------------------------------------------------*/ -/* Initialize Disk Drive */ +/* + * Initialize Disk Drive + */ /*-----------------------------------------------------------------------*/ #include @@ -33,158 +26,175 @@ return 1 byte // TODO: Figure out gobal vars ?!? -DSTATUS Stat = 0 ; //STA_NOINIT; /* Disk status */ +DSTATUS Stat = 0; // STA_NOINIT; /* Disk status */ -DSTATUS disk_initialize (BYTE drv) { - +DSTATUS disk_initialize(BYTE drv) +{ + byte retval; - #ifdef MMIO_DEBUG - printfc("SNES::disk_initialize: called drv=%i stat=%i\n",drv,Stat); - #endif - if (drv) return STA_NOINIT; /* Supports only single drive */ +#ifdef MMIO_DEBUG + printfc("SNES::disk_initialize: called drv=%i stat=%i\n", drv, Stat); +#endif + if (drv) + return STA_NOINIT; /* Supports only single drive */ Stat |= STA_NOINIT; - #ifdef MMIO_DEBUG - printfc("SNES::disk_initialize: stat=%i\n",Stat); - #endif - *(byte*) MMIO_RETVAL = STA_VOID; - *(byte*) MMIO_CMD = CMD_INIT; - #ifdef MMIO_DEBUG +#ifdef MMIO_DEBUG + printfc("SNES::disk_initialize: stat=%i\n", Stat); +#endif + *(byte *) MMIO_RETVAL = STA_VOID; + *(byte *) MMIO_CMD = CMD_INIT; +#ifdef MMIO_DEBUG printfc("SNES::disk_initialize: poll retval\n"); - #endif - while((retval = *(byte*) MMIO_RETVAL) == STA_VOID); - Stat &= ~STA_NOINIT; /* When device goes ready, clear STA_NOINIT */ - #ifdef MMIO_DEBUG - printfc("SNES::disk_initialize: done Stat=%i\n",Stat); - #endif +#endif + while ((retval = *(byte *) MMIO_RETVAL) == STA_VOID); + Stat &= ~STA_NOINIT; /* When device goes ready, clear STA_NOINIT */ +#ifdef MMIO_DEBUG + printfc("SNES::disk_initialize: done Stat=%i\n", Stat); +#endif return Stat; } /*-----------------------------------------------------------------------*/ -/* Return Disk Status */ +/* + * Return Disk Status + */ /*-----------------------------------------------------------------------*/ -DSTATUS disk_status (BYTE drv){ - if (drv) return STA_NOINIT; /* Supports only single drive */ +DSTATUS disk_status(BYTE drv) +{ + if (drv) + return STA_NOINIT; /* Supports only single drive */ return Stat; } /*-----------------------------------------------------------------------*/ -/* Read Sector(s) */ +/* + * Read Sector(s) + */ /*-----------------------------------------------------------------------*/ -DRESULT disk_read ( - BYTE drv, /* Physical drive nmuber (0) */ - BYTE *buff, /* Data buffer to store read data */ - DWORD sector, /* Sector number (LBA) */ - BYTE count /* Sector count (1..255) */ -) +DRESULT disk_read(BYTE drv, /* Physical drive nmuber (0) */ + BYTE * buff, /* Data buffer to store read data */ + DWORD sector, /* Sector number (LBA) */ + BYTE count /* Sector count (1..255) */ + ) { DWORD offset; INT size; byte retval; word i; - - #ifdef MMIO_DEBUG - printfc("SNES::disk_read: sector=%li count=%i\n",sector,count); - #endif - if (drv || !count) return RES_PARERR; - #ifdef MMIO_DEBUG + +#ifdef MMIO_DEBUG + printfc("SNES::disk_read: sector=%li count=%i\n", sector, count); +#endif + if (drv || !count) + return RES_PARERR; +#ifdef MMIO_DEBUG printfc("SNES::disk_read: drv ok\n"); - #endif - if (Stat & STA_NOINIT) return RES_NOTRDY; - #ifdef MMIO_DEBUG +#endif + if (Stat & STA_NOINIT) + return RES_NOTRDY; +#ifdef MMIO_DEBUG printfc("SNES::disk_read: sta ok\n"); - #endif +#endif - *(byte*) MMIO_RETVAL = STA_VOID; - *(byte*) MMIO_CMD = CMD_READ; - - *(byte*) MMIO_SECTOR01 = (sector >> 24) & 0xff; - *(byte*) MMIO_SECTOR02 = (sector >> 16) & 0xff; - *(byte*) MMIO_SECTOR03 = (sector >> 8) & 0xff; - *(byte*) MMIO_SECTOR04 = (sector) & 0xff; - - *(byte*) MMIO_COUNT = count; + *(byte *) MMIO_RETVAL = STA_VOID; + *(byte *) MMIO_CMD = CMD_READ; - #ifdef MMIO_DEBUG + *(byte *) MMIO_SECTOR01 = (sector >> 24) & 0xff; + *(byte *) MMIO_SECTOR02 = (sector >> 16) & 0xff; + *(byte *) MMIO_SECTOR03 = (sector >> 8) & 0xff; + *(byte *) MMIO_SECTOR04 = (sector) & 0xff; + + *(byte *) MMIO_COUNT = count; + +#ifdef MMIO_DEBUG printfc("SNES::disk_read: poll retval\n"); - #endif - while((retval = *(byte*) MMIO_RETVAL) == STA_VOID); - - - #ifdef MMIO_DEBUG - printfc("SNES::disk_read: copy buffer to %lx\n",SHARED_ADDR); - #endif - for (i=0;i<(count*512);i++){ - buff[i] = *(byte*)(SHARED_ADDR+i); - #ifdef MMIO_DEBUG - if ( i < 4) - printfc("0x%x ",buff[i]); - #endif +#endif + while ((retval = *(byte *) MMIO_RETVAL) == STA_VOID); + + +#ifdef MMIO_DEBUG + printfc("SNES::disk_read: copy buffer to %lx\n", SHARED_ADDR); +#endif + for (i = 0; i < (count * 512); i++) { + buff[i] = *(byte *) (SHARED_ADDR + i); +#ifdef MMIO_DEBUG + if (i < 4) + printfc("0x%x ", buff[i]); +#endif } - #ifdef MMIO_DEBUG +#ifdef MMIO_DEBUG printfc("\n"); - #endif +#endif return retval; } /*-----------------------------------------------------------------------*/ -/* Write Sector(s) */ +/* + * Write Sector(s) + */ /*-----------------------------------------------------------------------*/ #if _READONLY == 0 -DRESULT disk_write ( - BYTE drv, /* Physical drive nmuber (0) */ - const BYTE *buff, /* Data to be written */ - DWORD sector, /* Sector number (LBA) */ - BYTE count /* Sector count (1..255) */ -) +DRESULT disk_write(BYTE drv, /* Physical drive nmuber (0) */ + const BYTE * buff, /* Data to be written */ + DWORD sector, /* Sector number (LBA) */ + BYTE count /* Sector count (1..255) */ + ) { DWORD offset; INT size; - if (drv || !count) return RES_PARERR; - if (Stat & STA_NOINIT) return RES_NOTRDY; + if (drv || !count) + return RES_PARERR; + if (Stat & STA_NOINIT) + return RES_NOTRDY; - offset = sector * 512; + offset = sector * 512; size = count * 512; return RES_OK; } -#endif /* _READONLY */ +#endif /* _READONLY */ /*-----------------------------------------------------------------------*/ -/* Miscellaneous Functions */ +/* + * Miscellaneous Functions + */ /*-----------------------------------------------------------------------*/ #if _USE_IOCTL != 0 -DRESULT disk_ioctl ( - BYTE drv, /* Physical drive nmuber (0) */ - BYTE ctrl, /* Control code */ - void *buff /* Buffer to send/receive data block */ -) +DRESULT disk_ioctl(BYTE drv, /* Physical drive nmuber (0) */ + BYTE ctrl, /* Control code */ + void *buff /* Buffer to send/receive data block */ + ) { - BYTE n, w, ofs, dl, dh, *ptr = (BYTE*)buff; + BYTE n, w, ofs, dl, dh, *ptr = (BYTE *) buff; - if (drv) return RES_PARERR; - if (Stat & STA_NOINIT) return RES_NOTRDY; + if (drv) + return RES_PARERR; + if (Stat & STA_NOINIT) + return RES_NOTRDY; switch (ctrl) { - case GET_SECTOR_COUNT : /* Get number of sectors on the disk (DWORD) */ - ofs = 60; w = 2; n = 0; + case GET_SECTOR_COUNT: /* Get number of sectors on the disk (DWORD) */ + ofs = 60; + w = 2; + n = 0; break; - case GET_SECTOR_SIZE : /* Get sectors on the disk (WORD) */ - *(WORD*)buff = 512; + case GET_SECTOR_SIZE: /* Get sectors on the disk (WORD) */ + *(WORD *) buff = 512; return RES_OK; - case GET_BLOCK_SIZE : /* Get erase block size in sectors (DWORD) */ - *(DWORD*)buff = 32; + case GET_BLOCK_SIZE: /* Get erase block size in sectors (DWORD) */ + *(DWORD *) buff = 32; return RES_OK; default: @@ -192,8 +202,4 @@ DRESULT disk_ioctl ( } return RES_OK; } -#endif /* _USE_IOCTL != 0 */ - - - - +#endif /* _USE_IOCTL != 0 */ diff --git a/snes/fatfstest/event.c b/snes/fatfstest/event.c index 6e241f6..d3bc9ba 100644 --- a/snes/fatfstest/event.c +++ b/snes/fatfstest/event.c @@ -5,97 +5,102 @@ event *events; -void initEvents(void) { - events = NULL; +void initEvents(void) +{ + events = NULL; } -event *createEvent(char (*callback)(word counter)) { - event *myEvent; +event *createEvent(char (*callback) (word counter)) +{ + event *myEvent; - myEvent = (event*) malloc(sizeof(event)); + myEvent = (event *) malloc(sizeof(event)); - myEvent->VBlankCount = 0; - myEvent->callback = callback; - myEvent->nextEvent = NULL; - myEvent->previousEvent = NULL; + myEvent->VBlankCount = 0; + myEvent->callback = callback; + myEvent->nextEvent = NULL; + myEvent->previousEvent = NULL; - return myEvent; + return myEvent; } -event* addEvent(char (*callback)(word counter), int noDuplicateCallback) { +event *addEvent(char (*callback) (word counter), int noDuplicateCallback) +{ - event *lastEvent; - event *myEvent; + event *lastEvent; + event *myEvent; - if(events == NULL) { - events = createEvent(callback); - return events; - } else { - lastEvent = events; - // TODO optimise this with noduplicate - while(lastEvent->nextEvent != NULL) { - if(noDuplicateCallback == 1 && lastEvent->callback == *callback) { - return NULL; - } - lastEvent = lastEvent->nextEvent; - } - if(noDuplicateCallback == 1 && lastEvent->callback == *callback) { - return NULL; - } - myEvent = createEvent(callback); - myEvent->previousEvent = lastEvent; - lastEvent->nextEvent = myEvent; - return myEvent; - } + if (events == NULL) { + events = createEvent(callback); + return events; + } else { + lastEvent = events; + // TODO optimise this with noduplicate + while (lastEvent->nextEvent != NULL) { + if (noDuplicateCallback == 1 && lastEvent->callback == *callback) { + return NULL; + } + lastEvent = lastEvent->nextEvent; + } + if (noDuplicateCallback == 1 && lastEvent->callback == *callback) { + return NULL; + } + myEvent = createEvent(callback); + myEvent->previousEvent = lastEvent; + lastEvent->nextEvent = myEvent; + return myEvent; + } } -void removeEvent(event *eventElement) { +void removeEvent(event * eventElement) +{ - byte alone = 0; - event *next, *previous; + byte alone = 0; + event *next, *previous; - next = eventElement->nextEvent; - previous = eventElement->previousEvent; + next = eventElement->nextEvent; + previous = eventElement->previousEvent; - if(eventElement->nextEvent != NULL && eventElement->previousEvent != NULL) { - alone++; - next->previousEvent = previous; - previous->nextEvent = next; + if (eventElement->nextEvent != NULL && eventElement->previousEvent != NULL) { + alone++; + next->previousEvent = previous; + previous->nextEvent = next; - } else if(eventElement->nextEvent != NULL) { - alone++; - next->previousEvent = NULL; - events = next; + } else if (eventElement->nextEvent != NULL) { + alone++; + next->previousEvent = NULL; + events = next; - } else if(eventElement->previousEvent != NULL) { - alone++; - previous->nextEvent = NULL; - } + } else if (eventElement->previousEvent != NULL) { + alone++; + previous->nextEvent = NULL; + } - free(eventElement); + free(eventElement); - if(alone == 0) { - events = NULL; - } + if (alone == 0) { + events = NULL; + } } -void processEvents(void) { +void processEvents(void) +{ - event *currentEvent; - char returnValue; + event *currentEvent; + char returnValue; - currentEvent = events; - while(currentEvent != NULL) { - returnValue = currentEvent->callback(currentEvent->VBlankCount); - if(returnValue == EVENT_CONTINUE) { - currentEvent->VBlankCount++; - } else { - removeEvent(currentEvent); - } - currentEvent = currentEvent->nextEvent; - } + currentEvent = events; + while (currentEvent != NULL) { + returnValue = currentEvent->callback(currentEvent->VBlankCount); + if (returnValue == EVENT_CONTINUE) { + currentEvent->VBlankCount++; + } else { + removeEvent(currentEvent); + } + currentEvent = currentEvent->nextEvent; + } } diff --git a/snes/fatfstest/ff.c b/snes/fatfstest/ff.c index fd99b5a..b25299e 100644 --- a/snes/fatfstest/ff.c +++ b/snes/fatfstest/ff.c @@ -64,9 +64,9 @@ / Added multiple sector size support. /---------------------------------------------------------------------------*/ -#include "ff.h" /* FatFs configurations and declarations */ -#include "diskio.h" /* Declarations of low level disk I/O functions */ -#include "debug.h" /* FatFs configurations and declarations */ +#include "ff.h" /* FatFs configurations and declarations */ +#include "diskio.h" /* Declarations of low level disk I/O functions */ +#include "debug.h" /* FatFs configurations and declarations */ /*-------------------------------------------------------------------------- @@ -102,22 +102,22 @@ ---------------------------------------------------------------------------*/ static -FATFS *FatFs[_DRIVES]; /* Pointer to the file system objects (logical drives) */ +FATFS *FatFs[_DRIVES]; /* Pointer to the file system objects (logical drives) */ static -WORD Fsid; /* File system mount ID */ +WORD Fsid; /* File system mount ID */ -#if _USE_LFN == 1 /* LFN with static LFN working buffer */ +#if _USE_LFN == 1 /* LFN with static LFN working buffer */ static WORD LfnBuf[_MAX_LFN + 1]; #define NAMEBUF(sp,lp) BYTE sp[12]; WCHAR *lp = LfnBuf #define INITBUF(dj,sp,lp) dj.fn = sp; dj.lfn = lp -#elif _USE_LFN > 1 /* LFN with dynamic LFN working buffer */ +#elif _USE_LFN > 1 /* LFN with dynamic LFN working buffer */ #define NAMEBUF(sp,lp) BYTE sp[12]; WCHAR lbuf[_MAX_LFN + 1], *lp = lbuf #define INITBUF(dj,sp,lp) dj.fn = sp; dj.lfn = lp -#else /* No LFN */ +#else /* No LFN */ #define NAMEBUF(sp,lp) BYTE sp[12] #define INITBUF(dj,sp,lp) dj.fn = sp @@ -134,147 +134,170 @@ WORD LfnBuf[_MAX_LFN + 1]; /*-----------------------------------------------------------------------*/ -/* String functions */ +/* + * String functions + */ /*-----------------------------------------------------------------------*/ -/* Copy memory to memory */ +/* + * Copy memory to memory + */ static -void mem_cpy (void* dst, const void* src, int cnt) { - char *d = (char*)dst; - const char *s = (const char *)src; - while (cnt--) *d++ = *s++; +void mem_cpy(void *dst, const void *src, int cnt) +{ + char *d = (char *) dst; + const char *s = (const char *) src; + while (cnt--) + *d++ = *s++; } -/* Fill memory */ +/* + * Fill memory + */ static -void mem_set (void* dst, int val, int cnt) { - char *d = (char*)dst; - while (cnt--) *d++ = (char)val; +void mem_set(void *dst, int val, int cnt) +{ + char *d = (char *) dst; + while (cnt--) + *d++ = (char) val; } -/* Compare memory to memory */ +/* + * Compare memory to memory + */ static -int mem_cmp (const void* dst, const void* src, int cnt) { - const char *d = (const char *)dst, *s = (const char *)src; - int r = 0; - while (cnt-- && (r = *d++ - *s++) == 0) ; - return r; +int mem_cmp(const void *dst, const void *src, int cnt) +{ + const char *d = (const char *) dst, *s = (const char *) src; + int r = 0; + while (cnt-- && (r = *d++ - *s++) == 0); + return r; } -/* Check if chr is contained in the string */ +/* + * Check if chr is contained in the string + */ static -int chk_chr (const char* str, int chr) { - while (*str && *str != chr) str++; - return *str; +int chk_chr(const char *str, int chr) +{ + while (*str && *str != chr) + str++; + return *str; } /*-----------------------------------------------------------------------*/ -/* Request/Release grant to access the volume */ +/* + * Request/Release grant to access the volume + */ /*-----------------------------------------------------------------------*/ #if _FS_REENTRANT static -BOOL lock_fs ( - FATFS *fs /* File system object */ -) +BOOL lock_fs(FATFS * fs /* File system object */ + ) { - return ff_req_grant(fs->sobj); + return ff_req_grant(fs->sobj); } static -void unlock_fs ( - FATFS *fs, /* File system object */ - FRESULT res /* Result code to be returned */ -) +void unlock_fs(FATFS * fs, /* File system object */ + FRESULT res /* Result code to be returned */ + ) { - if (res != FR_NOT_ENABLED && - res != FR_INVALID_DRIVE && - res != FR_INVALID_OBJECT && - res != FR_TIMEOUT) { - ff_rel_grant(fs->sobj); - } + if (res != FR_NOT_ENABLED && + res != FR_INVALID_DRIVE && + res != FR_INVALID_OBJECT && res != FR_TIMEOUT) { + ff_rel_grant(fs->sobj); + } } #endif /*-----------------------------------------------------------------------*/ -/* Change window offset */ +/* + * Change window offset + */ /*-----------------------------------------------------------------------*/ static -FRESULT move_window ( - FATFS *fs, /* File system object */ - DWORD sector /* Sector number to make apperance in the fs->win[] */ -) /* Move to zero only writes back dirty window */ -{ - DWORD wsect; +FRESULT move_window(FATFS * fs, /* File system object */ + DWORD sector /* Sector number to make apperance in the fs->win[] */ + ) +{ /* Move to zero only writes back dirty window */ + DWORD wsect; - wsect = fs->winsect; - if (wsect != sector) { /* Changed current window */ + wsect = fs->winsect; + if (wsect != sector) { /* Changed current window */ #if !_FS_READONLY - if (fs->wflag) { /* Write back dirty window if needed */ - if (disk_write(fs->drive, fs->win, wsect, (BYTE)1) != RES_OK) - return FR_DISK_ERR; - fs->wflag = 0; - if (wsect < (fs->fatbase + fs->sects_fat)) { /* In FAT area */ - BYTE nf; - for (nf = fs->n_fats; nf >= 2; nf--) { /* Refrect the change to FAT copy */ - wsect += fs->sects_fat; - disk_write(fs->drive, fs->win, wsect, (BYTE)1); - } - } - } + if (fs->wflag) { /* Write back dirty window if needed */ + if (disk_write(fs->drive, fs->win, wsect, (BYTE) 1) != RES_OK) + return FR_DISK_ERR; + fs->wflag = 0; + if (wsect < (fs->fatbase + fs->sects_fat)) { /* In FAT area */ + BYTE nf; + for (nf = fs->n_fats; nf >= 2; nf--) { /* Refrect the change to FAT copy */ + wsect += fs->sects_fat; + disk_write(fs->drive, fs->win, wsect, (BYTE) 1); + } + } + } #endif - if (sector) { - if (disk_read(fs->drive, fs->win, sector,(BYTE) 1) != RES_OK) - return FR_DISK_ERR; - fs->winsect = sector; - } - } + if (sector) { + if (disk_read(fs->drive, fs->win, sector, (BYTE) 1) != RES_OK) + return FR_DISK_ERR; + fs->winsect = sector; + } + } - return FR_OK; + return FR_OK; } /*-----------------------------------------------------------------------*/ -/* Clean-up cached data */ +/* + * Clean-up cached data + */ /*-----------------------------------------------------------------------*/ #if !_FS_READONLY static -FRESULT sync ( /* FR_OK: successful, FR_DISK_ERR: failed */ - FATFS *fs /* File system object */ -) +FRESULT sync( /* FR_OK: successful, FR_DISK_ERR: failed */ + FATFS * fs /* File system object */ + ) { - FRESULT res; + FRESULT res; - res = move_window(fs,(DWORD) 0); - if (res == FR_OK) { - /* Update FSInfo sector if needed */ - if (fs->fs_type == FS_FAT32 && fs->fsi_flag) { - fs->winsect = 0; - mem_set(fs->win, 0, 512); - ST_WORD(fs->win+BS_55AA, 0xAA55); - ST_DWORD(fs->win+FSI_LeadSig, 0x41615252); - ST_DWORD(fs->win+FSI_StrucSig, 0x61417272); - ST_DWORD(fs->win+FSI_Free_Count, fs->free_clust); - ST_DWORD(fs->win+FSI_Nxt_Free, fs->last_clust); - disk_write(fs->drive, fs->win, fs->fsi_sector, (BYTE)1); - fs->fsi_flag = 0; - } - /* Make sure that no pending write process in the physical drive */ - if (disk_ioctl(fs->drive, CTRL_SYNC, (void*)NULL) != RES_OK) - res = FR_DISK_ERR; - } + res = move_window(fs, (DWORD) 0); + if (res == FR_OK) { + /* + * Update FSInfo sector if needed + */ + if (fs->fs_type == FS_FAT32 && fs->fsi_flag) { + fs->winsect = 0; + mem_set(fs->win, 0, 512); + ST_WORD(fs->win + BS_55AA, 0xAA55); + ST_DWORD(fs->win + FSI_LeadSig, 0x41615252); + ST_DWORD(fs->win + FSI_StrucSig, 0x61417272); + ST_DWORD(fs->win + FSI_Free_Count, fs->free_clust); + ST_DWORD(fs->win + FSI_Nxt_Free, fs->last_clust); + disk_write(fs->drive, fs->win, fs->fsi_sector, (BYTE) 1); + fs->fsi_flag = 0; + } + /* + * Make sure that no pending write process in the physical drive + */ + if (disk_ioctl(fs->drive, CTRL_SYNC, (void *) NULL) != RES_OK) + res = FR_DISK_ERR; + } - return res; + return res; } #endif @@ -282,144 +305,169 @@ FRESULT sync ( /* FR_OK: successful, FR_DISK_ERR: failed */ /*-----------------------------------------------------------------------*/ -/* Get a cluster status */ +/* + * Get a cluster status + */ /*-----------------------------------------------------------------------*/ static -DWORD get_cluster ( /* 0xFFFFFFFF:Disk error, 1:Interal error, Else:Cluster status */ - FATFS *fs, /* File system object */ - DWORD clst /* Cluster# to get the link information */ -) +DWORD get_cluster( /* 0xFFFFFFFF:Disk error, 1:Interal error, Else:Cluster status */ + FATFS * fs, /* File system object */ + DWORD clst /* Cluster# to get the link information */ + ) { - WORD wc, bc; - DWORD fsect; + WORD wc, bc; + DWORD fsect; - if (clst < 2 || clst >= fs->max_clust) /* Check cluster address range */ - return 1; + if (clst < 2 || clst >= fs->max_clust) /* Check cluster address range */ + return 1; - fsect = fs->fatbase; - switch (fs->fs_type) { - case FS_FAT12 : - bc = (WORD)clst * 3 / 2; - if (move_window(fs, fsect + (bc / SS(fs)))) break; - wc = fs->win[bc & (SS(fs) - 1)]; bc++; - if (move_window(fs, fsect + (bc / SS(fs)))) break; - wc |= (WORD)fs->win[bc & (SS(fs) - 1)] << 8; - return (clst & 1) ? (wc >> 4) : (wc & 0xFFF); + fsect = fs->fatbase; + switch (fs->fs_type) { + case FS_FAT12: + bc = (WORD) clst *3 / 2; + if (move_window(fs, fsect + (bc / SS(fs)))) + break; + wc = fs->win[bc & (SS(fs) - 1)]; + bc++; + if (move_window(fs, fsect + (bc / SS(fs)))) + break; + wc |= (WORD) fs->win[bc & (SS(fs) - 1)] << 8; + return (clst & 1) ? (wc >> 4) : (wc & 0xFFF); - case FS_FAT16 : - if (move_window(fs, fsect + (clst / (SS(fs) / 2)))) break; - return LD_WORD(&fs->win[((WORD)clst * 2) & (SS(fs) - 1)]); + case FS_FAT16: + if (move_window(fs, fsect + (clst / (SS(fs) / 2)))) + break; + return LD_WORD(&fs->win[((WORD) clst * 2) & (SS(fs) - 1)]); - case FS_FAT32 : - if (move_window(fs, fsect + (clst / (SS(fs) / 4)))) break; - return LD_DWORD(&fs->win[((WORD)clst * 4) & (SS(fs) - 1)]) & 0x0FFFFFFF; - } + case FS_FAT32: + if (move_window(fs, fsect + (clst / (SS(fs) / 4)))) + break; + return LD_DWORD(&fs-> + win[((WORD) clst * 4) & (SS(fs) - 1)]) & 0x0FFFFFFF; + } - return 0xFFFFFFFF; /* An error occured at the disk I/O layer */ + return 0xFFFFFFFF; /* An error occured at the disk I/O layer */ } /*-----------------------------------------------------------------------*/ -/* Change a cluster status */ +/* + * Change a cluster status + */ /*-----------------------------------------------------------------------*/ #if !_FS_READONLY static -FRESULT put_cluster ( - FATFS *fs, /* File system object */ - DWORD clst, /* Cluster# to be changed (must be 2 to fs->max_clust-1) */ - DWORD val /* New value to mark the cluster */ -) +FRESULT put_cluster(FATFS * fs, /* File system object */ + DWORD clst, /* Cluster# to be changed (must be 2 to fs->max_clust-1) */ + DWORD val /* New value to mark the cluster */ + ) { - WORD bc; - BYTE *p; - DWORD fsect; - FRESULT res; + WORD bc; + BYTE *p; + DWORD fsect; + FRESULT res; - if (clst < 2 || clst >= fs->max_clust) { /* Check cluster address range */ - res = FR_INT_ERR; + if (clst < 2 || clst >= fs->max_clust) { /* Check cluster address range */ + res = FR_INT_ERR; - } else { - fsect = fs->fatbase; - switch (fs->fs_type) { - case FS_FAT12 : - bc = (WORD)clst * 3 / 2; - res = move_window(fs, fsect + (bc / SS(fs))); - if (res != FR_OK) break; - p = &fs->win[bc & (SS(fs) - 1)]; - *p = (clst & 1) ? ((*p & 0x0F) | ((BYTE)val << 4)) : (BYTE)val; - bc++; - fs->wflag = 1; - res = move_window(fs, fsect + (bc / SS(fs))); - if (res != FR_OK) break; - p = &fs->win[bc & (SS(fs) - 1)]; - *p = (clst & 1) ? (BYTE)(val >> 4) : ((*p & 0xF0) | ((BYTE)(val >> 8) & 0x0F)); - break; + } else { + fsect = fs->fatbase; + switch (fs->fs_type) { + case FS_FAT12: + bc = (WORD) clst *3 / 2; + res = move_window(fs, fsect + (bc / SS(fs))); + if (res != FR_OK) + break; + p = &fs->win[bc & (SS(fs) - 1)]; + *p = (clst & 1) ? ((*p & 0x0F) | ((BYTE) val << 4)) : (BYTE) + val; + bc++; + fs->wflag = 1; + res = move_window(fs, fsect + (bc / SS(fs))); + if (res != FR_OK) + break; + p = &fs->win[bc & (SS(fs) - 1)]; + *p = (clst & 1) ? (BYTE) (val >> 4) : ((*p & 0xF0) | + ((BYTE) (val >> 8) & + 0x0F)); + break; - case FS_FAT16 : - res = move_window(fs, fsect + (clst / (SS(fs) / 2))); - if (res != FR_OK) break; - ST_WORD(&fs->win[((WORD)clst * 2) & (SS(fs) - 1)], (WORD)val); - break; + case FS_FAT16: + res = move_window(fs, fsect + (clst / (SS(fs) / 2))); + if (res != FR_OK) + break; + ST_WORD(&fs->win[((WORD) clst * 2) & (SS(fs) - 1)], (WORD) val); + break; - case FS_FAT32 : - res = move_window(fs, fsect + (clst / (SS(fs) / 4))); - if (res != FR_OK) break; - ST_DWORD(&fs->win[((WORD)clst * 4) & (SS(fs) - 1)], val); - break; + case FS_FAT32: + res = move_window(fs, fsect + (clst / (SS(fs) / 4))); + if (res != FR_OK) + break; + ST_DWORD(&fs->win[((WORD) clst * 4) & (SS(fs) - 1)], val); + break; - default : - res = FR_INT_ERR; - } - fs->wflag = 1; - } + default: + res = FR_INT_ERR; + } + fs->wflag = 1; + } - return res; + return res; } -#endif /* !_FS_READONLY */ +#endif /* !_FS_READONLY */ /*-----------------------------------------------------------------------*/ -/* Remove a cluster chain */ +/* + * Remove a cluster chain + */ /*-----------------------------------------------------------------------*/ #if !_FS_READONLY static -FRESULT remove_chain ( - FATFS *fs, /* File system object */ - DWORD clst /* Cluster# to remove chain from */ -) +FRESULT remove_chain(FATFS * fs, /* File system object */ + DWORD clst /* Cluster# to remove chain from */ + ) { - FRESULT res; - DWORD nxt; + FRESULT res; + DWORD nxt; - if (clst < 2 || clst >= fs->max_clust) { /* Check cluster address range */ - res = FR_INT_ERR; + if (clst < 2 || clst >= fs->max_clust) { /* Check cluster address range */ + res = FR_INT_ERR; - } else { - res = FR_OK; - while (clst < fs->max_clust) { /* Not a last link? */ - nxt = get_cluster(fs, clst); /* Get cluster status */ - if (nxt == 0) break; /* Empty cluster? */ - if (nxt == 1) { res = FR_INT_ERR; break; } /* Internal error? */ - if (nxt == 0xFFFFFFFF) { res = FR_DISK_ERR; break; } /* Disk error? */ - res = put_cluster(fs, clst,(DWORD) 0); /* Mark the cluster "empty" */ - if (res != FR_OK) break; - if (fs->free_clust != 0xFFFFFFFF) { /* Update FSInfo */ - fs->free_clust++; - fs->fsi_flag = 1; - } - clst = nxt; /* Next cluster */ - } - } + } else { + res = FR_OK; + while (clst < fs->max_clust) { /* Not a last link? */ + nxt = get_cluster(fs, clst); /* Get cluster status */ + if (nxt == 0) + break; /* Empty cluster? */ + if (nxt == 1) { + res = FR_INT_ERR; + break; + } /* Internal error? */ + if (nxt == 0xFFFFFFFF) { + res = FR_DISK_ERR; + break; + } /* Disk error? */ + res = put_cluster(fs, clst, (DWORD) 0); /* Mark the cluster "empty" */ + if (res != FR_OK) + break; + if (fs->free_clust != 0xFFFFFFFF) { /* Update FSInfo */ + fs->free_clust++; + fs->fsi_flag = 1; + } + clst = nxt; /* Next cluster */ + } + } - return res; + return res; } #endif @@ -427,278 +475,311 @@ FRESULT remove_chain ( /*-----------------------------------------------------------------------*/ -/* Stretch or create a cluster chain */ +/* + * Stretch or create a cluster chain + */ /*-----------------------------------------------------------------------*/ #if !_FS_READONLY static -DWORD create_chain ( /* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk error, >=2:New cluster# */ - FATFS *fs, /* File system object */ - DWORD clst /* Cluster# to stretch. 0 means create a new chain. */ -) +DWORD create_chain( /* 0:No free cluster, 1:Internal error, 0xFFFFFFFF:Disk error, >=2:New cluster# */ + FATFS * fs, /* File system object */ + DWORD clst /* Cluster# to stretch. 0 means create a new chain. */ + ) { - DWORD cs, ncl, scl, mcl; + DWORD cs, ncl, scl, mcl; - mcl = fs->max_clust; - if (clst == 0) { /* Create new chain */ - scl = fs->last_clust; /* Get suggested start point */ - if (scl == 0 || scl >= mcl) scl = 1; - } - else { /* Stretch existing chain */ - cs = get_cluster(fs, clst); /* Check the cluster status */ - if (cs < 2) return 1; /* It is an invalid cluster */ - if (cs < mcl) return cs; /* It is already followed by next cluster */ - scl = clst; - } + mcl = fs->max_clust; + if (clst == 0) { /* Create new chain */ + scl = fs->last_clust; /* Get suggested start point */ + if (scl == 0 || scl >= mcl) + scl = 1; + } else { /* Stretch existing chain */ + cs = get_cluster(fs, clst); /* Check the cluster status */ + if (cs < 2) + return 1; /* It is an invalid cluster */ + if (cs < mcl) + return cs; /* It is already followed by next cluster */ + scl = clst; + } - ncl = scl; /* Start cluster */ - for (;;) { - ncl++; /* Next cluster */ - if (ncl >= mcl) { /* Wrap around */ - ncl = 2; - if (ncl > scl) return 0; /* No free custer */ - } - cs = get_cluster(fs, ncl); /* Get the cluster status */ - if (cs == 0) break; /* Found a free cluster */ - if (cs == 0xFFFFFFFF || cs == 1)/* An error occured */ - return cs; - if (ncl == scl) return 0; /* No free custer */ - } + ncl = scl; /* Start cluster */ + for (;;) { + ncl++; /* Next cluster */ + if (ncl >= mcl) { /* Wrap around */ + ncl = 2; + if (ncl > scl) + return 0; /* No free custer */ + } + cs = get_cluster(fs, ncl); /* Get the cluster status */ + if (cs == 0) + break; /* Found a free cluster */ + if (cs == 0xFFFFFFFF || cs == 1) /* An error occured */ + return cs; + if (ncl == scl) + return 0; /* No free custer */ + } - if (put_cluster(fs, ncl, 0x0FFFFFFF)) /* Mark the new cluster "in use" */ - return 0xFFFFFFFF; - if (clst != 0) { /* Link it to previous one if needed */ - if (put_cluster(fs, clst, ncl)) - return 0xFFFFFFFF; - } + if (put_cluster(fs, ncl, 0x0FFFFFFF)) /* Mark the new cluster "in use" */ + return 0xFFFFFFFF; + if (clst != 0) { /* Link it to previous one if needed */ + if (put_cluster(fs, clst, ncl)) + return 0xFFFFFFFF; + } - fs->last_clust = ncl; /* Update FSINFO */ - if (fs->free_clust != 0xFFFFFFFF) { - fs->free_clust--; - fs->fsi_flag = 1; - } + fs->last_clust = ncl; /* Update FSINFO */ + if (fs->free_clust != 0xFFFFFFFF) { + fs->free_clust--; + fs->fsi_flag = 1; + } - return ncl; /* Return new cluster number */ + return ncl; /* Return new cluster number */ } -#endif /* !_FS_READONLY */ +#endif /* !_FS_READONLY */ /*-----------------------------------------------------------------------*/ -/* Get sector# from cluster# */ +/* + * Get sector# from cluster# + */ /*-----------------------------------------------------------------------*/ static -DWORD clust2sect ( /* !=0: sector number, 0: failed - invalid cluster# */ - FATFS *fs, /* File system object */ - DWORD clst /* Cluster# to be converted */ -) +DWORD clust2sect( /* !=0: sector number, 0: failed - invalid cluster# */ + FATFS * fs, /* File system object */ + DWORD clst /* Cluster# to be converted */ + ) { - clst -= 2; - if (clst >= (fs->max_clust - 2)) return 0; /* Invalid cluster# */ - return clst * fs->csize + fs->database; + clst -= 2; + if (clst >= (fs->max_clust - 2)) + return 0; /* Invalid cluster# */ + return clst * fs->csize + fs->database; } /*-----------------------------------------------------------------------*/ -/* Seek directory index */ +/* + * Seek directory index + */ /*-----------------------------------------------------------------------*/ static -FRESULT dir_seek ( - DIR *dj, /* Pointer to directory object */ - WORD idx /* Directory index number */ -) +FRESULT dir_seek(DIR * dj, /* Pointer to directory object */ + WORD idx /* Directory index number */ + ) { - DWORD clst; - WORD ic; + DWORD clst; + WORD ic; - dj->index = idx; - clst = dj->sclust; - if (clst == 1 || clst >= dj->fs->max_clust) /* Check start cluster range */ - return FR_INT_ERR; + dj->index = idx; + clst = dj->sclust; + if (clst == 1 || clst >= dj->fs->max_clust) /* Check start cluster range */ + return FR_INT_ERR; - if (clst == 0) { /* Static table */ - if (idx >= dj->fs->n_rootdir) /* Index is out of range */ - return FR_INT_ERR; - dj->sect = dj->fs->dirbase + idx / (SS(dj->fs) / 32); - } - else { /* Dynamic table */ - ic = SS(dj->fs) / 32 * dj->fs->csize; /* Indexes per cluster */ - while (idx >= ic) { /* Follow cluster chain */ - clst = get_cluster(dj->fs, clst); /* Get next cluster */ - if (clst == 0xFFFFFFFF) return FR_DISK_ERR; /* Disk error */ - if (clst < 2 || clst >= dj->fs->max_clust) /* Reached to end of table or int error */ - return FR_INT_ERR; - idx -= ic; - } - dj->clust = clst; - dj->sect = clust2sect(dj->fs, clst) + idx / (SS(dj->fs) / 32); - } - dj->dir = dj->fs->win + (idx % (SS(dj->fs) / 32)) * 32; + if (clst == 0) { /* Static table */ + if (idx >= dj->fs->n_rootdir) /* Index is out of range */ + return FR_INT_ERR; + dj->sect = dj->fs->dirbase + idx / (SS(dj->fs) / 32); + } else { /* Dynamic table */ + ic = SS(dj->fs) / 32 * dj->fs->csize; /* Indexes per cluster */ + while (idx >= ic) { /* Follow cluster chain */ + clst = get_cluster(dj->fs, clst); /* Get next cluster */ + if (clst == 0xFFFFFFFF) + return FR_DISK_ERR; /* Disk error */ + if (clst < 2 || clst >= dj->fs->max_clust) /* Reached to end of table or int error */ + return FR_INT_ERR; + idx -= ic; + } + dj->clust = clst; + dj->sect = clust2sect(dj->fs, clst) + idx / (SS(dj->fs) / 32); + } + dj->dir = dj->fs->win + (idx % (SS(dj->fs) / 32)) * 32; - return FR_OK; /* Seek succeeded */ + return FR_OK; /* Seek succeeded */ } /*-----------------------------------------------------------------------*/ -/* Move directory index next */ +/* + * Move directory index next + */ /*-----------------------------------------------------------------------*/ static -FRESULT dir_next ( /* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT and could not streach */ - DIR *dj, /* Pointer to directory object */ - BOOL streach /* FALSE: Do not streach table, TRUE: Streach table if needed */ -) +FRESULT dir_next( /* FR_OK:Succeeded, FR_NO_FILE:End of table, FR_DENIED:EOT and could not streach */ + DIR * dj, /* Pointer to directory object */ + BOOL streach /* FALSE: Do not streach table, TRUE: Streach table if needed */ + ) { - DWORD clst; - WORD i; + DWORD clst; + WORD i; - i = dj->index + 1; - if (!i || !dj->sect) /* Report EOT when index has reached 65535 */ - return FR_NO_FILE; + i = dj->index + 1; + if (!i || !dj->sect) /* Report EOT when index has reached 65535 */ + return FR_NO_FILE; - if (!(i % (SS(dj->fs) / 32))) { /* Sector changed? */ - dj->sect++; /* Next sector */ + if (!(i % (SS(dj->fs) / 32))) { /* Sector changed? */ + dj->sect++; /* Next sector */ - if (dj->sclust == 0) { /* Static table */ - if (i >= dj->fs->n_rootdir) /* Report EOT when end of table */ - return FR_NO_FILE; - } - else { /* Dynamic table */ - if (((i / (SS(dj->fs) / 32)) & (dj->fs->csize - 1)) == 0) { /* Cluster changed? */ - clst = get_cluster(dj->fs, dj->clust); /* Get next cluster */ - if (clst <= 1) return FR_INT_ERR; - if (clst == 0xFFFFFFFF) return FR_DISK_ERR; - if (clst >= dj->fs->max_clust) { /* When it reached end of dinamic table */ + if (dj->sclust == 0) { /* Static table */ + if (i >= dj->fs->n_rootdir) /* Report EOT when end of table */ + return FR_NO_FILE; + } else { /* Dynamic table */ + if (((i / (SS(dj->fs) / 32)) & (dj->fs->csize - 1)) == 0) { /* Cluster changed? */ + clst = get_cluster(dj->fs, dj->clust); /* Get next cluster */ + if (clst <= 1) + return FR_INT_ERR; + if (clst == 0xFFFFFFFF) + return FR_DISK_ERR; + if (clst >= dj->fs->max_clust) { /* When it reached end of dinamic table */ #if !_FS_READONLY - BYTE c; - if (!streach) return FR_NO_FILE; /* When do not streach, report EOT */ - clst = create_chain(dj->fs, dj->clust); /* Streach cluster chain */ - if (clst == 0) return FR_DENIED; /* No free cluster */ - if (clst == 1) return FR_INT_ERR; - if (clst == 0xFFFFFFFF) return FR_DISK_ERR; - /* Clean-up streached table */ - if (move_window(dj->fs,(DWORD) 0)) return FR_DISK_ERR; /* Flush active window */ - mem_set(dj->fs->win, 0, SS(dj->fs)); /* Clear window buffer */ - dj->fs->winsect = clust2sect(dj->fs, clst); /* Cluster start sector */ - for (c = 0; c < dj->fs->csize; c++) { /* Fill the new cluster with 0 */ - dj->fs->wflag = 1; - if (move_window(dj->fs,(DWORD) 0)) return FR_DISK_ERR; - dj->fs->winsect++; - } - dj->fs->winsect -= c; /* Rewind window address */ + BYTE c; + if (!streach) + return FR_NO_FILE; /* When do not streach, report EOT */ + clst = create_chain(dj->fs, dj->clust); /* Streach cluster chain */ + if (clst == 0) + return FR_DENIED; /* No free cluster */ + if (clst == 1) + return FR_INT_ERR; + if (clst == 0xFFFFFFFF) + return FR_DISK_ERR; + /* + * Clean-up streached table + */ + if (move_window(dj->fs, (DWORD) 0)) + return FR_DISK_ERR; /* Flush active window */ + mem_set(dj->fs->win, 0, SS(dj->fs)); /* Clear window buffer */ + dj->fs->winsect = clust2sect(dj->fs, clst); /* Cluster start sector */ + for (c = 0; c < dj->fs->csize; c++) { /* Fill the new cluster with 0 */ + dj->fs->wflag = 1; + if (move_window(dj->fs, (DWORD) 0)) + return FR_DISK_ERR; + dj->fs->winsect++; + } + dj->fs->winsect -= c; /* Rewind window address */ #else - return FR_NO_FILE; /* Report EOT */ + return FR_NO_FILE; /* Report EOT */ #endif - } - dj->clust = clst; /* Initialize data for new cluster */ - dj->sect = clust2sect(dj->fs, clst); - } - } - } + } + dj->clust = clst; /* Initialize data for new cluster */ + dj->sect = clust2sect(dj->fs, clst); + } + } + } - dj->index = i; - dj->dir = dj->fs->win + (i % (SS(dj->fs) / 32)) * 32; + dj->index = i; + dj->dir = dj->fs->win + (i % (SS(dj->fs) / 32)) * 32; - return FR_OK; + return FR_OK; } /*-----------------------------------------------------------------------*/ -/* Test/Pick/Fit an LFN segment from/to directory entry */ +/* + * Test/Pick/Fit an LFN segment from/to directory entry + */ /*-----------------------------------------------------------------------*/ #if _USE_LFN static -const BYTE LfnOfs[] = {1,3,5,7,9,14,16,18,20,22,24,28,30}; /* Offset of LFN chars in the directory entry */ +const BYTE LfnOfs[] = { 1, 3, 5, 7, 9, 14, 16, 18, 20, 22, 24, 28, 30 }; /* Offset of LFN chars in the directory entry */ static -BOOL test_lfn ( /* TRUE:Matched, FALSE:Not matched */ - WCHAR *lfnbuf, /* Pointer to the LFN to be compared */ - BYTE *dir /* Pointer to the directory entry containing a part of LFN */ -) +BOOL test_lfn( /* TRUE:Matched, FALSE:Not matched */ + WCHAR * lfnbuf, /* Pointer to the LFN to be compared */ + BYTE * dir /* Pointer to the directory entry containing a part of LFN */ + ) { - int i, s; - WCHAR wc1, wc2; + int i, s; + WCHAR wc1, wc2; - i = ((dir[LDIR_Ord] & 0xBF) - 1) * 13; /* Offset in the LFN buffer */ - s = 0; - do { - if (i >= _MAX_LFN) return FALSE; /* Out of buffer range? */ - wc1 = LD_WORD(dir+LfnOfs[s]); /* Get both characters to compare */ - wc2 = lfnbuf[i++]; - if (IsLower(wc1)) wc1 -= 0x20; /* Compare it (ignore case) */ - if (IsLower(wc2)) wc2 -= 0x20; - if (wc1 != wc2) return FALSE; - } while (++s < 13 && wc1); /* Repeat until last char or a NUL char is processed */ + i = ((dir[LDIR_Ord] & 0xBF) - 1) * 13; /* Offset in the LFN buffer */ + s = 0; + do { + if (i >= _MAX_LFN) + return FALSE; /* Out of buffer range? */ + wc1 = LD_WORD(dir + LfnOfs[s]); /* Get both characters to compare */ + wc2 = lfnbuf[i++]; + if (IsLower(wc1)) + wc1 -= 0x20; /* Compare it (ignore case) */ + if (IsLower(wc2)) + wc2 -= 0x20; + if (wc1 != wc2) + return FALSE; + } while (++s < 13 && wc1); /* Repeat until last char or a NUL char is processed */ - return TRUE; /* The LFN entry matched */ + return TRUE; /* The LFN entry matched */ } static -BOOL pick_lfn ( /* TRUE:Succeeded, FALSE:Buffer overflow */ - WCHAR *lfnbuf, /* Pointer to the Unicode-LFN buffer */ - BYTE *dir /* Pointer to the directory entry */ -) +BOOL pick_lfn( /* TRUE:Succeeded, FALSE:Buffer overflow */ + WCHAR * lfnbuf, /* Pointer to the Unicode-LFN buffer */ + BYTE * dir /* Pointer to the directory entry */ + ) { - int i, s; - WCHAR wchr; + int i, s; + WCHAR wchr; - i = ((dir[LDIR_Ord] & 0xBF) - 1) * 13; /* Offset in the LFN buffer */ - s = 0; - do { - wchr = LD_WORD(dir+LfnOfs[s]); /* Get an LFN char */ - if (!wchr) break; /* End of LFN? */ - if (i >= _MAX_LFN) return FALSE; /* Buffer overflow */ - lfnbuf[i++] = wchr; /* Store it */ - } while (++s < 13); /* Repeat until last char is copied */ - if (dir[LDIR_Ord] & 0x40) lfnbuf[i] = 0; /* Put terminator if last LFN entry */ + i = ((dir[LDIR_Ord] & 0xBF) - 1) * 13; /* Offset in the LFN buffer */ + s = 0; + do { + wchr = LD_WORD(dir + LfnOfs[s]); /* Get an LFN char */ + if (!wchr) + break; /* End of LFN? */ + if (i >= _MAX_LFN) + return FALSE; /* Buffer overflow */ + lfnbuf[i++] = wchr; /* Store it */ + } while (++s < 13); /* Repeat until last char is copied */ + if (dir[LDIR_Ord] & 0x40) + lfnbuf[i] = 0; /* Put terminator if last LFN entry */ - return TRUE; + return TRUE; } #if !_FS_READONLY static -void fit_lfn ( - const WCHAR *lfnbuf, /* Pointer to the LFN buffer */ - BYTE *dir, /* Pointer to the directory entry */ - BYTE ord, /* LFN order (1-20) */ - BYTE sum /* SFN sum */ -) +void fit_lfn(const WCHAR * lfnbuf, /* Pointer to the LFN buffer */ + BYTE * dir, /* Pointer to the directory entry */ + BYTE ord, /* LFN order (1-20) */ + BYTE sum /* SFN sum */ + ) { - int i, s; - WCHAR wchr; + int i, s; + WCHAR wchr; - dir[LDIR_Chksum] = sum; /* Set check sum */ - dir[LDIR_Attr] = AM_LFN; /* Set attribute. LFN entry */ - dir[LDIR_Type] = 0; - ST_WORD(dir+LDIR_FstClusLO, 0); + dir[LDIR_Chksum] = sum; /* Set check sum */ + dir[LDIR_Attr] = AM_LFN; /* Set attribute. LFN entry */ + dir[LDIR_Type] = 0; + ST_WORD(dir + LDIR_FstClusLO, 0); - i = (ord - 1) * 13; /* Offset in the LFN buffer */ - s = wchr = 0; - do { - if (wchr != 0xFFFF) wchr = lfnbuf[i++]; /* Get an effective char */ - ST_WORD(dir+LfnOfs[s], wchr); /* Put it */ - if (!wchr) wchr = 0xFFFF; /* Padding chars following last char */ - } while (++s < 13); - if (wchr == 0xFFFF || !lfnbuf[i]) ord |= 0x40;/* Bottom LFN part is the start of LFN sequence */ - dir[LDIR_Ord] = ord; /* Set the LFN order */ + i = (ord - 1) * 13; /* Offset in the LFN buffer */ + s = wchr = 0; + do { + if (wchr != 0xFFFF) + wchr = lfnbuf[i++]; /* Get an effective char */ + ST_WORD(dir + LfnOfs[s], wchr); /* Put it */ + if (!wchr) + wchr = 0xFFFF; /* Padding chars following last char */ + } while (++s < 13); + if (wchr == 0xFFFF || !lfnbuf[i]) + ord |= 0x40; /* Bottom LFN part is the start of LFN sequence */ + dir[LDIR_Ord] = ord; /* Set the LFN order */ } #endif @@ -707,44 +788,52 @@ void fit_lfn ( /*-----------------------------------------------------------------------*/ -/* Create numbered name */ +/* + * Create numbered name + */ /*-----------------------------------------------------------------------*/ #if _USE_LFN -void gen_numname ( - BYTE *dst, /* Pointer to genartated SFN */ - const BYTE *src, /* Pointer to source SFN to be modified */ - const WCHAR *lfn, /* Pointer to LFN */ - WORD num /* Sequense number */ -) +void gen_numname(BYTE * dst, /* Pointer to genartated SFN */ + const BYTE * src, /* Pointer to source SFN to be modified */ + const WCHAR * lfn, /* Pointer to LFN */ + WORD num /* Sequense number */ + ) { - char ns[8]; - int i, j; + char ns[8]; + int i, j; - mem_cpy(dst, src, 11); + mem_cpy(dst, src, 11); - if (num > 5) { /* On many collisions, generate a hash number instead of sequencial number */ - do num = (num >> 1) + (num << 15) + (WORD)*lfn++; while (*lfn); - } + if (num > 5) { /* On many collisions, generate a hash number instead of sequencial number */ + do + num = (num >> 1) + (num << 15) + (WORD) * lfn++; + while (*lfn); + } - /* itoa */ - i = 7; - do { - ns[i--] = (num % 10) + '0'; - num /= 10; - } while (num); - ns[i] = '~'; + /* + * itoa + */ + i = 7; + do { + ns[i--] = (num % 10) + '0'; + num /= 10; + } while (num); + ns[i] = '~'; - /* Append the number */ - for (j = 0; j < i && dst[j] != ' '; j++) { - if (IsDBCS1(dst[j])) { - if (j == i - 1) break; - j++; - } - } - do { - dst[j++] = (i < 8) ? ns[i++] : ' '; - } while (j < 8); + /* + * Append the number + */ + for (j = 0; j < i && dst[j] != ' '; j++) { + if (IsDBCS1(dst[j])) { + if (j == i - 1) + break; + j++; + } + } + do { + dst[j++] = (i < 8) ? ns[i++] : ' '; + } while (j < 8); } #endif @@ -752,19 +841,22 @@ void gen_numname ( /*-----------------------------------------------------------------------*/ -/* Calculate sum of an SFN */ +/* + * Calculate sum of an SFN + */ /*-----------------------------------------------------------------------*/ #if _USE_LFN static -BYTE sum_sfn ( - const BYTE *dir /* Ptr to directory entry */ -) +BYTE sum_sfn(const BYTE * dir /* Ptr to directory entry */ + ) { - BYTE sum = 0; - int n = 11; + BYTE sum = 0; + int n = 11; - do sum = (sum >> 1) + (sum << 7) + *dir++; while (--n); - return sum; + do + sum = (sum >> 1) + (sum << 7) + *dir++; + while (--n); + return sum; } #endif @@ -772,721 +864,862 @@ BYTE sum_sfn ( /*-----------------------------------------------------------------------*/ -/* Find an object in the directory */ +/* + * Find an object in the directory + */ /*-----------------------------------------------------------------------*/ static -FRESULT dir_find ( - DIR *dj /* Pointer to the directory object linked to the file name */ -) +FRESULT dir_find(DIR * dj /* Pointer to the directory object linked to the file name */ + ) { - FRESULT res; - BYTE a, c, lfen, ord, sum, *dir; + FRESULT res; + BYTE a, c, lfen, ord, sum, *dir; - res = dir_seek(dj, 0); /* Rewind directory object */ - if (res != FR_OK) return res; + res = dir_seek(dj, 0); /* Rewind directory object */ + if (res != FR_OK) + return res; - ord = sum = 0xFF; lfen = *(dj->fn+11) & 1; - do { - res = move_window(dj->fs, dj->sect); - if (res != FR_OK) break; - dir = dj->dir; /* Ptr to the directory entry of current index */ - c = dir[DIR_Name]; - if (c == 0) { res = FR_NO_FILE; break; } /* Reached to end of table */ - a = dir[DIR_Attr] & AM_MASK; -#if _USE_LFN /* LFN configuration */ - if (c == 0xE5 || c == '.' || ((a & AM_VOL) && a != AM_LFN)) { /* An entry without valid data */ - ord = 0xFF; - } else { - if (a == AM_LFN) { /* An LFN entry is found */ - if (dj->lfn) { - if (c & 0x40) { /* Is it start of LFN sequence? */ - sum = dir[LDIR_Chksum]; - c &= 0xBF; ord = c; /* LFN start order */ - dj->lfn_idx = dj->index; - } - /* Check LFN validity. Compare LFN if it is out of 8.3 format */ - ord = (c == ord && sum == dir[LDIR_Chksum] && (!lfen || test_lfn(dj->lfn, dir))) ? ord - 1 : 0xFF; - } - } else { /* An SFN entry is found */ - if (ord || sum != sum_sfn(dir)) { /* Did not LFN match? */ - dj->lfn_idx = 0xFFFF; - ord = 0xFF; - } - if (lfen) { /* Match LFN if it is out of 8.3 format */ - if (ord == 0) break; - } else { /* Match SFN if LFN is in 8.3 format */ - if (!mem_cmp(dir, dj->fn, 11)) break; - } - } - } -#else /* Non LFN configuration */ - if (c != 0xE5 && c != '.' && !(a & AM_VOL) && !mem_cmp(dir, dj->fn, 11)) /* Is it a valid entry? */ - break; + ord = sum = 0xFF; + lfen = *(dj->fn + 11) & 1; + do { + res = move_window(dj->fs, dj->sect); + if (res != FR_OK) + break; + dir = dj->dir; /* Ptr to the directory entry of current index */ + c = dir[DIR_Name]; + if (c == 0) { + res = FR_NO_FILE; + break; + } /* Reached to end of table */ + a = dir[DIR_Attr] & AM_MASK; +#if _USE_LFN /* LFN configuration */ + if (c == 0xE5 || c == '.' || ((a & AM_VOL) && a != AM_LFN)) { /* An entry without valid data */ + ord = 0xFF; + } else { + if (a == AM_LFN) { /* An LFN entry is found */ + if (dj->lfn) { + if (c & 0x40) { /* Is it start of LFN sequence? */ + sum = dir[LDIR_Chksum]; + c &= 0xBF; + ord = c; /* LFN start order */ + dj->lfn_idx = dj->index; + } + /* + * Check LFN validity. Compare LFN if it is out of 8.3 format + */ + ord = (c == ord && sum == dir[LDIR_Chksum] + && (!lfen + || test_lfn(dj->lfn, dir))) ? ord - 1 : 0xFF; + } + } else { /* An SFN entry is found */ + if (ord || sum != sum_sfn(dir)) { /* Did not LFN match? */ + dj->lfn_idx = 0xFFFF; + ord = 0xFF; + } + if (lfen) { /* Match LFN if it is out of 8.3 format */ + if (ord == 0) + break; + } else { /* Match SFN if LFN is in 8.3 format */ + if (!mem_cmp(dir, dj->fn, 11)) + break; + } + } + } +#else /* Non LFN configuration */ + if (c != 0xE5 && c != '.' && !(a & AM_VOL) && !mem_cmp(dir, dj->fn, 11)) /* Is it a valid entry? */ + break; #endif - res = dir_next(dj, FALSE); /* Next entry */ - } while (res == FR_OK); + res = dir_next(dj, FALSE); /* Next entry */ + } while (res == FR_OK); - return res; + return res; } /*-----------------------------------------------------------------------*/ -/* Read an object from the directory */ +/* + * Read an object from the directory + */ /*-----------------------------------------------------------------------*/ #if _FS_MINIMIZE <= 2 static -FRESULT dir_read ( - DIR *dj /* Pointer to the directory object to store read object name */ -) +FRESULT dir_read(DIR * dj /* Pointer to the directory object to store read object name */ + ) { - FRESULT res; - BYTE a, c, ord, sum, *dir; + FRESULT res; + BYTE a, c, ord, sum, *dir; - ord = sum = 0xFF; - res = FR_NO_FILE; - while (dj->sect) { - res = move_window(dj->fs, dj->sect); - if (res != FR_OK) break; - dir = dj->dir; /* Ptr to the directory entry of current index */ - c = dir[DIR_Name]; - if (c == 0) { res = FR_NO_FILE; break; } /* Reached to end of table */ - a = dir[DIR_Attr] & AM_MASK; -#if _USE_LFN /* LFN configuration */ - if (c == 0xE5 || c == '.' || ((a & AM_VOL) && a != AM_LFN)) { /* An entry without valid data */ - ord = 0xFF; - } else { - if (a == AM_LFN) { /* An LFN entry is found */ - if (c & 0x40) { /* Is it start of LFN sequence? */ - sum = dir[LDIR_Chksum]; - c &= 0xBF; ord = c; - dj->lfn_idx = dj->index; - } - /* Check LFN validity and capture it */ - ord = (c == ord && sum == dir[LDIR_Chksum] && pick_lfn(dj->lfn, dir)) ? ord - 1 : 0xFF; - } else { /* An SFN entry is found */ - if (ord || sum != sum_sfn(dir)) /* Is there a valid LFN entry? */ - dj->lfn_idx = 0xFFFF; /* No LFN. */ - break; - } - } -#else /* Non LFN configuration */ - if (c != 0xE5 && c != '.' && !(a & AM_VOL)) /* Is it a valid entry? */ - break; + ord = sum = 0xFF; + res = FR_NO_FILE; + while (dj->sect) { + res = move_window(dj->fs, dj->sect); + if (res != FR_OK) + break; + dir = dj->dir; /* Ptr to the directory entry of current index */ + c = dir[DIR_Name]; + if (c == 0) { + res = FR_NO_FILE; + break; + } /* Reached to end of table */ + a = dir[DIR_Attr] & AM_MASK; +#if _USE_LFN /* LFN configuration */ + if (c == 0xE5 || c == '.' || ((a & AM_VOL) && a != AM_LFN)) { /* An entry without valid data */ + ord = 0xFF; + } else { + if (a == AM_LFN) { /* An LFN entry is found */ + if (c & 0x40) { /* Is it start of LFN sequence? */ + sum = dir[LDIR_Chksum]; + c &= 0xBF; + ord = c; + dj->lfn_idx = dj->index; + } + /* + * Check LFN validity and capture it + */ + ord = (c == ord && sum == dir[LDIR_Chksum] + && pick_lfn(dj->lfn, dir)) ? ord - 1 : 0xFF; + } else { /* An SFN entry is found */ + if (ord || sum != sum_sfn(dir)) /* Is there a valid LFN entry? */ + dj->lfn_idx = 0xFFFF; /* No LFN. */ + break; + } + } +#else /* Non LFN configuration */ + if (c != 0xE5 && c != '.' && !(a & AM_VOL)) /* Is it a valid entry? */ + break; #endif - res = dir_next(dj, FALSE); /* Next entry */ - if (res != FR_OK) break; - } + res = dir_next(dj, FALSE); /* Next entry */ + if (res != FR_OK) + break; + } - if (res != FR_OK) dj->sect = 0; + if (res != FR_OK) + dj->sect = 0; - return res; + return res; } #endif /*-----------------------------------------------------------------------*/ -/* Register an object to the directory */ +/* + * Register an object to the directory + */ /*-----------------------------------------------------------------------*/ #if !_FS_READONLY static -FRESULT dir_register ( /* FR_OK:Successful, FR_DENIED:No free entry or too many SFN collision, FR_DISK_ERR:Disk error */ - DIR *dj /* Target directory with object name to be created */ -) +FRESULT dir_register( /* FR_OK:Successful, FR_DENIED:No free entry or too many SFN collision, FR_DISK_ERR:Disk error */ + DIR * dj /* Target directory with object name to be created */ + ) { - FRESULT res; - BYTE c, *dir; + FRESULT res; + BYTE c, *dir; -#if _USE_LFN /* LFN configuration */ - WORD n, ne, is; - BYTE sn[12], *fn, sum; - WCHAR *lfn; +#if _USE_LFN /* LFN configuration */ + WORD n, ne, is; + BYTE sn[12], *fn, sum; + WCHAR *lfn; - fn = dj->fn; lfn = dj->lfn; - mem_cpy(sn, fn, 12); - if (sn[11] & 1) { /* When LFN is out of 8.3 format, generate a numbered name */ - fn[11] = 0; dj->lfn = NULL; /* Find only SFN */ - for (n = 1; n < 100; n++) { - gen_numname(fn, sn, lfn, n); /* Generate a numbered name */ - res = dir_find(dj); /* Check if the name collides with existing SFN */ - if (res != FR_OK) break; - } - if (n == 100) return FR_DENIED; /* Abort if too many collisions */ - if (res != FR_NO_FILE) return res; /* Abort if the result is other than 'not collided' */ - fn[11] = sn[11]; dj->lfn = lfn; - } - if (sn[11] & 2) { /* When eliminate LFN, reserve only an SFN entry. */ - ne = 1; - } else { /* Otherwise reserve an SFN + LFN entries. */ - for (ne = 0; lfn[ne]; ne++) ; - ne = (ne + 25) / 13; - } + fn = dj->fn; + lfn = dj->lfn; + mem_cpy(sn, fn, 12); + if (sn[11] & 1) { /* When LFN is out of 8.3 format, generate a numbered name */ + fn[11] = 0; + dj->lfn = NULL; /* Find only SFN */ + for (n = 1; n < 100; n++) { + gen_numname(fn, sn, lfn, n); /* Generate a numbered name */ + res = dir_find(dj); /* Check if the name collides with existing SFN */ + if (res != FR_OK) + break; + } + if (n == 100) + return FR_DENIED; /* Abort if too many collisions */ + if (res != FR_NO_FILE) + return res; /* Abort if the result is other than 'not collided' */ + fn[11] = sn[11]; + dj->lfn = lfn; + } + if (sn[11] & 2) { /* When eliminate LFN, reserve only an SFN entry. */ + ne = 1; + } else { /* Otherwise reserve an SFN + LFN entries. */ + for (ne = 0; lfn[ne]; ne++); + ne = (ne + 25) / 13; + } - /* Reserve contiguous entries */ - res = dir_seek(dj, 0); - if (res != FR_OK) return res; - n = is = 0; - do { - res = move_window(dj->fs, dj->sect); - if (res != FR_OK) break; - c = *dj->dir; /* Check the entry status */ - if (c == 0xE5 || c == 0) { /* Is it a blank entry? */ - if (n == 0) is = dj->index; /* First index of the contigulus entry */ - if (++n == ne) break; /* A contiguous entry that requiered count is found */ - } else { - n = 0; /* Not a blank entry. Restart to search */ - } - res = dir_next(dj, TRUE); /* Next entry with table streach */ - } while (res == FR_OK); + /* + * Reserve contiguous entries + */ + res = dir_seek(dj, 0); + if (res != FR_OK) + return res; + n = is = 0; + do { + res = move_window(dj->fs, dj->sect); + if (res != FR_OK) + break; + c = *dj->dir; /* Check the entry status */ + if (c == 0xE5 || c == 0) { /* Is it a blank entry? */ + if (n == 0) + is = dj->index; /* First index of the contigulus entry */ + if (++n == ne) + break; /* A contiguous entry that requiered count is found */ + } else { + n = 0; /* Not a blank entry. Restart to search */ + } + res = dir_next(dj, TRUE); /* Next entry with table streach */ + } while (res == FR_OK); - if (res == FR_OK && ne > 1) { /* Initialize LFN entry if needed */ - res = dir_seek(dj, is); - if (res == FR_OK) { - sum = sum_sfn(dj->fn); /* Sum of the SFN tied to the LFN */ - ne--; - do { /* Store LFN entries in bottom first */ - res = move_window(dj->fs, dj->sect); - if (res != FR_OK) break; - fit_lfn(dj->lfn, dj->dir, (BYTE)ne, sum); - dj->fs->wflag = 1; - res = dir_next(dj, FALSE); /* Next entry */ - } while (res == FR_OK && --ne); - } - } - -#else /* Non LFN configuration */ - res = dir_seek(dj, 0); - if (res == FR_OK) { - do { /* Find a blank entry for the SFN */ - res = move_window(dj->fs, dj->sect); - if (res != FR_OK) break; - c = *dj->dir; - if (c == 0xE5 || c == 0) break; /* Is it a blank entry? */ - res = dir_next(dj, TRUE); /* Next entry with table streach */ - } while (res == FR_OK); - } + if (res == FR_OK && ne > 1) { /* Initialize LFN entry if needed */ + res = dir_seek(dj, is); + if (res == FR_OK) { + sum = sum_sfn(dj->fn); /* Sum of the SFN tied to the LFN */ + ne--; + do { /* Store LFN entries in bottom first */ + res = move_window(dj->fs, dj->sect); + if (res != FR_OK) + break; + fit_lfn(dj->lfn, dj->dir, (BYTE) ne, sum); + dj->fs->wflag = 1; + res = dir_next(dj, FALSE); /* Next entry */ + } while (res == FR_OK && --ne); + } + } +#else /* Non LFN configuration */ + res = dir_seek(dj, 0); + if (res == FR_OK) { + do { /* Find a blank entry for the SFN */ + res = move_window(dj->fs, dj->sect); + if (res != FR_OK) + break; + c = *dj->dir; + if (c == 0xE5 || c == 0) + break; /* Is it a blank entry? */ + res = dir_next(dj, TRUE); /* Next entry with table streach */ + } while (res == FR_OK); + } #endif - if (res == FR_OK) { /* Initialize the SFN entry */ - res = move_window(dj->fs, dj->sect); - if (res == FR_OK) { - dir = dj->dir; - mem_set(dir, 0, 32); /* Clean the entry */ - mem_cpy(dir, dj->fn, 11); /* Put SFN */ - dir[DIR_NTres] = *(dj->fn+11) & 0x18; /* Put NT flag */ - dj->fs->wflag = 1; - } - } + if (res == FR_OK) { /* Initialize the SFN entry */ + res = move_window(dj->fs, dj->sect); + if (res == FR_OK) { + dir = dj->dir; + mem_set(dir, 0, 32); /* Clean the entry */ + mem_cpy(dir, dj->fn, 11); /* Put SFN */ + dir[DIR_NTres] = *(dj->fn + 11) & 0x18; /* Put NT flag */ + dj->fs->wflag = 1; + } + } - return res; + return res; } -#endif /* !_FS_READONLY */ +#endif /* !_FS_READONLY */ /*-----------------------------------------------------------------------*/ -/* Remove an object from the directory */ +/* + * Remove an object from the directory + */ /*-----------------------------------------------------------------------*/ #if !_FS_READONLY && !_FS_MINIMIZE static -FRESULT dir_remove ( /* FR_OK: Successful, FR_DISK_ERR: A disk error */ - DIR *dj /* Directory object pointing the entry to be removed */ -) +FRESULT dir_remove( /* FR_OK: Successful, FR_DISK_ERR: A disk error */ + DIR * dj /* Directory object pointing the entry to be removed */ + ) { - FRESULT res; + FRESULT res; -#if _USE_LFN /* LFN configuration */ - WORD i; +#if _USE_LFN /* LFN configuration */ + WORD i; - i = dj->index; /* SFN index */ - res = dir_seek(dj, (WORD)((dj->lfn_idx == 0xFFFF) ? i : dj->lfn_idx)); /* Goto the SFN or top of the LFN entries */ - if (res == FR_OK) { - do { - res = move_window(dj->fs, dj->sect); - if (res != FR_OK) break; - *dj->dir = 0xE5; /* Mark the entry "deleted" */ - dj->fs->wflag = 1; - if (dj->index >= i) break; /* When SFN is deleted, all entries of the object is deleted. */ - res = dir_next(dj, FALSE); /* Next entry */ - } while (res == FR_OK); - if (res == FR_NO_FILE) res = FR_INT_ERR; - } - -#else /* Non LFN configuration */ - res = dir_seek(dj, dj->index); - if (res == FR_OK) { - res = move_window(dj->fs, dj->sect); - if (res == FR_OK) { - *dj->dir = 0xE5; /* Mark the entry "deleted" */ - dj->fs->wflag = 1; - } - } + i = dj->index; /* SFN index */ + res = dir_seek(dj, (WORD) ((dj->lfn_idx == 0xFFFF) ? i : dj->lfn_idx)); /* Goto the SFN or top of the LFN entries */ + if (res == FR_OK) { + do { + res = move_window(dj->fs, dj->sect); + if (res != FR_OK) + break; + *dj->dir = 0xE5; /* Mark the entry "deleted" */ + dj->fs->wflag = 1; + if (dj->index >= i) + break; /* When SFN is deleted, all entries of the object is deleted. */ + res = dir_next(dj, FALSE); /* Next entry */ + } while (res == FR_OK); + if (res == FR_NO_FILE) + res = FR_INT_ERR; + } +#else /* Non LFN configuration */ + res = dir_seek(dj, dj->index); + if (res == FR_OK) { + res = move_window(dj->fs, dj->sect); + if (res == FR_OK) { + *dj->dir = 0xE5; /* Mark the entry "deleted" */ + dj->fs->wflag = 1; + } + } #endif - return res; + return res; } -#endif /* !_FS_READONLY */ +#endif /* !_FS_READONLY */ /*-----------------------------------------------------------------------*/ -/* Pick a segment and create the object name in directory form */ +/* + * Pick a segment and create the object name in directory form + */ /*-----------------------------------------------------------------------*/ static -FRESULT create_name ( - DIR *dj, /* Pointer to the directory object */ - const char **path /* Pointer to pointer to the segment in the path string */ -) +FRESULT create_name(DIR * dj, /* Pointer to the directory object */ + const char **path /* Pointer to pointer to the segment in the path string */ + ) { #if _USE_LFN - BYTE c, b, cf, *sfn; - WCHAR w, *lfn; - int i, ni, si, di; - const char *p; + BYTE c, b, cf, *sfn; + WCHAR w, *lfn; + int i, ni, si, di; + const char *p; - /* Create LFN in Unicode */ - si = di = 0; - p = *path; - lfn = dj->lfn; - for (;;) { - w = (BYTE)p[si++]; /* Get a character */ - if (w < ' ' || w == '/' || w == '\\') break; /* Break on end of segment */ - if (IsDBCS1(w)) { /* If it is DBC 1st byte */ - c = p[si++]; /* Get 2nd byte */ - if (!IsDBCS2(c)) /* Reject invalid DBC */ - return FR_INVALID_NAME; - w = (w << 8) + c; - } else { - if (chk_chr("\"*:<>\?|\x7F", w)) /* Reject unallowable chars for LFN */ - return FR_INVALID_NAME; - } - w = ff_convert(w, 1); /* Convert OEM to Unicode, store it */ - if (!w || di >= _MAX_LFN) /* Reject invalid code or too long name */ - return FR_INVALID_NAME; - lfn[di++] = w; - } - *path = &p[si]; /* Rerurn pointer to the next segment */ - cf = (w < ' ') ? 4 : 0; /* Set last segment flag if end of path */ + /* + * Create LFN in Unicode + */ + si = di = 0; + p = *path; + lfn = dj->lfn; + for (;;) { + w = (BYTE) p[si++]; /* Get a character */ + if (w < ' ' || w == '/' || w == '\\') + break; /* Break on end of segment */ + if (IsDBCS1(w)) { /* If it is DBC 1st byte */ + c = p[si++]; /* Get 2nd byte */ + if (!IsDBCS2(c)) /* Reject invalid DBC */ + return FR_INVALID_NAME; + w = (w << 8) + c; + } else { + if (chk_chr("\"*:<>\?|\x7F", w)) /* Reject unallowable chars for LFN */ + return FR_INVALID_NAME; + } + w = ff_convert(w, 1); /* Convert OEM to Unicode, store it */ + if (!w || di >= _MAX_LFN) /* Reject invalid code or too long name */ + return FR_INVALID_NAME; + lfn[di++] = w; + } + *path = &p[si]; /* Rerurn pointer to the next segment */ + cf = (w < ' ') ? 4 : 0; /* Set last segment flag if end of path */ - while (di) { /* Strip trailing spaces and dots */ - w = lfn[di - 1]; - if (w != ' ' && w != '.') break; - di--; - } - if (!di) return FR_INVALID_NAME; /* Reject null string */ + while (di) { /* Strip trailing spaces and dots */ + w = lfn[di - 1]; + if (w != ' ' && w != '.') + break; + di--; + } + if (!di) + return FR_INVALID_NAME; /* Reject null string */ - lfn[di] = 0; /* LFN is created */ + lfn[di] = 0; /* LFN is created */ - /* Create SFN in directory form */ - sfn = dj->fn; - mem_set(sfn, ' ', 11); - for (si = 0; lfn[si] == ' ' || lfn[si] == '.'; si++) ; /* Strip leading spaces and dots */ - if (si) cf |= 1; - while (di && lfn[di - 1] != '.') di--; /* Find extension (di<=si: no extension) */ + /* + * Create SFN in directory form + */ + sfn = dj->fn; + mem_set(sfn, ' ', 11); + for (si = 0; lfn[si] == ' ' || lfn[si] == '.'; si++); /* Strip leading spaces and dots */ + if (si) + cf |= 1; + while (di && lfn[di - 1] != '.') + di--; /* Find extension (di<=si: no extension) */ - b = i = 0; ni = 8; - for (;;) { - w = lfn[si++]; /* Get an LFN char */ - if (w == 0) break; /* Break when enf of the LFN */ - if (w == ' ' || (w == '.' && si != di)) { /* Remove spaces and dots */ - cf |= 1; continue; - } - if (i >= ni || si == di) { /* Here is extension or end of SFN */ - if (ni == 11) { /* Extension is longer than 3 bytes */ - cf |= 1; break; - } - if (si != di) cf |= 1; /* File name is longer than 8 bytes */ - if (si > di) break; /* No extension */ - si = di; i = 8; ni = 11; /* Enter extension section */ - b <<= 2; continue; - } - w = ff_convert(w, 0); /* Unicode -> OEM code */ - if (w >= 0x80) cf |= 0x20; /* If there is any extended char, force create an LFN */ - if (w >= 0x100) { /* Double byte char */ - if (i >= ni - 1) { - cf |= 1; i = ni; continue; - } - sfn[i++] = (BYTE)(w >> 8); - } else { /* Single byte char */ - if (chk_chr("+,;[=]", w)) { /* Replace unallowable chars for SFN */ - w = '_'; cf |= 1; - } else { - if (IsUpper(w)) { /* Large capital */ - b |= 2; - } else { - if (IsLower(w)) { /* Small capital */ - b |= 1; w -= 0x20; - } - } - } - } - sfn[i++] = (BYTE)w; - } - if (sfn[0] == 0xE5) sfn[0] = 0x05; /* When first char collides with 0xE5, replace it with 0x05 */ + b = i = 0; + ni = 8; + for (;;) { + w = lfn[si++]; /* Get an LFN char */ + if (w == 0) + break; /* Break when enf of the LFN */ + if (w == ' ' || (w == '.' && si != di)) { /* Remove spaces and dots */ + cf |= 1; + continue; + } + if (i >= ni || si == di) { /* Here is extension or end of SFN */ + if (ni == 11) { /* Extension is longer than 3 bytes */ + cf |= 1; + break; + } + if (si != di) + cf |= 1; /* File name is longer than 8 bytes */ + if (si > di) + break; /* No extension */ + si = di; + i = 8; + ni = 11; /* Enter extension section */ + b <<= 2; + continue; + } + w = ff_convert(w, 0); /* Unicode -> OEM code */ + if (w >= 0x80) + cf |= 0x20; /* If there is any extended char, force create an LFN */ + if (w >= 0x100) { /* Double byte char */ + if (i >= ni - 1) { + cf |= 1; + i = ni; + continue; + } + sfn[i++] = (BYTE) (w >> 8); + } else { /* Single byte char */ + if (chk_chr("+,;[=]", w)) { /* Replace unallowable chars for SFN */ + w = '_'; + cf |= 1; + } else { + if (IsUpper(w)) { /* Large capital */ + b |= 2; + } else { + if (IsLower(w)) { /* Small capital */ + b |= 1; + w -= 0x20; + } + } + } + } + sfn[i++] = (BYTE) w; + } + if (sfn[0] == 0xE5) + sfn[0] = 0x05; /* When first char collides with 0xE5, replace it with 0x05 */ - if (ni == 8) b <<= 2; - if ((cf & 0x21) == 0) { /* When LFN is in 8.3 format without extended char, NT flags are created */ - if ((b & 0x03) == 0x01) cf |= 0x10; /* NT flag (Extension has only small capital) */ - if ((b & 0x0C) == 0x04) cf |= 0x08; /* NT flag (Filename has only small capital) */ - if ((b & 0x0C) != 0x0C && (b & 0x03) != 0x03) cf |= 2; /* Eliminate LFN when non composite capitals */ - } + if (ni == 8) + b <<= 2; + if ((cf & 0x21) == 0) { /* When LFN is in 8.3 format without extended char, NT flags are created */ + if ((b & 0x03) == 0x01) + cf |= 0x10; /* NT flag (Extension has only small capital) */ + if ((b & 0x0C) == 0x04) + cf |= 0x08; /* NT flag (Filename has only small capital) */ + if ((b & 0x0C) != 0x0C && (b & 0x03) != 0x03) + cf |= 2; /* Eliminate LFN when non composite capitals */ + } - sfn[11] = cf; /* SFN is created */ + sfn[11] = cf; /* SFN is created */ #else - BYTE c, d, b, *sfn; - int ni, si, i; - const char *p; + BYTE c, d, b, *sfn; + int ni, si, i; + const char *p; - /* Create file name in directory form */ - sfn = dj->fn; - mem_set(sfn, ' ', 11); - si = i = b = 0; ni = 8; - p = *path; - for (;;) { - c = p[si++]; - if (c < ' ' || c == '/' || c == '\\') break; /* Break on end of segment */ - if (c == '.' || i >= ni) { - if (ni != 8 || c != '.') return FR_INVALID_NAME; - i = 8; ni = 11; - b <<= 2; continue; - } - if (c >= 0x80) b |= 3; /* If there is any extended char, eliminate NT flag */ - if (IsDBCS1(c)) { /* If it is DBC 1st byte */ - d = p[si++]; /* Get 2nd byte */ - if (!IsDBCS2(d) || i >= ni - 1) /* Reject invalid DBC */ - return FR_INVALID_NAME; - sfn[i++] = c; - sfn[i++] = d; - } else { - if (chk_chr(" +,;[=]\"*:<>\?|\x7F", c)) /* Reject unallowable chrs for SFN */ - return FR_INVALID_NAME; - if (IsUpper(c)) { - b |= 2; - } else { - if (IsLower(c)) { - b |= 1; c -= 0x20; - } - } - sfn[i++] = c; - } - } - *path = &p[si]; /* Rerurn pointer to the next segment */ - c = (c < ' ') ? 4 : 0; /* Set last segment flag if end of path */ + /* + * Create file name in directory form + */ + sfn = dj->fn; + mem_set(sfn, ' ', 11); + si = i = b = 0; + ni = 8; + p = *path; + for (;;) { + c = p[si++]; + if (c < ' ' || c == '/' || c == '\\') + break; /* Break on end of segment */ + if (c == '.' || i >= ni) { + if (ni != 8 || c != '.') + return FR_INVALID_NAME; + i = 8; + ni = 11; + b <<= 2; + continue; + } + if (c >= 0x80) + b |= 3; /* If there is any extended char, eliminate NT flag */ + if (IsDBCS1(c)) { /* If it is DBC 1st byte */ + d = p[si++]; /* Get 2nd byte */ + if (!IsDBCS2(d) || i >= ni - 1) /* Reject invalid DBC */ + return FR_INVALID_NAME; + sfn[i++] = c; + sfn[i++] = d; + } else { + if (chk_chr(" +,;[=]\"*:<>\?|\x7F", c)) /* Reject unallowable chrs for SFN */ + return FR_INVALID_NAME; + if (IsUpper(c)) { + b |= 2; + } else { + if (IsLower(c)) { + b |= 1; + c -= 0x20; + } + } + sfn[i++] = c; + } + } + *path = &p[si]; /* Rerurn pointer to the next segment */ + c = (c < ' ') ? 4 : 0; /* Set last segment flag if end of path */ - if (!i) return FR_INVALID_NAME; /* Reject null string */ - if (sfn[0] == 0xE5) sfn[0] = 0x05; /* When first char collides with 0xE5, replace it with 0x05 */ + if (!i) + return FR_INVALID_NAME; /* Reject null string */ + if (sfn[0] == 0xE5) + sfn[0] = 0x05; /* When first char collides with 0xE5, replace it with 0x05 */ - if (ni == 8) b <<= 2; - if ((b & 0x03) == 0x01) c |= 0x10; /* NT flag (Extension has only small capital) */ - if ((b & 0x0C) == 0x04) c |= 0x08; /* NT flag (Filename has only small capital) */ + if (ni == 8) + b <<= 2; + if ((b & 0x03) == 0x01) + c |= 0x10; /* NT flag (Extension has only small capital) */ + if ((b & 0x0C) == 0x04) + c |= 0x08; /* NT flag (Filename has only small capital) */ - sfn[11] = c; /* Store NT flag, File name is created */ + sfn[11] = c; /* Store NT flag, File name is created */ #endif - return FR_OK; + return FR_OK; } /*-----------------------------------------------------------------------*/ -/* Get file information from directory entry */ +/* + * Get file information from directory entry + */ /*-----------------------------------------------------------------------*/ #if _FS_MINIMIZE <= 1 static -void get_fileinfo ( /* No return code */ - DIR *dj, /* Pointer to the directory object */ - FILINFO *fno /* Pointer to store the file information */ -) +void get_fileinfo( /* No return code */ + DIR * dj, /* Pointer to the directory object */ + FILINFO * fno /* Pointer to store the file information */ + ) { - int i; - BYTE c, nt, *dir; - char *p; + int i; + BYTE c, nt, *dir; + char *p; - p = fno->fname; - if (dj->sect) { - dir = dj->dir; - nt = dir[DIR_NTres]; /* NT flag */ - for (i = 0; i < 8; i++) { /* Copy file name body */ - c = dir[i]; - if (c == ' ') break; - if (c == 0x05) c = 0xE5; - if ((nt & 0x08) && IsUpper(c)) c += 0x20; - *p++ = c; - } - if (dir[8] != ' ') { /* Copy file name extension */ - *p++ = '.'; - for (i = 8; i < 11; i++) { - c = dir[i]; - if (c == ' ') break; - if ((nt & 0x10) && IsUpper(c)) c += 0x20; - *p++ = c; - } - } - fno->fattrib = dir[DIR_Attr]; /* Attribute */ - fno->fsize = LD_DWORD(dir+DIR_FileSize); /* Size */ - fno->fdate = LD_WORD(dir+DIR_WrtDate); /* Date */ - fno->ftime = LD_WORD(dir+DIR_WrtTime); /* Time */ - } - *p = 0; + p = fno->fname; + if (dj->sect) { + dir = dj->dir; + nt = dir[DIR_NTres]; /* NT flag */ + for (i = 0; i < 8; i++) { /* Copy file name body */ + c = dir[i]; + if (c == ' ') + break; + if (c == 0x05) + c = 0xE5; + if ((nt & 0x08) && IsUpper(c)) + c += 0x20; + *p++ = c; + } + if (dir[8] != ' ') { /* Copy file name extension */ + *p++ = '.'; + for (i = 8; i < 11; i++) { + c = dir[i]; + if (c == ' ') + break; + if ((nt & 0x10) && IsUpper(c)) + c += 0x20; + *p++ = c; + } + } + fno->fattrib = dir[DIR_Attr]; /* Attribute */ + fno->fsize = LD_DWORD(dir + DIR_FileSize); /* Size */ + fno->fdate = LD_WORD(dir + DIR_WrtDate); /* Date */ + fno->ftime = LD_WORD(dir + DIR_WrtTime); /* Time */ + } + *p = 0; #if _USE_LFN - p = fno->lfname; - if (p) { - WCHAR wchr, *lfn; + p = fno->lfname; + if (p) { + WCHAR wchr, *lfn; - i = 0; - if (dj->sect && dj->lfn_idx != 0xFFFF) {/* Get LFN if available */ - lfn = dj->lfn; - while ((wchr = *lfn++) != 0) { /* Get an LFN char */ - wchr = ff_convert(wchr, 0); /* Unicode -> OEM code */ - if (!wchr) { i = 0; break; } /* Conversion error, no LFN */ - if (_DF1S && wchr >= 0x100) /* Put 1st byte if it is a DBC */ - p[i++] = (char)(wchr >> 8); - p[i++] = (char)wchr; - if (i >= fno->lfsize) { i = 0; break; } /* Buffer overrun, no LFN */ - } - } - p[i] = 0; /* Terminator */ - } + i = 0; + if (dj->sect && dj->lfn_idx != 0xFFFF) { /* Get LFN if available */ + lfn = dj->lfn; + while ((wchr = *lfn++) != 0) { /* Get an LFN char */ + wchr = ff_convert(wchr, 0); /* Unicode -> OEM code */ + if (!wchr) { + i = 0; + break; + } /* Conversion error, no LFN */ + if (_DF1S && wchr >= 0x100) /* Put 1st byte if it is a DBC */ + p[i++] = (char) (wchr >> 8); + p[i++] = (char) wchr; + if (i >= fno->lfsize) { + i = 0; + break; + } /* Buffer overrun, no LFN */ + } + } + p[i] = 0; /* Terminator */ + } #endif } -#endif /* _FS_MINIMIZE <= 1 */ +#endif /* _FS_MINIMIZE <= 1 */ /*-----------------------------------------------------------------------*/ -/* Follow a file path */ +/* + * Follow a file path + */ /*-----------------------------------------------------------------------*/ static -FRESULT follow_path ( /* FR_OK(0): successful, !=0: error code */ - DIR *dj, /* Directory object to return last directory and found object */ - const char *path /* Full-path string to find a file or directory */ -) +FRESULT follow_path( /* FR_OK(0): successful, !=0: error code */ + DIR * dj, /* Directory object to return last directory and found object */ + const char *path /* Full-path string to find a file or directory */ + ) { - FRESULT res; - BYTE *dir, last; + FRESULT res; + BYTE *dir, last; - if (*path == '/' || *path == '\\' ) path++; /* Strip heading separator */ + if (*path == '/' || *path == '\\') + path++; /* Strip heading separator */ - dj->sclust = /* Set start directory (root dir) */ - (dj->fs->fs_type == FS_FAT32) ? dj->fs->dirbase : 0; + dj->sclust = /* Set start directory (root dir) */ + (dj->fs->fs_type == FS_FAT32) ? dj->fs->dirbase : 0; - if ((BYTE)*path < ' ') { /* Null path means the root directory */ - res = dir_seek(dj, 0); - dj->dir = NULL; + if ((BYTE) * path < ' ') { /* Null path means the root directory */ + res = dir_seek(dj, 0); + dj->dir = NULL; - } else { /* Follow path */ - for (;;) { - res = create_name(dj, &path); /* Get a segment */ - if (res != FR_OK) break; - res = dir_find(dj); /* Find it */ - last = *(dj->fn+11) & 4; - if (res != FR_OK) { /* Could not find the object */ - if (res == FR_NO_FILE && !last) - res = FR_NO_PATH; - break; - } - if (last) break; /* Last segment match. Function completed. */ - dir = dj->dir; /* There is next segment. Follow the sub directory */ - if (!(dir[DIR_Attr] & AM_DIR)) { /* Cannot follow because it is a file */ - res = FR_NO_PATH; break; - } - dj->sclust = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO); - } - } + } else { /* Follow path */ + for (;;) { + res = create_name(dj, &path); /* Get a segment */ + if (res != FR_OK) + break; + res = dir_find(dj); /* Find it */ + last = *(dj->fn + 11) & 4; + if (res != FR_OK) { /* Could not find the object */ + if (res == FR_NO_FILE && !last) + res = FR_NO_PATH; + break; + } + if (last) + break; /* Last segment match. Function completed. */ + dir = dj->dir; /* There is next segment. Follow the sub directory */ + if (!(dir[DIR_Attr] & AM_DIR)) { /* Cannot follow because it is a file */ + res = FR_NO_PATH; + break; + } + dj->sclust = + ((DWORD) LD_WORD(dir + DIR_FstClusHI) << 16) | LD_WORD(dir + + DIR_FstClusLO); + } + } - return res; + return res; } /*-----------------------------------------------------------------------*/ -/* Load boot record and check if it is an FAT boot record */ +/* + * Load boot record and check if it is an FAT boot record + */ /*-----------------------------------------------------------------------*/ static -BYTE check_fs ( /* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record, 3:Error */ - FATFS *fs, /* File system object */ - DWORD sect /* Sector# (lba) to check if it is an FAT boot record or not */ -) +BYTE check_fs( /* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record, 3:Error */ + FATFS * fs, /* File system object */ + DWORD sect /* Sector# (lba) to check if it is an FAT boot record or not */ + ) { - if (disk_read(fs->drive, fs->win, sect, (BYTE)1) != RES_OK) /* Load boot record */ - return 3; - if (LD_WORD(&fs->win[BS_55AA]) != 0xAA55) /* Check record signature (always placed at offset 510 even if the sector size is >512) */ - return 2; + if (disk_read(fs->drive, fs->win, sect, (BYTE) 1) != RES_OK) /* Load boot record */ + return 3; + if (LD_WORD(&fs->win[BS_55AA]) != 0xAA55) /* Check record signature (always placed at offset 510 even if the sector size is >512) */ + return 2; - if (!mem_cmp(&fs->win[BS_FilSysType], "FAT", 3)) /* Check FAT signature */ - return 0; - if (!mem_cmp(&fs->win[BS_FilSysType32], "FAT32", 5) && !(fs->win[BPB_ExtFlags] & 0x80)) - return 0; + if (!mem_cmp(&fs->win[BS_FilSysType], "FAT", 3)) /* Check FAT signature */ + return 0; + if (!mem_cmp(&fs->win[BS_FilSysType32], "FAT32", 5) + && !(fs->win[BPB_ExtFlags] & 0x80)) + return 0; - return 1; + return 1; } /*-----------------------------------------------------------------------*/ -/* Make sure that the file system is valid */ +/* + * Make sure that the file system is valid + */ /*-----------------------------------------------------------------------*/ static -FRESULT auto_mount ( /* FR_OK(0): successful, !=0: any error occured */ - const char **path, /* Pointer to pointer to the path name (drive number) */ - FATFS **rfs, /* Pointer to pointer to the found file system object */ - BYTE chk_wp /* !=0: Check media write protection for write access */ -) +FRESULT auto_mount( /* FR_OK(0): successful, !=0: any error occured */ + const char **path, /* Pointer to pointer to the path name (drive number) */ + FATFS ** rfs, /* Pointer to pointer to the found file system object */ + BYTE chk_wp /* !=0: Check media write protection for write access */ + ) { - FRESULT res; - BYTE vol, fmt, *tbl; - DSTATUS stat; - DWORD bsect, fsize, tsect, mclst; - const char *p = *path; - FATFS *fs; + FRESULT res; + BYTE vol, fmt, *tbl; + DSTATUS stat; + DWORD bsect, fsize, tsect, mclst; + const char *p = *path; + FATFS *fs; - /* Get logical drive number from the path name */ - vol = p[0] - '0'; /* Is there a drive number? */ - if (vol <= 9 && p[1] == ':') { - p += 2; /* Found a drive number, get and strip it */ - *path = p; /* Return pointer to the path name */ - } else { - vol = 0; /* No drive number is given, use drive number 0 as default */ - } - /* Check if the logical drive number is valid or not */ - if (vol >= _DRIVES) return FR_INVALID_DRIVE; /* Is the drive number valid? */ - *rfs = fs = FatFs[vol]; /* Returen pointer to the corresponding file system object */ - if (!fs) return FR_NOT_ENABLED; /* Is the file system object registered? */ + /* + * Get logical drive number from the path name + */ + vol = p[0] - '0'; /* Is there a drive number? */ + if (vol <= 9 && p[1] == ':') { + p += 2; /* Found a drive number, get and strip it */ + *path = p; /* Return pointer to the path name */ + } else { + vol = 0; /* No drive number is given, use drive number 0 as default */ + } + /* + * Check if the logical drive number is valid or not + */ + if (vol >= _DRIVES) + return FR_INVALID_DRIVE; /* Is the drive number valid? */ + *rfs = fs = FatFs[vol]; /* Returen pointer to the corresponding file system object */ + if (!fs) + return FR_NOT_ENABLED; /* Is the file system object registered? */ - ENTER_FF(fs); /* Lock file system */ + ENTER_FF(fs); /* Lock file system */ - if (fs->fs_type) { /* If the logical drive has been mounted */ - stat = disk_status(fs->drive); - if (!(stat & STA_NOINIT)) { /* and physical drive is kept initialized (has not been changed), */ + if (fs->fs_type) { /* If the logical drive has been mounted */ + stat = disk_status(fs->drive); + if (!(stat & STA_NOINIT)) { /* and physical drive is kept initialized (has not been changed), */ #if !_FS_READONLY - if (chk_wp && (stat & STA_PROTECT)) /* Check write protection if needed */ - return FR_WRITE_PROTECTED; + if (chk_wp && (stat & STA_PROTECT)) /* Check write protection if needed */ + return FR_WRITE_PROTECTED; #endif - return FR_OK; /* The file system object is valid */ - } - } + return FR_OK; /* The file system object is valid */ + } + } - /* The logical drive must be re-mounted. Following code attempts to mount the volume */ + /* + * The logical drive must be re-mounted. Following code attempts to mount the volume + */ - fs->fs_type = 0; /* Clear the file system object */ - fs->drive = LD2PD(vol); /* Bind the logical drive and a physical drive */ - stat = disk_initialize(fs->drive); /* Initialize low level disk I/O layer */ - if (stat & STA_NOINIT) /* Check if the drive is ready */ - return FR_NOT_READY; -#if _MAX_SS != 512 /* Get disk sector size if needed */ - if (disk_ioctl(fs->drive, GET_SECTOR_SIZE, &SS(fs)) != RES_OK || SS(fs) > _MAX_SS) - return FR_NO_FILESYSTEM; + fs->fs_type = 0; /* Clear the file system object */ + fs->drive = LD2PD(vol); /* Bind the logical drive and a physical drive */ + stat = disk_initialize(fs->drive); /* Initialize low level disk I/O layer */ + if (stat & STA_NOINIT) /* Check if the drive is ready */ + return FR_NOT_READY; +#if _MAX_SS != 512 /* Get disk sector size if needed */ + if (disk_ioctl(fs->drive, GET_SECTOR_SIZE, &SS(fs)) != RES_OK + || SS(fs) > _MAX_SS) + return FR_NO_FILESYSTEM; #endif #if !_FS_READONLY - if (chk_wp && (stat & STA_PROTECT)) /* Check write protection if needed */ - return FR_WRITE_PROTECTED; + if (chk_wp && (stat & STA_PROTECT)) /* Check write protection if needed */ + return FR_WRITE_PROTECTED; #endif - /* Search FAT partition on the drive */ - fmt = check_fs(fs, bsect = 0); /* Check sector 0 as an SFD format */ - if (fmt == 1) { /* Not an FAT boot record, it may be patitioned */ - /* Check a partition listed in top of the partition table */ - tbl = &fs->win[MBR_Table + LD2PT(vol) * 16]; /* Partition table */ - if (tbl[4]) { /* Is the partition existing? */ - bsect = LD_DWORD(&tbl[8]); /* Partition offset in LBA */ - fmt = check_fs(fs, bsect); /* Check the partition */ - } - } - if (fmt == 3) return FR_DISK_ERR; - if (fmt || LD_WORD(fs->win+BPB_BytsPerSec) != SS(fs)) /* No valid FAT patition is found */ - return FR_NO_FILESYSTEM; + /* + * Search FAT partition on the drive + */ + fmt = check_fs(fs, bsect = 0); /* Check sector 0 as an SFD format */ + if (fmt == 1) { /* Not an FAT boot record, it may be patitioned */ + /* + * Check a partition listed in top of the partition table + */ + tbl = &fs->win[MBR_Table + LD2PT(vol) * 16]; /* Partition table */ + if (tbl[4]) { /* Is the partition existing? */ + bsect = LD_DWORD(&tbl[8]); /* Partition offset in LBA */ + fmt = check_fs(fs, bsect); /* Check the partition */ + } + } + if (fmt == 3) + return FR_DISK_ERR; + if (fmt || LD_WORD(fs->win + BPB_BytsPerSec) != SS(fs)) /* No valid FAT patition is found */ + return FR_NO_FILESYSTEM; - /* Initialize the file system object */ - fsize = LD_WORD(fs->win+BPB_FATSz16); /* Number of sectors per FAT */ - if (!fsize) fsize = LD_DWORD(fs->win+BPB_FATSz32); - fs->sects_fat = fsize; - fs->n_fats = fs->win[BPB_NumFATs]; /* Number of FAT copies */ - fsize *= fs->n_fats; /* (Number of sectors in FAT area) */ - fs->fatbase = bsect + LD_WORD(fs->win+BPB_RsvdSecCnt); /* FAT start sector (lba) */ - fs->csize = fs->win[BPB_SecPerClus]; /* Number of sectors per cluster */ - fs->n_rootdir = LD_WORD(fs->win+BPB_RootEntCnt); /* Nmuber of root directory entries */ - tsect = LD_WORD(fs->win+BPB_TotSec16); /* Number of sectors on the file system */ - if (!tsect) tsect = LD_DWORD(fs->win+BPB_TotSec32); - fs->max_clust = mclst = (tsect /* Last cluster# + 1 */ - - LD_WORD(fs->win+BPB_RsvdSecCnt) - fsize - fs->n_rootdir / (SS(fs)/32) - ) / fs->csize + 2; + /* + * Initialize the file system object + */ + fsize = LD_WORD(fs->win + BPB_FATSz16); /* Number of sectors per FAT */ + if (!fsize) + fsize = LD_DWORD(fs->win + BPB_FATSz32); + fs->sects_fat = fsize; + fs->n_fats = fs->win[BPB_NumFATs]; /* Number of FAT copies */ + fsize *= fs->n_fats; /* (Number of sectors in FAT area) */ + fs->fatbase = bsect + LD_WORD(fs->win + BPB_RsvdSecCnt); /* FAT start sector (lba) */ + fs->csize = fs->win[BPB_SecPerClus]; /* Number of sectors per cluster */ + fs->n_rootdir = LD_WORD(fs->win + BPB_RootEntCnt); /* Nmuber of root directory entries */ + tsect = LD_WORD(fs->win + BPB_TotSec16); /* Number of sectors on the file system */ + if (!tsect) + tsect = LD_DWORD(fs->win + BPB_TotSec32); + fs->max_clust = mclst = (tsect /* Last cluster# + 1 */ + - LD_WORD(fs->win + BPB_RsvdSecCnt) - fsize - + fs->n_rootdir / (SS(fs) / 32) + ) / fs->csize + 2; - fmt = FS_FAT12; /* Determine the FAT sub type */ - if (mclst >= 0xFF7) fmt = FS_FAT16; /* Number of clusters >= 0xFF5 */ - if (mclst >= 0xFFF7) fmt = FS_FAT32; /* Number of clusters >= 0xFFF5 */ + fmt = FS_FAT12; /* Determine the FAT sub type */ + if (mclst >= 0xFF7) + fmt = FS_FAT16; /* Number of clusters >= 0xFF5 */ + if (mclst >= 0xFFF7) + fmt = FS_FAT32; /* Number of clusters >= 0xFFF5 */ - if (fmt == FS_FAT32) - fs->dirbase = LD_DWORD(fs->win+BPB_RootClus); /* Root directory start cluster */ - else - fs->dirbase = fs->fatbase + fsize; /* Root directory start sector (lba) */ - fs->database = fs->fatbase + fsize + fs->n_rootdir / (SS(fs)/32); /* Data start sector (lba) */ + if (fmt == FS_FAT32) + fs->dirbase = LD_DWORD(fs->win + BPB_RootClus); /* Root directory start cluster */ + else + fs->dirbase = fs->fatbase + fsize; /* Root directory start sector (lba) */ + fs->database = fs->fatbase + fsize + fs->n_rootdir / (SS(fs) / 32); /* Data start sector (lba) */ #if !_FS_READONLY - /* Initialize allocation information */ - fs->free_clust = 0xFFFFFFFF; - fs->wflag = 0; - /* Get fsinfo if needed */ - if (fmt == FS_FAT32) { - fs->fsi_sector = bsect + LD_WORD(fs->win+BPB_FSInfo); - fs->fsi_flag = 0; - if (disk_read(fs->drive, fs->win, fs->fsi_sector,(BYTE) 1) == RES_OK && - LD_WORD(fs->win+BS_55AA) == 0xAA55 && - LD_DWORD(fs->win+FSI_LeadSig) == 0x41615252 && - LD_DWORD(fs->win+FSI_StrucSig) == 0x61417272) { - fs->last_clust = LD_DWORD(fs->win+FSI_Nxt_Free); - fs->free_clust = LD_DWORD(fs->win+FSI_Free_Count); - } - } + /* + * Initialize allocation information + */ + fs->free_clust = 0xFFFFFFFF; + fs->wflag = 0; + /* + * Get fsinfo if needed + */ + if (fmt == FS_FAT32) { + fs->fsi_sector = bsect + LD_WORD(fs->win + BPB_FSInfo); + fs->fsi_flag = 0; + if (disk_read(fs->drive, fs->win, fs->fsi_sector, (BYTE) 1) == RES_OK && + LD_WORD(fs->win + BS_55AA) == 0xAA55 && + LD_DWORD(fs->win + FSI_LeadSig) == 0x41615252 && + LD_DWORD(fs->win + FSI_StrucSig) == 0x61417272) { + fs->last_clust = LD_DWORD(fs->win + FSI_Nxt_Free); + fs->free_clust = LD_DWORD(fs->win + FSI_Free_Count); + } + } #endif - fs->winsect = 0; - fs->fs_type = fmt; /* FAT syb-type */ - fs->id = ++Fsid; /* File system mount ID */ - res = FR_OK; + fs->winsect = 0; + fs->fs_type = fmt; /* FAT syb-type */ + fs->id = ++Fsid; /* File system mount ID */ + res = FR_OK; - return res; + return res; } /*-----------------------------------------------------------------------*/ -/* Check if the file/dir object is valid or not */ +/* + * Check if the file/dir object is valid or not + */ /*-----------------------------------------------------------------------*/ static -FRESULT validate ( /* FR_OK(0): The object is valid, !=0: Invalid */ - FATFS *fs, /* Pointer to the file system object */ - WORD id /* Member id of the target object to be checked */ -) +FRESULT validate( /* FR_OK(0): The object is valid, !=0: Invalid */ + FATFS * fs, /* Pointer to the file system object */ + WORD id /* Member id of the target object to be checked */ + ) { - if (!fs || !fs->fs_type || fs->id != id) - return FR_INVALID_OBJECT; + if (!fs || !fs->fs_type || fs->id != id) + return FR_INVALID_OBJECT; - ENTER_FF(fs); /* Lock file system */ + ENTER_FF(fs); /* Lock file system */ - if (disk_status(fs->drive) & STA_NOINIT) - return FR_NOT_READY; + if (disk_status(fs->drive) & STA_NOINIT) + return FR_NOT_READY; - return FR_OK; + return FR_OK; } @@ -1501,221 +1734,250 @@ FRESULT validate ( /* FR_OK(0): The object is valid, !=0: Invalid */ /*-----------------------------------------------------------------------*/ -/* Mount/Unmount a Locical Drive */ +/* + * Mount/Unmount a Locical Drive + */ /*-----------------------------------------------------------------------*/ -FRESULT f_mount ( - BYTE vol, /* Logical drive number to be mounted/unmounted */ - FATFS *fs /* Pointer to new file system object (NULL for unmount)*/ -) +FRESULT f_mount(BYTE vol, /* Logical drive number to be mounted/unmounted */ + FATFS * fs /* Pointer to new file system object (NULL for unmount) */ + ) { - FATFS *rfs; + FATFS *rfs; - if (vol >= _DRIVES) /* Check if the drive number is valid */ - return FR_INVALID_DRIVE; - rfs = FatFs[vol]; /* Get current state */ + if (vol >= _DRIVES) /* Check if the drive number is valid */ + return FR_INVALID_DRIVE; + rfs = FatFs[vol]; /* Get current state */ - if (rfs) { -#if _FS_REENTRANT /* Discard sync object of the current volume */ - if (!ff_del_syncobj(fs->sobj)) return FR_INT_ERR; + if (rfs) { +#if _FS_REENTRANT /* Discard sync object of the current volume */ + if (!ff_del_syncobj(fs->sobj)) + return FR_INT_ERR; #endif - rfs->fs_type = 0; /* Clear old fs object */ - } + rfs->fs_type = 0; /* Clear old fs object */ + } - if (fs) { - fs->fs_type = 0; /* Clear new fs object */ -#if _FS_REENTRANT /* Create sync object for the new volume */ - if (!ff_cre_syncobj(vol, &fs->sobj)) return FR_INT_ERR; + if (fs) { + fs->fs_type = 0; /* Clear new fs object */ +#if _FS_REENTRANT /* Create sync object for the new volume */ + if (!ff_cre_syncobj(vol, &fs->sobj)) + return FR_INT_ERR; #endif - } - FatFs[vol] = fs; /* Register new fs object */ + } + FatFs[vol] = fs; /* Register new fs object */ - return FR_OK; + return FR_OK; } /*-----------------------------------------------------------------------*/ -/* Open or Create a File */ +/* + * Open or Create a File + */ /*-----------------------------------------------------------------------*/ -FRESULT f_open ( - FIL *fp, /* Pointer to the blank file object */ - const char *path, /* Pointer to the file name */ - BYTE mode /* Access mode and file open mode flags */ -) +FRESULT f_open(FIL * fp, /* Pointer to the blank file object */ + const char *path, /* Pointer to the file name */ + BYTE mode /* Access mode and file open mode flags */ + ) { - FRESULT res; - DIR dj; - NAMEBUF(sfn, lfn); - BYTE *dir; + FRESULT res; + DIR dj; + NAMEBUF(sfn, lfn); + BYTE *dir; - fp->fs = NULL; /* Clear file object */ + fp->fs = NULL; /* Clear file object */ #if !_FS_READONLY - mode &= (FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW); - res = auto_mount(&path, &dj.fs, (BYTE)(mode & (FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW))); + mode &= + (FA_READ | FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | + FA_CREATE_NEW); + res = + auto_mount(&path, &dj.fs, + (BYTE) (mode & + (FA_WRITE | FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | + FA_CREATE_NEW))); #else - mode &= FA_READ; - res = auto_mount(&path, &dj.fs, (BYTE)0); + mode &= FA_READ; + res = auto_mount(&path, &dj.fs, (BYTE) 0); #endif - if (res != FR_OK) LEAVE_FF(dj.fs, res); - INITBUF(dj, sfn, lfn); - res = follow_path(&dj, path); /* Follow the file path */ + if (res != FR_OK) + LEAVE_FF(dj.fs, res); + INITBUF(dj, sfn, lfn); + res = follow_path(&dj, path); /* Follow the file path */ #if !_FS_READONLY - /* Create or Open a file */ - if (mode & (FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW)) { - DWORD ps, cl; + /* + * Create or Open a file + */ + if (mode & (FA_CREATE_ALWAYS | FA_OPEN_ALWAYS | FA_CREATE_NEW)) { + DWORD ps, cl; - if (res != FR_OK) { /* No file, create new */ - if (res == FR_NO_FILE) - res = dir_register(&dj); - if (res != FR_OK) LEAVE_FF(dj.fs, res); - mode |= FA_CREATE_ALWAYS; - dir = dj.dir; - } - else { /* Any object is already existing */ - if (mode & FA_CREATE_NEW) /* Cannot create new */ - LEAVE_FF(dj.fs, FR_EXIST); - dir = dj.dir; - if (!dir || (dir[DIR_Attr] & (AM_RDO | AM_DIR))) /* Cannot overwrite it (R/O or DIR) */ - LEAVE_FF(dj.fs, FR_DENIED); - if (mode & FA_CREATE_ALWAYS) { /* Resize it to zero if needed */ - cl = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO); /* Get start cluster */ - ST_WORD(dir+DIR_FstClusHI, 0); /* cluster = 0 */ - ST_WORD(dir+DIR_FstClusLO, 0); - ST_DWORD(dir+DIR_FileSize, 0); /* size = 0 */ - dj.fs->wflag = 1; - ps = dj.fs->winsect; /* Remove the cluster chain */ - if (cl) { - res = remove_chain(dj.fs, cl); - if (res) LEAVE_FF(dj.fs, res); - dj.fs->last_clust = cl - 1; /* Reuse the cluster hole */ - } - res = move_window(dj.fs, ps); - if (res != FR_OK) LEAVE_FF(dj.fs, res); - } - } - if (mode & FA_CREATE_ALWAYS) { - dir[DIR_Attr] = 0; /* Reset attribute */ - ps = get_fattime(); - ST_DWORD(dir+DIR_CrtTime, ps); /* Created time */ - dj.fs->wflag = 1; - mode |= FA__WRITTEN; /* Set file changed flag */ - } - } - /* Open an existing file */ - else { -#endif /* !_FS_READONLY */ - if (res != FR_OK) LEAVE_FF(dj.fs, res); /* Follow failed */ - dir = dj.dir; - if (!dir || (dir[DIR_Attr] & AM_DIR)) /* It is a directory */ - LEAVE_FF(dj.fs, FR_NO_FILE); + if (res != FR_OK) { /* No file, create new */ + if (res == FR_NO_FILE) + res = dir_register(&dj); + if (res != FR_OK) + LEAVE_FF(dj.fs, res); + mode |= FA_CREATE_ALWAYS; + dir = dj.dir; + } else { /* Any object is already existing */ + if (mode & FA_CREATE_NEW) /* Cannot create new */ + LEAVE_FF(dj.fs, FR_EXIST); + dir = dj.dir; + if (!dir || (dir[DIR_Attr] & (AM_RDO | AM_DIR))) /* Cannot overwrite it (R/O or DIR) */ + LEAVE_FF(dj.fs, FR_DENIED); + if (mode & FA_CREATE_ALWAYS) { /* Resize it to zero if needed */ + cl = ((DWORD) LD_WORD(dir + DIR_FstClusHI) << 16) | LD_WORD(dir + DIR_FstClusLO); /* Get start cluster */ + ST_WORD(dir + DIR_FstClusHI, 0); /* cluster = 0 */ + ST_WORD(dir + DIR_FstClusLO, 0); + ST_DWORD(dir + DIR_FileSize, 0); /* size = 0 */ + dj.fs->wflag = 1; + ps = dj.fs->winsect; /* Remove the cluster chain */ + if (cl) { + res = remove_chain(dj.fs, cl); + if (res) + LEAVE_FF(dj.fs, res); + dj.fs->last_clust = cl - 1; /* Reuse the cluster hole */ + } + res = move_window(dj.fs, ps); + if (res != FR_OK) + LEAVE_FF(dj.fs, res); + } + } + if (mode & FA_CREATE_ALWAYS) { + dir[DIR_Attr] = 0; /* Reset attribute */ + ps = get_fattime(); + ST_DWORD(dir + DIR_CrtTime, ps); /* Created time */ + dj.fs->wflag = 1; + mode |= FA__WRITTEN; /* Set file changed flag */ + } + } + /* + * Open an existing file + */ + else { +#endif /* !_FS_READONLY */ + if (res != FR_OK) + LEAVE_FF(dj.fs, res); /* Follow failed */ + dir = dj.dir; + if (!dir || (dir[DIR_Attr] & AM_DIR)) /* It is a directory */ + LEAVE_FF(dj.fs, FR_NO_FILE); #if !_FS_READONLY - if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */ - LEAVE_FF(dj.fs, FR_DENIED); - } - fp->dir_sect = dj.fs->winsect; /* Pointer to the directory entry */ - fp->dir_ptr = dj.dir; + if ((mode & FA_WRITE) && (dir[DIR_Attr] & AM_RDO)) /* R/O violation */ + LEAVE_FF(dj.fs, FR_DENIED); + } + fp->dir_sect = dj.fs->winsect; /* Pointer to the directory entry */ + fp->dir_ptr = dj.dir; #endif - fp->flag = mode; /* File access mode */ - fp->org_clust = /* File start cluster */ - ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO); - fp->fsize = LD_DWORD(dir+DIR_FileSize); /* File size */ - fp->fptr = 0; fp->csect = 255; /* File pointer */ - fp->dsect = 0; - fp->fs = dj.fs; fp->id = dj.fs->id; /* Owner file system object of the file */ + fp->flag = mode; /* File access mode */ + fp->org_clust = /* File start cluster */ + ((DWORD) LD_WORD(dir + DIR_FstClusHI) << 16) | LD_WORD(dir + + DIR_FstClusLO); + fp->fsize = LD_DWORD(dir + DIR_FileSize); /* File size */ + fp->fptr = 0; + fp->csect = 255; /* File pointer */ + fp->dsect = 0; + fp->fs = dj.fs; + fp->id = dj.fs->id; /* Owner file system object of the file */ - LEAVE_FF(dj.fs, FR_OK); + LEAVE_FF(dj.fs, FR_OK); } /*-----------------------------------------------------------------------*/ -/* Read File */ +/* + * Read File + */ /*-----------------------------------------------------------------------*/ -FRESULT f_read ( - FIL *fp, /* Pointer to the file object */ - void *buff, /* Pointer to data buffer */ - UINT btr, /* Number of bytes to read */ - UINT *br /* Pointer to number of bytes read */ -) +FRESULT f_read(FIL * fp, /* Pointer to the file object */ + void *buff, /* Pointer to data buffer */ + UINT btr, /* Number of bytes to read */ + UINT * br /* Pointer to number of bytes read */ + ) { - FRESULT res; - DWORD clst, sect, remain; - UINT rcnt, cc; - BYTE *rbuff = buff; + FRESULT res; + DWORD clst, sect, remain; + UINT rcnt, cc; + BYTE *rbuff = buff; - *br = 0; + *br = 0; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) LEAVE_FF(fp->fs, res); - if (fp->flag & FA__ERROR) /* Check abort flag */ - LEAVE_FF(fp->fs, FR_INT_ERR); - if (!(fp->flag & FA_READ)) /* Check access mode */ - LEAVE_FF(fp->fs, FR_DENIED); - remain = fp->fsize - fp->fptr; - if (btr > remain) btr = (UINT)remain; /* Truncate btr by remaining bytes */ + res = validate(fp->fs, fp->id); /* Check validity of the object */ + if (res != FR_OK) + LEAVE_FF(fp->fs, res); + if (fp->flag & FA__ERROR) /* Check abort flag */ + LEAVE_FF(fp->fs, FR_INT_ERR); + if (!(fp->flag & FA_READ)) /* Check access mode */ + LEAVE_FF(fp->fs, FR_DENIED); + remain = fp->fsize - fp->fptr; + if (btr > remain) + btr = (UINT) remain; /* Truncate btr by remaining bytes */ - for ( ; btr; /* Repeat until all data transferred */ - rbuff += rcnt, fp->fptr += rcnt, *br += rcnt, btr -= rcnt) { - if ((fp->fptr % SS(fp->fs)) == 0) { /* On the sector boundary? */ - if (fp->csect >= fp->fs->csize) { /* On the cluster boundary? */ - clst = (fp->fptr == 0) ? /* On the top of the file? */ - fp->org_clust : get_cluster(fp->fs, fp->curr_clust); - if (clst <= 1) ABORT(fp->fs, FR_INT_ERR); - if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR); - fp->curr_clust = clst; /* Update current cluster */ - fp->csect = 0; /* Reset sector offset in the cluster */ - } - sect = clust2sect(fp->fs, fp->curr_clust); /* Get current sector */ - if (!sect) ABORT(fp->fs, FR_INT_ERR); - sect += fp->csect; - cc = btr / SS(fp->fs); /* When remaining bytes >= sector size, */ - if (cc) { /* Read maximum contiguous sectors directly */ - if (fp->csect + cc > fp->fs->csize) /* Clip at cluster boundary */ - cc = fp->fs->csize - fp->csect; - if (disk_read(fp->fs->drive, rbuff, sect, (BYTE)cc) != RES_OK) - ABORT(fp->fs, FR_DISK_ERR); - fp->csect += (BYTE)cc; /* Next sector address in the cluster */ - rcnt = SS(fp->fs) * cc; /* Number of bytes transferred */ - continue; - } + for (; btr; /* Repeat until all data transferred */ + rbuff += rcnt, fp->fptr += rcnt, *br += rcnt, btr -= rcnt) { + if ((fp->fptr % SS(fp->fs)) == 0) { /* On the sector boundary? */ + if (fp->csect >= fp->fs->csize) { /* On the cluster boundary? */ + clst = (fp->fptr == 0) ? /* On the top of the file? */ + fp->org_clust : get_cluster(fp->fs, fp->curr_clust); + if (clst <= 1) + ABORT(fp->fs, FR_INT_ERR); + if (clst == 0xFFFFFFFF) + ABORT(fp->fs, FR_DISK_ERR); + fp->curr_clust = clst; /* Update current cluster */ + fp->csect = 0; /* Reset sector offset in the cluster */ + } + sect = clust2sect(fp->fs, fp->curr_clust); /* Get current sector */ + if (!sect) + ABORT(fp->fs, FR_INT_ERR); + sect += fp->csect; + cc = btr / SS(fp->fs); /* When remaining bytes >= sector size, */ + if (cc) { /* Read maximum contiguous sectors directly */ + if (fp->csect + cc > fp->fs->csize) /* Clip at cluster boundary */ + cc = fp->fs->csize - fp->csect; + if (disk_read(fp->fs->drive, rbuff, sect, (BYTE) cc) != RES_OK) + ABORT(fp->fs, FR_DISK_ERR); + fp->csect += (BYTE) cc; /* Next sector address in the cluster */ + rcnt = SS(fp->fs) * cc; /* Number of bytes transferred */ + continue; + } #if !_FS_TINY #if !_FS_READONLY - if (fp->flag & FA__DIRTY) { /* Write sector I/O buffer if needed */ - if (disk_write(fp->fs->drive, fp->buf, fp->dsect, (BYTE)1) != RES_OK) - ABORT(fp->fs, FR_DISK_ERR); - fp->flag &= (BYTE)~FA__DIRTY; - } + if (fp->flag & FA__DIRTY) { /* Write sector I/O buffer if needed */ + if (disk_write(fp->fs->drive, fp->buf, fp->dsect, (BYTE) 1) != + RES_OK) + ABORT(fp->fs, FR_DISK_ERR); + fp->flag &= (BYTE) ~ FA__DIRTY; + } #endif - if (fp->dsect != sect) { /* Fill sector buffer with file data */ - if (disk_read(fp->fs->drive, fp->buf, sect,(BYTE) 1) != RES_OK) - ABORT(fp->fs, FR_DISK_ERR); - } + if (fp->dsect != sect) { /* Fill sector buffer with file data */ + if (disk_read(fp->fs->drive, fp->buf, sect, (BYTE) 1) != RES_OK) + ABORT(fp->fs, FR_DISK_ERR); + } #endif - fp->dsect = sect; - fp->csect++; /* Next sector address in the cluster */ - } - rcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs)); /* Get partial sector data from sector buffer */ - if (rcnt > btr) rcnt = btr; + fp->dsect = sect; + fp->csect++; /* Next sector address in the cluster */ + } + rcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs)); /* Get partial sector data from sector buffer */ + if (rcnt > btr) + rcnt = btr; #if _FS_TINY - if (move_window(fp->fs, fp->dsect)) /* Move sector window */ - ABORT(fp->fs, FR_DISK_ERR); - mem_cpy(rbuff, &fp->fs->win[fp->fptr % SS(fp->fs)], rcnt); /* Pick partial sector */ + if (move_window(fp->fs, fp->dsect)) /* Move sector window */ + ABORT(fp->fs, FR_DISK_ERR); + mem_cpy(rbuff, &fp->fs->win[fp->fptr % SS(fp->fs)], rcnt); /* Pick partial sector */ #else - mem_cpy(rbuff, &fp->buf[fp->fptr % SS(fp->fs)], rcnt); /* Pick partial sector */ + mem_cpy(rbuff, &fp->buf[fp->fptr % SS(fp->fs)], rcnt); /* Pick partial sector */ #endif - } + } - LEAVE_FF(fp->fs, FR_OK); + LEAVE_FF(fp->fs, FR_OK); } @@ -1723,176 +1985,195 @@ FRESULT f_read ( #if !_FS_READONLY /*-----------------------------------------------------------------------*/ -/* Write File */ +/* + * Write File + */ /*-----------------------------------------------------------------------*/ -FRESULT f_write ( - FIL *fp, /* Pointer to the file object */ - const void *buff, /* Pointer to the data to be written */ - UINT btw, /* Number of bytes to write */ - UINT *bw /* Pointer to number of bytes written */ -) +FRESULT f_write(FIL * fp, /* Pointer to the file object */ + const void *buff, /* Pointer to the data to be written */ + UINT btw, /* Number of bytes to write */ + UINT * bw /* Pointer to number of bytes written */ + ) { - FRESULT res; - DWORD clst, sect; - UINT wcnt, cc; - const BYTE *wbuff = buff; + FRESULT res; + DWORD clst, sect; + UINT wcnt, cc; + const BYTE *wbuff = buff; - *bw = 0; + *bw = 0; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) LEAVE_FF(fp->fs, res); - if (fp->flag & FA__ERROR) /* Check abort flag */ - LEAVE_FF(fp->fs, FR_INT_ERR); - if (!(fp->flag & FA_WRITE)) /* Check access mode */ - LEAVE_FF(fp->fs, FR_DENIED); - if (fp->fsize + btw < fp->fsize) btw = 0; /* File size cannot reach 4GB */ + res = validate(fp->fs, fp->id); /* Check validity of the object */ + if (res != FR_OK) + LEAVE_FF(fp->fs, res); + if (fp->flag & FA__ERROR) /* Check abort flag */ + LEAVE_FF(fp->fs, FR_INT_ERR); + if (!(fp->flag & FA_WRITE)) /* Check access mode */ + LEAVE_FF(fp->fs, FR_DENIED); + if (fp->fsize + btw < fp->fsize) + btw = 0; /* File size cannot reach 4GB */ - for ( ; btw; /* Repeat until all data transferred */ - wbuff += wcnt, fp->fptr += wcnt, *bw += wcnt, btw -= wcnt) { - if ((fp->fptr % SS(fp->fs)) == 0) { /* On the sector boundary? */ - if (fp->csect >= fp->fs->csize) { /* On the cluster boundary? */ - if (fp->fptr == 0) { /* On the top of the file? */ - clst = fp->org_clust; /* Follow from the origin */ - if (clst == 0) /* When there is no cluster chain, */ - fp->org_clust = clst = create_chain(fp->fs, (DWORD)0); /* Create a new cluster chain */ - } else { /* Middle or end of the file */ - clst = create_chain(fp->fs, fp->curr_clust); /* Follow or streach cluster chain */ - } - if (clst == 0) break; /* Could not allocate a new cluster (disk full) */ - if (clst == 1) ABORT(fp->fs, FR_INT_ERR); - if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR); - fp->curr_clust = clst; /* Update current cluster */ - fp->csect = 0; /* Reset sector address in the cluster */ - } + for (; btw; /* Repeat until all data transferred */ + wbuff += wcnt, fp->fptr += wcnt, *bw += wcnt, btw -= wcnt) { + if ((fp->fptr % SS(fp->fs)) == 0) { /* On the sector boundary? */ + if (fp->csect >= fp->fs->csize) { /* On the cluster boundary? */ + if (fp->fptr == 0) { /* On the top of the file? */ + clst = fp->org_clust; /* Follow from the origin */ + if (clst == 0) /* When there is no cluster chain, */ + fp->org_clust = clst = create_chain(fp->fs, (DWORD) 0); /* Create a new cluster chain */ + } else { /* Middle or end of the file */ + clst = create_chain(fp->fs, fp->curr_clust); /* Follow or streach cluster chain */ + } + if (clst == 0) + break; /* Could not allocate a new cluster (disk full) */ + if (clst == 1) + ABORT(fp->fs, FR_INT_ERR); + if (clst == 0xFFFFFFFF) + ABORT(fp->fs, FR_DISK_ERR); + fp->curr_clust = clst; /* Update current cluster */ + fp->csect = 0; /* Reset sector address in the cluster */ + } #if _FS_TINY - if (fp->fs->winsect == fp->dsect && move_window(fp->fs, (DWORD)0)) /* Write back data buffer prior to following direct transfer */ - ABORT(fp->fs, FR_DISK_ERR); + if (fp->fs->winsect == fp->dsect && move_window(fp->fs, (DWORD) 0)) /* Write back data buffer prior to following direct + * transfer */ + ABORT(fp->fs, FR_DISK_ERR); #else - if (fp->flag & FA__DIRTY) { /* Write back data buffer prior to following direct transfer */ - if (disk_write(fp->fs->drive, fp->buf, fp->dsect,(BYTE) 1) != RES_OK) - ABORT(fp->fs, FR_DISK_ERR); - fp->flag &= (BYTE)~FA__DIRTY; - } + if (fp->flag & FA__DIRTY) { /* Write back data buffer prior to following direct transfer */ + if (disk_write(fp->fs->drive, fp->buf, fp->dsect, (BYTE) 1) != + RES_OK) + ABORT(fp->fs, FR_DISK_ERR); + fp->flag &= (BYTE) ~ FA__DIRTY; + } #endif - sect = clust2sect(fp->fs, fp->curr_clust); /* Get current sector */ - if (!sect) ABORT(fp->fs, FR_INT_ERR); - sect += fp->csect; - cc = btw / SS(fp->fs); /* When remaining bytes >= sector size, */ - if (cc) { /* Write maximum contiguous sectors directly */ - if (fp->csect + cc > fp->fs->csize) /* Clip at cluster boundary */ - cc = fp->fs->csize - fp->csect; - if (disk_write(fp->fs->drive, wbuff, sect, (BYTE)cc) != RES_OK) - ABORT(fp->fs, FR_DISK_ERR); - fp->csect += (BYTE)cc; /* Next sector address in the cluster */ - wcnt = SS(fp->fs) * cc; /* Number of bytes transferred */ - continue; - } + sect = clust2sect(fp->fs, fp->curr_clust); /* Get current sector */ + if (!sect) + ABORT(fp->fs, FR_INT_ERR); + sect += fp->csect; + cc = btw / SS(fp->fs); /* When remaining bytes >= sector size, */ + if (cc) { /* Write maximum contiguous sectors directly */ + if (fp->csect + cc > fp->fs->csize) /* Clip at cluster boundary */ + cc = fp->fs->csize - fp->csect; + if (disk_write(fp->fs->drive, wbuff, sect, (BYTE) cc) != RES_OK) + ABORT(fp->fs, FR_DISK_ERR); + fp->csect += (BYTE) cc; /* Next sector address in the cluster */ + wcnt = SS(fp->fs) * cc; /* Number of bytes transferred */ + continue; + } #if _FS_TINY - if (fp->fptr >= fp->fsize) { /* Avoid silly buffer filling at growing edge */ - if (move_window(fp->fs,(DWORD) 0)) ABORT(fp->fs, FR_DISK_ERR); - fp->fs->winsect = sect; - } + if (fp->fptr >= fp->fsize) { /* Avoid silly buffer filling at growing edge */ + if (move_window(fp->fs, (DWORD) 0)) + ABORT(fp->fs, FR_DISK_ERR); + fp->fs->winsect = sect; + } #else - if (fp->dsect != sect) { /* Fill sector buffer with file data */ - if (fp->fptr < fp->fsize && - disk_read(fp->fs->drive, fp->buf, sect, (BYTE)1) != RES_OK) - ABORT(fp->fs, FR_DISK_ERR); - } + if (fp->dsect != sect) { /* Fill sector buffer with file data */ + if (fp->fptr < fp->fsize && + disk_read(fp->fs->drive, fp->buf, sect, (BYTE) 1) != RES_OK) + ABORT(fp->fs, FR_DISK_ERR); + } #endif - fp->dsect = sect; - fp->csect++; /* Next sector address in the cluster */ - } - wcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs)); /* Put partial sector into file I/O buffer */ - if (wcnt > btw) wcnt = btw; + fp->dsect = sect; + fp->csect++; /* Next sector address in the cluster */ + } + wcnt = SS(fp->fs) - (fp->fptr % SS(fp->fs)); /* Put partial sector into file I/O buffer */ + if (wcnt > btw) + wcnt = btw; #if _FS_TINY - if (move_window(fp->fs, fp->dsect)) /* Move sector window */ - ABORT(fp->fs, FR_DISK_ERR); - mem_cpy(&fp->fs->win[fp->fptr % SS(fp->fs)], wbuff, wcnt); /* Fit partial sector */ - fp->fs->wflag = 1; + if (move_window(fp->fs, fp->dsect)) /* Move sector window */ + ABORT(fp->fs, FR_DISK_ERR); + mem_cpy(&fp->fs->win[fp->fptr % SS(fp->fs)], wbuff, wcnt); /* Fit partial sector */ + fp->fs->wflag = 1; #else - mem_cpy(&fp->buf[fp->fptr % SS(fp->fs)], wbuff, wcnt); /* Fit partial sector */ - fp->flag |= FA__DIRTY; + mem_cpy(&fp->buf[fp->fptr % SS(fp->fs)], wbuff, wcnt); /* Fit partial sector */ + fp->flag |= FA__DIRTY; #endif - } + } - if (fp->fptr > fp->fsize) fp->fsize = fp->fptr; /* Update file size if needed */ - fp->flag |= FA__WRITTEN; /* Set file changed flag */ + if (fp->fptr > fp->fsize) + fp->fsize = fp->fptr; /* Update file size if needed */ + fp->flag |= FA__WRITTEN; /* Set file changed flag */ - LEAVE_FF(fp->fs, FR_OK); + LEAVE_FF(fp->fs, FR_OK); } /*-----------------------------------------------------------------------*/ -/* Synchronize the File Object */ +/* + * Synchronize the File Object + */ /*-----------------------------------------------------------------------*/ -FRESULT f_sync ( - FIL *fp /* Pointer to the file object */ -) +FRESULT f_sync(FIL * fp /* Pointer to the file object */ + ) { - FRESULT res; - DWORD tim; - BYTE *dir; + FRESULT res; + DWORD tim; + BYTE *dir; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res == FR_OK) { - if (fp->flag & FA__WRITTEN) { /* Has the file been written? */ -#if !_FS_TINY /* Write-back dirty buffer */ - if (fp->flag & FA__DIRTY) { - if (disk_write(fp->fs->drive, fp->buf, fp->dsect,(BYTE) 1) != RES_OK) - LEAVE_FF(fp->fs, FR_DISK_ERR); - fp->flag &= (BYTE)~FA__DIRTY; - } + res = validate(fp->fs, fp->id); /* Check validity of the object */ + if (res == FR_OK) { + if (fp->flag & FA__WRITTEN) { /* Has the file been written? */ +#if !_FS_TINY /* Write-back dirty buffer */ + if (fp->flag & FA__DIRTY) { + if (disk_write(fp->fs->drive, fp->buf, fp->dsect, (BYTE) 1) != + RES_OK) + LEAVE_FF(fp->fs, FR_DISK_ERR); + fp->flag &= (BYTE) ~ FA__DIRTY; + } #endif - /* Update the directory entry */ - res = move_window(fp->fs, fp->dir_sect); - if (res == FR_OK) { - dir = fp->dir_ptr; - dir[DIR_Attr] |= AM_ARC; /* Set archive bit */ - ST_DWORD(dir+DIR_FileSize, fp->fsize); /* Update file size */ - ST_WORD(dir+DIR_FstClusLO, fp->org_clust); /* Update start cluster */ - ST_WORD(dir+DIR_FstClusHI, fp->org_clust >> 16); - tim = get_fattime(); /* Updated time */ - ST_DWORD(dir+DIR_WrtTime, tim); - fp->flag &= (BYTE)~FA__WRITTEN; - fp->fs->wflag = 1; - res = sync(fp->fs); - } - } - } + /* + * Update the directory entry + */ + res = move_window(fp->fs, fp->dir_sect); + if (res == FR_OK) { + dir = fp->dir_ptr; + dir[DIR_Attr] |= AM_ARC; /* Set archive bit */ + ST_DWORD(dir + DIR_FileSize, fp->fsize); /* Update file size */ + ST_WORD(dir + DIR_FstClusLO, fp->org_clust); /* Update start cluster */ + ST_WORD(dir + DIR_FstClusHI, fp->org_clust >> 16); + tim = get_fattime(); /* Updated time */ + ST_DWORD(dir + DIR_WrtTime, tim); + fp->flag &= (BYTE) ~ FA__WRITTEN; + fp->fs->wflag = 1; + res = sync(fp->fs); + } + } + } - LEAVE_FF(fp->fs, res); + LEAVE_FF(fp->fs, res); } -#endif /* !_FS_READONLY */ +#endif /* !_FS_READONLY */ /*-----------------------------------------------------------------------*/ -/* Close File */ +/* + * Close File + */ /*-----------------------------------------------------------------------*/ -FRESULT f_close ( - FIL *fp /* Pointer to the file object to be closed */ -) +FRESULT f_close(FIL * fp /* Pointer to the file object to be closed */ + ) { - FRESULT res; + FRESULT res; #if _FS_READONLY - res = validate(fp->fs, fp->id); - if (res == FR_OK) fp->fs = NULL; - LEAVE_FF(fp->fs, res); + res = validate(fp->fs, fp->id); + if (res == FR_OK) + fp->fs = NULL; + LEAVE_FF(fp->fs, res); #else - res = f_sync(fp); - if (res == FR_OK) fp->fs = NULL; - return res; + res = f_sync(fp); + if (res == FR_OK) + fp->fs = NULL; + return res; #endif } @@ -1901,99 +2182,109 @@ FRESULT f_close ( #if _FS_MINIMIZE <= 2 /*-----------------------------------------------------------------------*/ -/* Seek File R/W Pointer */ +/* + * Seek File R/W Pointer + */ /*-----------------------------------------------------------------------*/ -FRESULT f_lseek ( - FIL *fp, /* Pointer to the file object */ - DWORD ofs /* File pointer from top of file */ -) +FRESULT f_lseek(FIL * fp, /* Pointer to the file object */ + DWORD ofs /* File pointer from top of file */ + ) { - FRESULT res; - DWORD clst, bcs, nsect, ifptr; + FRESULT res; + DWORD clst, bcs, nsect, ifptr; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) LEAVE_FF(fp->fs, res); - if (fp->flag & FA__ERROR) /* Check abort flag */ - LEAVE_FF(fp->fs, FR_INT_ERR); - if (ofs > fp->fsize /* In read-only mode, clip offset with the file size */ + res = validate(fp->fs, fp->id); /* Check validity of the object */ + if (res != FR_OK) + LEAVE_FF(fp->fs, res); + if (fp->flag & FA__ERROR) /* Check abort flag */ + LEAVE_FF(fp->fs, FR_INT_ERR); + if (ofs > fp->fsize /* In read-only mode, clip offset with the file size */ #if !_FS_READONLY - && !(fp->flag & FA_WRITE) + && !(fp->flag & FA_WRITE) #endif - ) ofs = fp->fsize; + ) + ofs = fp->fsize; - ifptr = fp->fptr; - fp->fptr = 0; fp->csect = 255; - nsect = 0; - if (ofs > 0) { - bcs = (DWORD)fp->fs->csize * SS(fp->fs); /* Cluster size (byte) */ - if (ifptr > 0 && - (ofs - 1) / bcs >= (ifptr - 1) / bcs) { /* When seek to same or following cluster, */ - fp->fptr = (ifptr - 1) & ~(bcs - 1); /* start from the current cluster */ - ofs -= fp->fptr; - clst = fp->curr_clust; - } else { /* When seek to back cluster, */ - clst = fp->org_clust; /* start from the first cluster */ + ifptr = fp->fptr; + fp->fptr = 0; + fp->csect = 255; + nsect = 0; + if (ofs > 0) { + bcs = (DWORD) fp->fs->csize * SS(fp->fs); /* Cluster size (byte) */ + if (ifptr > 0 && (ofs - 1) / bcs >= (ifptr - 1) / bcs) { /* When seek to same or following cluster, */ + fp->fptr = (ifptr - 1) & ~(bcs - 1); /* start from the current cluster */ + ofs -= fp->fptr; + clst = fp->curr_clust; + } else { /* When seek to back cluster, */ + clst = fp->org_clust; /* start from the first cluster */ #if !_FS_READONLY - if (clst == 0) { /* If no cluster chain, create a new chain */ - clst = create_chain(fp->fs, (DWORD)0); - if (clst == 1) ABORT(fp->fs, FR_INT_ERR); - if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR); - fp->org_clust = clst; - } + if (clst == 0) { /* If no cluster chain, create a new chain */ + clst = create_chain(fp->fs, (DWORD) 0); + if (clst == 1) + ABORT(fp->fs, FR_INT_ERR); + if (clst == 0xFFFFFFFF) + ABORT(fp->fs, FR_DISK_ERR); + fp->org_clust = clst; + } #endif - fp->curr_clust = clst; - } - if (clst != 0) { - while (ofs > bcs) { /* Cluster following loop */ + fp->curr_clust = clst; + } + if (clst != 0) { + while (ofs > bcs) { /* Cluster following loop */ #if !_FS_READONLY - if (fp->flag & FA_WRITE) { /* Check if in write mode or not */ - clst = create_chain(fp->fs, clst); /* Force streached if in write mode */ - if (clst == 0) { /* When disk gets full, clip file size */ - ofs = bcs; break; - } - } else + if (fp->flag & FA_WRITE) { /* Check if in write mode or not */ + clst = create_chain(fp->fs, clst); /* Force streached if in write mode */ + if (clst == 0) { /* When disk gets full, clip file size */ + ofs = bcs; + break; + } + } else #endif - clst = get_cluster(fp->fs, clst); /* Follow cluster chain if not in write mode */ - if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR); - if (clst <= 1 || clst >= fp->fs->max_clust) ABORT(fp->fs, FR_INT_ERR); - fp->curr_clust = clst; - fp->fptr += bcs; - ofs -= bcs; - } - fp->fptr += ofs; - fp->csect = (BYTE)(ofs / SS(fp->fs)); /* Sector offset in the cluster */ - if (ofs % SS(fp->fs)) { - nsect = clust2sect(fp->fs, clst); /* Current sector */ - if (!nsect) ABORT(fp->fs, FR_INT_ERR); - nsect += fp->csect; - fp->csect++; - } - } - } - if (nsect && nsect != fp->dsect && fp->fptr % SS(fp->fs)) { + clst = get_cluster(fp->fs, clst); /* Follow cluster chain if not in write mode */ + if (clst == 0xFFFFFFFF) + ABORT(fp->fs, FR_DISK_ERR); + if (clst <= 1 || clst >= fp->fs->max_clust) + ABORT(fp->fs, FR_INT_ERR); + fp->curr_clust = clst; + fp->fptr += bcs; + ofs -= bcs; + } + fp->fptr += ofs; + fp->csect = (BYTE) (ofs / SS(fp->fs)); /* Sector offset in the cluster */ + if (ofs % SS(fp->fs)) { + nsect = clust2sect(fp->fs, clst); /* Current sector */ + if (!nsect) + ABORT(fp->fs, FR_INT_ERR); + nsect += fp->csect; + fp->csect++; + } + } + } + if (nsect && nsect != fp->dsect && fp->fptr % SS(fp->fs)) { #if !_FS_TINY #if !_FS_READONLY - if (fp->flag & FA__DIRTY) { /* Write-back dirty buffer if needed */ - if (disk_write(fp->fs->drive, fp->buf, fp->dsect,(BYTE) 1) != RES_OK) - ABORT(fp->fs, FR_DISK_ERR); - fp->flag &= (BYTE)~FA__DIRTY; - } + if (fp->flag & FA__DIRTY) { /* Write-back dirty buffer if needed */ + if (disk_write(fp->fs->drive, fp->buf, fp->dsect, (BYTE) 1) != + RES_OK) + ABORT(fp->fs, FR_DISK_ERR); + fp->flag &= (BYTE) ~ FA__DIRTY; + } #endif - if (disk_read(fp->fs->drive, fp->buf, nsect,(BYTE) 1) != RES_OK) - ABORT(fp->fs, FR_DISK_ERR); + if (disk_read(fp->fs->drive, fp->buf, nsect, (BYTE) 1) != RES_OK) + ABORT(fp->fs, FR_DISK_ERR); #endif - fp->dsect = nsect; - } + fp->dsect = nsect; + } #if !_FS_READONLY - if (fp->fptr > fp->fsize) { /* Set changed flag if the file size is extended */ - fp->fsize = fp->fptr; - fp->flag |= FA__WRITTEN; - } + if (fp->fptr > fp->fsize) { /* Set changed flag if the file size is extended */ + fp->fsize = fp->fptr; + fp->flag |= FA__WRITTEN; + } #endif - LEAVE_FF(fp->fs, res); + LEAVE_FF(fp->fs, res); } @@ -2001,803 +2292,914 @@ FRESULT f_lseek ( #if _FS_MINIMIZE <= 1 /*-----------------------------------------------------------------------*/ -/* Create a Directroy Object */ +/* + * Create a Directroy Object + */ /*-----------------------------------------------------------------------*/ -FRESULT f_opendir ( - DIR *dj, /* Pointer to directory object to create */ - const char *path /* Pointer to the directory path */ -) +FRESULT f_opendir(DIR * dj, /* Pointer to directory object to create */ + const char *path /* Pointer to the directory path */ + ) { - FRESULT res; - NAMEBUF(sfn, lfn); - BYTE *dir; + FRESULT res; + NAMEBUF(sfn, lfn); + BYTE *dir; - res = auto_mount(&path, &dj->fs, (BYTE)0); - if (res == FR_OK) { - INITBUF((*dj), sfn, lfn); - res = follow_path(dj, path); /* Follow the path to the directory */ - if (res == FR_OK) { /* Follow completed */ - dir = dj->dir; - if (dir) { /* It is not the root dir */ - if (dir[DIR_Attr] & AM_DIR) { /* The object is a directory */ - dj->sclust = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO); - } else { /* The object is not a directory */ - res = FR_NO_PATH; - } - } else { /* It is the root dir */ - dj->sclust = (dj->fs->fs_type == FS_FAT32) ? dj->fs->dirbase : 0; - } - if (res == FR_OK) res = dir_seek(dj, 0); - dj->id = dj->fs->id; - } else { - if (res == FR_NO_FILE) res = FR_NO_PATH; - } - } + res = auto_mount(&path, &dj->fs, (BYTE) 0); + if (res == FR_OK) { + INITBUF((*dj), sfn, lfn); + res = follow_path(dj, path); /* Follow the path to the directory */ + if (res == FR_OK) { /* Follow completed */ + dir = dj->dir; + if (dir) { /* It is not the root dir */ + if (dir[DIR_Attr] & AM_DIR) { /* The object is a directory */ + dj->sclust = + ((DWORD) LD_WORD(dir + DIR_FstClusHI) << 16) | + LD_WORD(dir + DIR_FstClusLO); + } else { /* The object is not a directory */ + res = FR_NO_PATH; + } + } else { /* It is the root dir */ + dj->sclust = + (dj->fs->fs_type == FS_FAT32) ? dj->fs->dirbase : 0; + } + if (res == FR_OK) + res = dir_seek(dj, 0); + dj->id = dj->fs->id; + } else { + if (res == FR_NO_FILE) + res = FR_NO_PATH; + } + } - LEAVE_FF(dj->fs, res); + LEAVE_FF(dj->fs, res); } /*-----------------------------------------------------------------------*/ -/* Read Directory Entry in Sequense */ +/* + * Read Directory Entry in Sequense + */ /*-----------------------------------------------------------------------*/ -FRESULT f_readdir ( - DIR *dj, /* Pointer to the open directory object */ - FILINFO *fno /* Pointer to file information to return */ -) +FRESULT f_readdir(DIR * dj, /* Pointer to the open directory object */ + FILINFO * fno /* Pointer to file information to return */ + ) { - FRESULT res; - NAMEBUF(sfn, lfn); + FRESULT res; + NAMEBUF(sfn, lfn); - res = validate(dj->fs, dj->id); /* Check validity of the object */ - if (res == FR_OK) { - INITBUF((*dj), sfn, lfn); - if (!fno) { - res = dir_seek(dj, 0); - } else { - res = dir_read(dj); - if (res == FR_NO_FILE) { - dj->sect = 0; - res = FR_OK; - } - if (res == FR_OK) { /* A valid entry is found */ - get_fileinfo(dj, fno); /* Get the object information */ - res = dir_next(dj, FALSE); /* Increment index for next */ - if (res == FR_NO_FILE) { - dj->sect = 0; - res = FR_OK; - } - } - } - } + res = validate(dj->fs, dj->id); /* Check validity of the object */ + if (res == FR_OK) { + INITBUF((*dj), sfn, lfn); + if (!fno) { + res = dir_seek(dj, 0); + } else { + res = dir_read(dj); + if (res == FR_NO_FILE) { + dj->sect = 0; + res = FR_OK; + } + if (res == FR_OK) { /* A valid entry is found */ + get_fileinfo(dj, fno); /* Get the object information */ + res = dir_next(dj, FALSE); /* Increment index for next */ + if (res == FR_NO_FILE) { + dj->sect = 0; + res = FR_OK; + } + } + } + } - LEAVE_FF(dj->fs, res); + LEAVE_FF(dj->fs, res); } #if _FS_MINIMIZE == 0 /*-----------------------------------------------------------------------*/ -/* Get File Status */ +/* + * Get File Status + */ /*-----------------------------------------------------------------------*/ -FRESULT f_stat ( - const char *path, /* Pointer to the file path */ - FILINFO *fno /* Pointer to file information to return */ -) +FRESULT f_stat(const char *path, /* Pointer to the file path */ + FILINFO * fno /* Pointer to file information to return */ + ) { - FRESULT res; - DIR dj; - NAMEBUF(sfn, lfn); + FRESULT res; + DIR dj; + NAMEBUF(sfn, lfn); - res = auto_mount(&path, &dj.fs, (BYTE)0); - if (res == FR_OK) { - INITBUF(dj, sfn, lfn); - res = follow_path(&dj, path); /* Follow the file path */ - if (res == FR_OK) { /* Follwo completed */ - if (dj.dir) /* Found an object */ - get_fileinfo(&dj, fno); - else /* It is root dir */ - res = FR_INVALID_NAME; - } - } + res = auto_mount(&path, &dj.fs, (BYTE) 0); + if (res == FR_OK) { + INITBUF(dj, sfn, lfn); + res = follow_path(&dj, path); /* Follow the file path */ + if (res == FR_OK) { /* Follwo completed */ + if (dj.dir) /* Found an object */ + get_fileinfo(&dj, fno); + else /* It is root dir */ + res = FR_INVALID_NAME; + } + } - LEAVE_FF(dj.fs, res); + LEAVE_FF(dj.fs, res); } #if !_FS_READONLY /*-----------------------------------------------------------------------*/ -/* Truncate File */ +/* + * Truncate File + */ /*-----------------------------------------------------------------------*/ -FRESULT f_truncate ( - FIL *fp /* Pointer to the file object */ -) +FRESULT f_truncate(FIL * fp /* Pointer to the file object */ + ) { - FRESULT res; - DWORD ncl; + FRESULT res; + DWORD ncl; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) LEAVE_FF(fp->fs, res); - if (fp->flag & FA__ERROR) /* Check abort flag */ - LEAVE_FF(fp->fs, FR_INT_ERR); - if (!(fp->flag & FA_WRITE)) /* Check access mode */ - LEAVE_FF(fp->fs, FR_DENIED); + res = validate(fp->fs, fp->id); /* Check validity of the object */ + if (res != FR_OK) + LEAVE_FF(fp->fs, res); + if (fp->flag & FA__ERROR) /* Check abort flag */ + LEAVE_FF(fp->fs, FR_INT_ERR); + if (!(fp->flag & FA_WRITE)) /* Check access mode */ + LEAVE_FF(fp->fs, FR_DENIED); - if (fp->fsize > fp->fptr) { - fp->fsize = fp->fptr; /* Set file size to current R/W point */ - fp->flag |= FA__WRITTEN; - if (fp->fptr == 0) { /* When set file size to zero, remove entire cluster chain */ - res = remove_chain(fp->fs, fp->org_clust); - fp->org_clust = 0; - } else { /* When truncate a part of the file, remove remaining clusters */ - ncl = get_cluster(fp->fs, fp->curr_clust); - res = FR_OK; - if (ncl == 0xFFFFFFFF) res = FR_DISK_ERR; - if (ncl == 1) res = FR_INT_ERR; - if (res == FR_OK && ncl < fp->fs->max_clust) { - res = put_cluster(fp->fs, fp->curr_clust, 0x0FFFFFFF); - if (res == FR_OK) res = remove_chain(fp->fs, ncl); - } - } - } - if (res != FR_OK) fp->flag |= FA__ERROR; + if (fp->fsize > fp->fptr) { + fp->fsize = fp->fptr; /* Set file size to current R/W point */ + fp->flag |= FA__WRITTEN; + if (fp->fptr == 0) { /* When set file size to zero, remove entire cluster chain */ + res = remove_chain(fp->fs, fp->org_clust); + fp->org_clust = 0; + } else { /* When truncate a part of the file, remove remaining clusters */ + ncl = get_cluster(fp->fs, fp->curr_clust); + res = FR_OK; + if (ncl == 0xFFFFFFFF) + res = FR_DISK_ERR; + if (ncl == 1) + res = FR_INT_ERR; + if (res == FR_OK && ncl < fp->fs->max_clust) { + res = put_cluster(fp->fs, fp->curr_clust, 0x0FFFFFFF); + if (res == FR_OK) + res = remove_chain(fp->fs, ncl); + } + } + } + if (res != FR_OK) + fp->flag |= FA__ERROR; - LEAVE_FF(fp->fs, res); + LEAVE_FF(fp->fs, res); } /*-----------------------------------------------------------------------*/ -/* Get Number of Free Clusters */ +/* + * Get Number of Free Clusters + */ /*-----------------------------------------------------------------------*/ -FRESULT f_getfree ( - const char *path, /* Pointer to the logical drive number (root dir) */ - DWORD *nclst, /* Pointer to the variable to return number of free clusters */ - FATFS **fatfs /* Pointer to pointer to corresponding file system object to return */ -) +FRESULT f_getfree(const char *path, /* Pointer to the logical drive number (root dir) */ + DWORD * nclst, /* Pointer to the variable to return number of free clusters */ + FATFS ** fatfs /* Pointer to pointer to corresponding file system object to return */ + ) { - FRESULT res; - DWORD n, clst, sect; - BYTE fat, f, *p; + FRESULT res; + DWORD n, clst, sect; + BYTE fat, f, *p; - /* Get drive number */ - res = auto_mount(&path, fatfs, (BYTE)0); - if (res != FR_OK) LEAVE_FF(*fatfs, res); + /* + * Get drive number + */ + res = auto_mount(&path, fatfs, (BYTE) 0); + if (res != FR_OK) + LEAVE_FF(*fatfs, res); - /* If number of free cluster is valid, return it without cluster scan. */ - if ((*fatfs)->free_clust <= (*fatfs)->max_clust - 2) { - *nclst = (*fatfs)->free_clust; - LEAVE_FF(*fatfs, FR_OK); - } + /* + * If number of free cluster is valid, return it without cluster scan. + */ + if ((*fatfs)->free_clust <= (*fatfs)->max_clust - 2) { + *nclst = (*fatfs)->free_clust; + LEAVE_FF(*fatfs, FR_OK); + } - /* Get number of free clusters */ - fat = (*fatfs)->fs_type; - n = 0; - if (fat == FS_FAT12) { - clst = 2; - do { - if ((WORD)get_cluster(*fatfs, clst) == 0) n++; - } while (++clst < (*fatfs)->max_clust); - } else { - clst = (*fatfs)->max_clust; - sect = (*fatfs)->fatbase; - f = 0; p = 0; - do { - if (!f) { - res = move_window(*fatfs, sect++); - if (res != FR_OK) - LEAVE_FF(*fatfs, res); - p = (*fatfs)->win; - } - if (fat == FS_FAT16) { - if (LD_WORD(p) == 0) n++; - p += 2; f += 1; - } else { - if (LD_DWORD(p) == 0) n++; - p += 4; f += 2; - } - } while (--clst); - } - (*fatfs)->free_clust = n; - if (fat == FS_FAT32) (*fatfs)->fsi_flag = 1; - *nclst = n; + /* + * Get number of free clusters + */ + fat = (*fatfs)->fs_type; + n = 0; + if (fat == FS_FAT12) { + clst = 2; + do { + if ((WORD) get_cluster(*fatfs, clst) == 0) + n++; + } while (++clst < (*fatfs)->max_clust); + } else { + clst = (*fatfs)->max_clust; + sect = (*fatfs)->fatbase; + f = 0; + p = 0; + do { + if (!f) { + res = move_window(*fatfs, sect++); + if (res != FR_OK) + LEAVE_FF(*fatfs, res); + p = (*fatfs)->win; + } + if (fat == FS_FAT16) { + if (LD_WORD(p) == 0) + n++; + p += 2; + f += 1; + } else { + if (LD_DWORD(p) == 0) + n++; + p += 4; + f += 2; + } + } while (--clst); + } + (*fatfs)->free_clust = n; + if (fat == FS_FAT32) + (*fatfs)->fsi_flag = 1; + *nclst = n; - LEAVE_FF(*fatfs, FR_OK); + LEAVE_FF(*fatfs, FR_OK); } /*-----------------------------------------------------------------------*/ -/* Delete a File or Directory */ +/* + * Delete a File or Directory + */ /*-----------------------------------------------------------------------*/ -FRESULT f_unlink ( - const char *path /* Pointer to the file or directory path */ -) +FRESULT f_unlink(const char *path /* Pointer to the file or directory path */ + ) { - FRESULT res; - DIR dj, sdj; - NAMEBUF(sfn, lfn); - BYTE *dir; - DWORD dclst; + FRESULT res; + DIR dj, sdj; + NAMEBUF(sfn, lfn); + BYTE *dir; + DWORD dclst; - res = auto_mount(&path, &dj.fs, (BYTE)1); - if (res != FR_OK) LEAVE_FF(dj.fs, res); + res = auto_mount(&path, &dj.fs, (BYTE) 1); + if (res != FR_OK) + LEAVE_FF(dj.fs, res); - INITBUF(dj, sfn, lfn); - res = follow_path(&dj, path); /* Follow the file path */ - if (res != FR_OK) LEAVE_FF(dj.fs, res); /* Follow failed */ + INITBUF(dj, sfn, lfn); + res = follow_path(&dj, path); /* Follow the file path */ + if (res != FR_OK) + LEAVE_FF(dj.fs, res); /* Follow failed */ - dir = dj.dir; - if (!dir) /* Is it the root directory? */ - LEAVE_FF(dj.fs, FR_INVALID_NAME); - if (dir[DIR_Attr] & AM_RDO) /* Is it a R/O object? */ - LEAVE_FF(dj.fs, FR_DENIED); - dclst = ((DWORD)LD_WORD(dir+DIR_FstClusHI) << 16) | LD_WORD(dir+DIR_FstClusLO); + dir = dj.dir; + if (!dir) /* Is it the root directory? */ + LEAVE_FF(dj.fs, FR_INVALID_NAME); + if (dir[DIR_Attr] & AM_RDO) /* Is it a R/O object? */ + LEAVE_FF(dj.fs, FR_DENIED); + dclst = + ((DWORD) LD_WORD(dir + DIR_FstClusHI) << 16) | LD_WORD(dir + + DIR_FstClusLO); - if (dir[DIR_Attr] & AM_DIR) { /* It is a sub-directory */ - if (dclst < 2) LEAVE_FF(dj.fs, FR_INT_ERR); - mem_cpy(&sdj, &dj, sizeof(DIR)); /* Check if the sub-dir is empty or not */ - sdj.sclust = dclst; - res = dir_seek(&sdj, 0); - if (res != FR_OK) LEAVE_FF(dj.fs, res); - res = dir_read(&sdj); - if (res == FR_OK) res = FR_DENIED; /* Not empty sub-dir */ - if (res != FR_NO_FILE) LEAVE_FF(dj.fs, res); - } + if (dir[DIR_Attr] & AM_DIR) { /* It is a sub-directory */ + if (dclst < 2) + LEAVE_FF(dj.fs, FR_INT_ERR); + mem_cpy(&sdj, &dj, sizeof(DIR)); /* Check if the sub-dir is empty or not */ + sdj.sclust = dclst; + res = dir_seek(&sdj, 0); + if (res != FR_OK) + LEAVE_FF(dj.fs, res); + res = dir_read(&sdj); + if (res == FR_OK) + res = FR_DENIED; /* Not empty sub-dir */ + if (res != FR_NO_FILE) + LEAVE_FF(dj.fs, res); + } - res = dir_remove(&dj); /* Remove directory entry */ - if (res == FR_OK) { - if (dclst) - res = remove_chain(dj.fs, dclst); /* Remove the cluster chain */ - if (res == FR_OK) res = sync(dj.fs); - } + res = dir_remove(&dj); /* Remove directory entry */ + if (res == FR_OK) { + if (dclst) + res = remove_chain(dj.fs, dclst); /* Remove the cluster chain */ + if (res == FR_OK) + res = sync(dj.fs); + } - LEAVE_FF(dj.fs, FR_OK); + LEAVE_FF(dj.fs, FR_OK); } /*-----------------------------------------------------------------------*/ -/* Create a Directory */ +/* + * Create a Directory + */ /*-----------------------------------------------------------------------*/ -FRESULT f_mkdir ( - const char *path /* Pointer to the directory path */ -) +FRESULT f_mkdir(const char *path /* Pointer to the directory path */ + ) { - FRESULT res; - DIR dj; - NAMEBUF(sfn, lfn); - BYTE *dir, n; - DWORD dsect, dclst, pclst, tim; + FRESULT res; + DIR dj; + NAMEBUF(sfn, lfn); + BYTE *dir, n; + DWORD dsect, dclst, pclst, tim; - res = auto_mount(&path, &dj.fs, (BYTE)1); - if (res != FR_OK) LEAVE_FF(dj.fs, res); + res = auto_mount(&path, &dj.fs, (BYTE) 1); + if (res != FR_OK) + LEAVE_FF(dj.fs, res); - INITBUF(dj, sfn, lfn); - res = follow_path(&dj, path); /* Follow the file path */ - if (res == FR_OK) res = FR_EXIST; /* Any file or directory is already existing */ - if (res != FR_NO_FILE) /* Any error occured */ - LEAVE_FF(dj.fs, res); + INITBUF(dj, sfn, lfn); + res = follow_path(&dj, path); /* Follow the file path */ + if (res == FR_OK) + res = FR_EXIST; /* Any file or directory is already existing */ + if (res != FR_NO_FILE) /* Any error occured */ + LEAVE_FF(dj.fs, res); - dclst = create_chain(dj.fs, (DWORD)0); /* Allocate a new cluster for new directory table */ - res = FR_OK; - if (dclst == 0) res = FR_DENIED; - if (dclst == 1) res = FR_INT_ERR; - if (dclst == 0xFFFFFFFF) res = FR_DISK_ERR; - if (res == FR_OK) - res = move_window(dj.fs,(DWORD) 0); - if (res != FR_OK) LEAVE_FF(dj.fs, res); - dsect = clust2sect(dj.fs, dclst); + dclst = create_chain(dj.fs, (DWORD) 0); /* Allocate a new cluster for new directory table */ + res = FR_OK; + if (dclst == 0) + res = FR_DENIED; + if (dclst == 1) + res = FR_INT_ERR; + if (dclst == 0xFFFFFFFF) + res = FR_DISK_ERR; + if (res == FR_OK) + res = move_window(dj.fs, (DWORD) 0); + if (res != FR_OK) + LEAVE_FF(dj.fs, res); + dsect = clust2sect(dj.fs, dclst); - dir = dj.fs->win; /* Initialize the new directory table */ - mem_set(dir, 0, SS(dj.fs)); - mem_set(dir+DIR_Name, ' ', 8+3); /* Create "." entry */ - dir[DIR_Name] = '.'; - dir[DIR_Attr] = AM_DIR; - tim = get_fattime(); - ST_DWORD(dir+DIR_WrtTime, tim); - ST_WORD(dir+DIR_FstClusLO, dclst); - ST_WORD(dir+DIR_FstClusHI, dclst >> 16); - mem_cpy(dir+32, dir, 32); /* Create ".." entry */ - dir[33] = '.'; - pclst = dj.sclust; - if (dj.fs->fs_type == FS_FAT32 && pclst == dj.fs->dirbase) - pclst = 0; - ST_WORD(dir+32+DIR_FstClusLO, pclst); - ST_WORD(dir+32+DIR_FstClusHI, pclst >> 16); - for (n = 0; n < dj.fs->csize; n++) { /* Write dot entries and clear left sectors */ - dj.fs->winsect = dsect++; - dj.fs->wflag = 1; - res = move_window(dj.fs,(DWORD) 0); - if (res) LEAVE_FF(dj.fs, res); - mem_set(dir, 0, SS(dj.fs)); - } + dir = dj.fs->win; /* Initialize the new directory table */ + mem_set(dir, 0, SS(dj.fs)); + mem_set(dir + DIR_Name, ' ', 8 + 3); /* Create "." entry */ + dir[DIR_Name] = '.'; + dir[DIR_Attr] = AM_DIR; + tim = get_fattime(); + ST_DWORD(dir + DIR_WrtTime, tim); + ST_WORD(dir + DIR_FstClusLO, dclst); + ST_WORD(dir + DIR_FstClusHI, dclst >> 16); + mem_cpy(dir + 32, dir, 32); /* Create ".." entry */ + dir[33] = '.'; + pclst = dj.sclust; + if (dj.fs->fs_type == FS_FAT32 && pclst == dj.fs->dirbase) + pclst = 0; + ST_WORD(dir + 32 + DIR_FstClusLO, pclst); + ST_WORD(dir + 32 + DIR_FstClusHI, pclst >> 16); + for (n = 0; n < dj.fs->csize; n++) { /* Write dot entries and clear left sectors */ + dj.fs->winsect = dsect++; + dj.fs->wflag = 1; + res = move_window(dj.fs, (DWORD) 0); + if (res) + LEAVE_FF(dj.fs, res); + mem_set(dir, 0, SS(dj.fs)); + } - res = dir_register(&dj); - if (res != FR_OK) { - remove_chain(dj.fs, dclst); - } else { - dir = dj.dir; - dir[DIR_Attr] = AM_DIR; /* Attribute */ - ST_DWORD(dir+DIR_WrtTime, tim); /* Crated time */ - ST_WORD(dir+DIR_FstClusLO, dclst); /* Table start cluster */ - ST_WORD(dir+DIR_FstClusHI, dclst >> 16); - dj.fs->wflag = 1; - res = sync(dj.fs); - } + res = dir_register(&dj); + if (res != FR_OK) { + remove_chain(dj.fs, dclst); + } else { + dir = dj.dir; + dir[DIR_Attr] = AM_DIR; /* Attribute */ + ST_DWORD(dir + DIR_WrtTime, tim); /* Crated time */ + ST_WORD(dir + DIR_FstClusLO, dclst); /* Table start cluster */ + ST_WORD(dir + DIR_FstClusHI, dclst >> 16); + dj.fs->wflag = 1; + res = sync(dj.fs); + } - LEAVE_FF(dj.fs, res); + LEAVE_FF(dj.fs, res); } /*-----------------------------------------------------------------------*/ -/* Change File Attribute */ +/* + * Change File Attribute + */ /*-----------------------------------------------------------------------*/ -FRESULT f_chmod ( - const char *path, /* Pointer to the file path */ - BYTE value, /* Attribute bits */ - BYTE mask /* Attribute mask to change */ -) +FRESULT f_chmod(const char *path, /* Pointer to the file path */ + BYTE value, /* Attribute bits */ + BYTE mask /* Attribute mask to change */ + ) { - FRESULT res; - DIR dj; - NAMEBUF(sfn, lfn); - BYTE *dir; + FRESULT res; + DIR dj; + NAMEBUF(sfn, lfn); + BYTE *dir; - res = auto_mount(&path, &dj.fs,(BYTE) 1); - if (res == FR_OK) { - INITBUF(dj, sfn, lfn); - res = follow_path(&dj, path); /* Follow the file path */ - if (res == FR_OK) { - dir = dj.dir; - if (!dir) { /* Is it a root directory? */ - res = FR_INVALID_NAME; - } else { /* File or sub directory */ - mask &= AM_RDO|AM_HID|AM_SYS|AM_ARC; /* Valid attribute mask */ - dir[DIR_Attr] = (value & mask) | (dir[DIR_Attr] & (BYTE)~mask); /* Apply attribute change */ - dj.fs->wflag = 1; - res = sync(dj.fs); - } - } - } + res = auto_mount(&path, &dj.fs, (BYTE) 1); + if (res == FR_OK) { + INITBUF(dj, sfn, lfn); + res = follow_path(&dj, path); /* Follow the file path */ + if (res == FR_OK) { + dir = dj.dir; + if (!dir) { /* Is it a root directory? */ + res = FR_INVALID_NAME; + } else { /* File or sub directory */ + mask &= AM_RDO | AM_HID | AM_SYS | AM_ARC; /* Valid attribute mask */ + dir[DIR_Attr] = (value & mask) | (dir[DIR_Attr] & (BYTE) ~ mask); /* Apply attribute change */ + dj.fs->wflag = 1; + res = sync(dj.fs); + } + } + } - LEAVE_FF(dj.fs, res); + LEAVE_FF(dj.fs, res); } /*-----------------------------------------------------------------------*/ -/* Change Timestamp */ +/* + * Change Timestamp + */ /*-----------------------------------------------------------------------*/ -FRESULT f_utime ( - const char *path, /* Pointer to the file/directory name */ - const FILINFO *fno /* Pointer to the timestamp to be set */ -) +FRESULT f_utime(const char *path, /* Pointer to the file/directory name */ + const FILINFO * fno /* Pointer to the timestamp to be set */ + ) { - FRESULT res; - DIR dj; - NAMEBUF(sfn, lfn); - BYTE *dir; + FRESULT res; + DIR dj; + NAMEBUF(sfn, lfn); + BYTE *dir; - res = auto_mount(&path, &dj.fs,(BYTE) 1); - if (res == FR_OK) { - INITBUF(dj, sfn, lfn); - res = follow_path(&dj, path); /* Follow the file path */ - if (res == FR_OK) { - dir = dj.dir; - if (!dir) { /* Root directory */ - res = FR_INVALID_NAME; - } else { /* File or sub-directory */ - ST_WORD(dir+DIR_WrtTime, fno->ftime); - ST_WORD(dir+DIR_WrtDate, fno->fdate); - dj.fs->wflag = 1; - res = sync(dj.fs); - } - } - } + res = auto_mount(&path, &dj.fs, (BYTE) 1); + if (res == FR_OK) { + INITBUF(dj, sfn, lfn); + res = follow_path(&dj, path); /* Follow the file path */ + if (res == FR_OK) { + dir = dj.dir; + if (!dir) { /* Root directory */ + res = FR_INVALID_NAME; + } else { /* File or sub-directory */ + ST_WORD(dir + DIR_WrtTime, fno->ftime); + ST_WORD(dir + DIR_WrtDate, fno->fdate); + dj.fs->wflag = 1; + res = sync(dj.fs); + } + } + } - LEAVE_FF(dj.fs, res); + LEAVE_FF(dj.fs, res); } /*-----------------------------------------------------------------------*/ -/* Rename File/Directory */ +/* + * Rename File/Directory + */ /*-----------------------------------------------------------------------*/ -FRESULT f_rename ( - const char *path_old, /* Pointer to the old name */ - const char *path_new /* Pointer to the new name */ -) +FRESULT f_rename(const char *path_old, /* Pointer to the old name */ + const char *path_new /* Pointer to the new name */ + ) { - FRESULT res; - DIR dj_old, dj_new; - NAMEBUF(sfn, lfn); - BYTE buf[21], *dir; - DWORD dw; + FRESULT res; + DIR dj_old, dj_new; + NAMEBUF(sfn, lfn); + BYTE buf[21], *dir; + DWORD dw; - INITBUF(dj_old, sfn, lfn); - res = auto_mount(&path_old, &dj_old.fs,(BYTE) 1); - if (res == FR_OK) { - dj_new.fs = dj_old.fs; - res = follow_path(&dj_old, path_old); /* Check old object */ - } - if (res != FR_OK) LEAVE_FF(dj_old.fs, res); /* The old object is not found */ + INITBUF(dj_old, sfn, lfn); + res = auto_mount(&path_old, &dj_old.fs, (BYTE) 1); + if (res == FR_OK) { + dj_new.fs = dj_old.fs; + res = follow_path(&dj_old, path_old); /* Check old object */ + } + if (res != FR_OK) + LEAVE_FF(dj_old.fs, res); /* The old object is not found */ - if (!dj_old.dir) LEAVE_FF(dj_old.fs, FR_NO_FILE); /* Is root dir? */ - mem_cpy(buf, dj_old.dir+DIR_Attr, 21); /* Save the object information */ + if (!dj_old.dir) + LEAVE_FF(dj_old.fs, FR_NO_FILE); /* Is root dir? */ + mem_cpy(buf, dj_old.dir + DIR_Attr, 21); /* Save the object information */ - mem_cpy(&dj_new, &dj_old, sizeof(DIR)); - res = follow_path(&dj_new, path_new); /* Check new object */ - if (res == FR_OK) res = FR_EXIST; /* The new object name is already existing */ - if (res == FR_NO_FILE) { /* Is it a valid path and no name collision? */ - res = dir_register(&dj_new); /* Register the new object */ - if (res == FR_OK) { - dir = dj_new.dir; /* Copy object information into new entry */ - mem_cpy(dir+13, buf+2, 19); - dir[DIR_Attr] = buf[0]; - dj_old.fs->wflag = 1; - if (dir[DIR_Attr] & AM_DIR) { /* Update .. entry in the directory if needed */ - dw = clust2sect(dj_new.fs, (DWORD)LD_WORD(dir+DIR_FstClusHI) | LD_WORD(dir+DIR_FstClusLO)); - if (!dw) { - res = FR_INT_ERR; - } else { - res = move_window(dj_new.fs, dw); - dir = dj_new.fs->win+32; - if (res == FR_OK && dir[1] == '.') { - dw = (dj_new.fs->fs_type == FS_FAT32 && dj_new.sclust == dj_new.fs->dirbase) ? 0 : dj_new.sclust; - ST_WORD(dir+DIR_FstClusLO, dw); - ST_WORD(dir+DIR_FstClusHI, dw >> 16); - dj_new.fs->wflag = 1; - } - } - } - if (res == FR_OK) { - res = dir_remove(&dj_old); /* Remove old entry */ - if (res == FR_OK) - res = sync(dj_old.fs); - } - } - } + mem_cpy(&dj_new, &dj_old, sizeof(DIR)); + res = follow_path(&dj_new, path_new); /* Check new object */ + if (res == FR_OK) + res = FR_EXIST; /* The new object name is already existing */ + if (res == FR_NO_FILE) { /* Is it a valid path and no name collision? */ + res = dir_register(&dj_new); /* Register the new object */ + if (res == FR_OK) { + dir = dj_new.dir; /* Copy object information into new entry */ + mem_cpy(dir + 13, buf + 2, 19); + dir[DIR_Attr] = buf[0]; + dj_old.fs->wflag = 1; + if (dir[DIR_Attr] & AM_DIR) { /* Update .. entry in the directory if needed */ + dw = clust2sect(dj_new.fs, + (DWORD) LD_WORD(dir + + DIR_FstClusHI) | LD_WORD(dir + + DIR_FstClusLO)); + if (!dw) { + res = FR_INT_ERR; + } else { + res = move_window(dj_new.fs, dw); + dir = dj_new.fs->win + 32; + if (res == FR_OK && dir[1] == '.') { + dw = (dj_new.fs->fs_type == FS_FAT32 + && dj_new.sclust == + dj_new.fs->dirbase) ? 0 : dj_new.sclust; + ST_WORD(dir + DIR_FstClusLO, dw); + ST_WORD(dir + DIR_FstClusHI, dw >> 16); + dj_new.fs->wflag = 1; + } + } + } + if (res == FR_OK) { + res = dir_remove(&dj_old); /* Remove old entry */ + if (res == FR_OK) + res = sync(dj_old.fs); + } + } + } - LEAVE_FF(dj_old.fs, res); + LEAVE_FF(dj_old.fs, res); } -#endif /* !_FS_READONLY */ -#endif /* _FS_MINIMIZE == 0 */ -#endif /* _FS_MINIMIZE <= 1 */ -#endif /* _FS_MINIMIZE <= 2 */ +#endif /* !_FS_READONLY */ +#endif /* _FS_MINIMIZE == 0 */ +#endif /* _FS_MINIMIZE <= 1 */ +#endif /* _FS_MINIMIZE <= 2 */ /*-----------------------------------------------------------------------*/ -/* Forward data to the stream directly (Available on only _FS_TINY cfg) */ +/* + * Forward data to the stream directly (Available on only _FS_TINY cfg) + */ /*-----------------------------------------------------------------------*/ #if _USE_FORWARD && _FS_TINY -FRESULT f_forward ( - FIL *fp, /* Pointer to the file object */ - UINT (*func)(const BYTE*,UINT), /* Pointer to the streaming function */ - UINT btr, /* Number of bytes to forward */ - UINT *bf /* Pointer to number of bytes forwarded */ -) +FRESULT f_forward(FIL * fp, /* Pointer to the file object */ + UINT(*func) (const BYTE *, UINT), /* Pointer to the streaming function */ + UINT btr, /* Number of bytes to forward */ + UINT * bf /* Pointer to number of bytes forwarded */ + ) { - FRESULT res; - DWORD remain, clst, sect; - UINT rcnt; + FRESULT res; + DWORD remain, clst, sect; + UINT rcnt; - *bf = 0; + *bf = 0; - res = validate(fp->fs, fp->id); /* Check validity of the object */ - if (res != FR_OK) LEAVE_FF(fp->fs, res); - if (fp->flag & FA__ERROR) /* Check error flag */ - LEAVE_FF(fp->fs, FR_INT_ERR); - if (!(fp->flag & FA_READ)) /* Check access mode */ - LEAVE_FF(fp->fs, FR_DENIED); + res = validate(fp->fs, fp->id); /* Check validity of the object */ + if (res != FR_OK) + LEAVE_FF(fp->fs, res); + if (fp->flag & FA__ERROR) /* Check error flag */ + LEAVE_FF(fp->fs, FR_INT_ERR); + if (!(fp->flag & FA_READ)) /* Check access mode */ + LEAVE_FF(fp->fs, FR_DENIED); - remain = fp->fsize - fp->fptr; - if (btr > remain) btr = (UINT)remain; /* Truncate btr by remaining bytes */ + remain = fp->fsize - fp->fptr; + if (btr > remain) + btr = (UINT) remain; /* Truncate btr by remaining bytes */ - for ( ; btr && (*func)(NULL, 0); /* Repeat until all data transferred or stream becomes busy */ - fp->fptr += rcnt, *bf += rcnt, btr -= rcnt) { - if ((fp->fptr % SS(fp->fs)) == 0) { /* On the sector boundary? */ - if (fp->csect >= fp->fs->csize) { /* On the cluster boundary? */ - clst = (fp->fptr == 0) ? /* On the top of the file? */ - fp->org_clust : get_cluster(fp->fs, fp->curr_clust); - if (clst <= 1) ABORT(fp->fs, FR_INT_ERR); - if (clst == 0xFFFFFFFF) ABORT(fp->fs, FR_DISK_ERR); - fp->curr_clust = clst; /* Update current cluster */ - fp->csect = 0; /* Reset sector address in the cluster */ - } - fp->csect++; /* Next sector address in the cluster */ - } - sect = clust2sect(fp->fs, fp->curr_clust); /* Get current data sector */ - if (!sect) ABORT(fp->fs, FR_INT_ERR); - sect += fp->csect - 1; - if (move_window(fp->fs, sect)) /* Move sector window */ - ABORT(fp->fs, FR_DISK_ERR); - fp->dsect = sect; - rcnt = SS(fp->fs) - (WORD)(fp->fptr % SS(fp->fs)); /* Forward data from sector window */ - if (rcnt > btr) rcnt = btr; - rcnt = (*func)(&fp->fs->win[(WORD)fp->fptr % SS(fp->fs)], rcnt); - if (!rcnt) ABORT(fp->fs, FR_INT_ERR); - } + for (; btr && (*func) (NULL, 0); /* Repeat until all data transferred or stream becomes busy */ + fp->fptr += rcnt, *bf += rcnt, btr -= rcnt) { + if ((fp->fptr % SS(fp->fs)) == 0) { /* On the sector boundary? */ + if (fp->csect >= fp->fs->csize) { /* On the cluster boundary? */ + clst = (fp->fptr == 0) ? /* On the top of the file? */ + fp->org_clust : get_cluster(fp->fs, fp->curr_clust); + if (clst <= 1) + ABORT(fp->fs, FR_INT_ERR); + if (clst == 0xFFFFFFFF) + ABORT(fp->fs, FR_DISK_ERR); + fp->curr_clust = clst; /* Update current cluster */ + fp->csect = 0; /* Reset sector address in the cluster */ + } + fp->csect++; /* Next sector address in the cluster */ + } + sect = clust2sect(fp->fs, fp->curr_clust); /* Get current data sector */ + if (!sect) + ABORT(fp->fs, FR_INT_ERR); + sect += fp->csect - 1; + if (move_window(fp->fs, sect)) /* Move sector window */ + ABORT(fp->fs, FR_DISK_ERR); + fp->dsect = sect; + rcnt = SS(fp->fs) - (WORD) (fp->fptr % SS(fp->fs)); /* Forward data from sector window */ + if (rcnt > btr) + rcnt = btr; + rcnt = (*func) (&fp->fs->win[(WORD) fp->fptr % SS(fp->fs)], rcnt); + if (!rcnt) + ABORT(fp->fs, FR_INT_ERR); + } - LEAVE_FF(fp->fs, FR_OK); + LEAVE_FF(fp->fs, FR_OK); } -#endif /* _USE_FORWARD */ +#endif /* _USE_FORWARD */ #if _USE_MKFS && !_FS_READONLY /*-----------------------------------------------------------------------*/ -/* Create File System on the Drive */ +/* + * Create File System on the Drive + */ /*-----------------------------------------------------------------------*/ -#define N_ROOTDIR 512 /* Multiple of 32 and <= 2048 */ -#define N_FATS 1 /* 1 or 2 */ -#define MAX_SECTOR 131072000UL /* Maximum partition size */ -#define MIN_SECTOR 2000UL /* Minimum partition size */ +#define N_ROOTDIR 512 /* Multiple of 32 and <= 2048 */ +#define N_FATS 1 /* 1 or 2 */ +#define MAX_SECTOR 131072000UL /* Maximum partition size */ +#define MIN_SECTOR 2000UL /* Minimum partition size */ -FRESULT f_mkfs ( - BYTE drv, /* Logical drive number */ - BYTE partition, /* Partitioning rule 0:FDISK, 1:SFD */ - WORD allocsize /* Allocation unit size [bytes] */ -) +FRESULT f_mkfs(BYTE drv, /* Logical drive number */ + BYTE partition, /* Partitioning rule 0:FDISK, 1:SFD */ + WORD allocsize /* Allocation unit size [bytes] */ + ) { - static const DWORD sstbl[] = { 2048000, 1024000, 512000, 256000, 128000, 64000, 32000, 16000, 8000, 4000, 0 }; - static const WORD cstbl[] = { 32768, 16384, 8192, 4096, 2048, 16384, 8192, 4096, 2048, 1024, 512 }; - BYTE fmt, m, *tbl; - DWORD b_part, b_fat, b_dir, b_data; /* Area offset (LBA) */ - DWORD n_part, n_rsv, n_fat, n_dir; /* Area size */ - DWORD n_clst, n; - WORD as; - FATFS *fs; - DSTATUS stat; + static const DWORD sstbl[] = + { 2048000, 1024000, 512000, 256000, 128000, 64000, 32000, 16000, 8000, +4000, 0 }; + static const WORD cstbl[] = + { 32768, 16384, 8192, 4096, 2048, 16384, 8192, 4096, 2048, 1024, 512 }; + BYTE fmt, m, *tbl; + DWORD b_part, b_fat, b_dir, b_data; /* Area offset (LBA) */ + DWORD n_part, n_rsv, n_fat, n_dir; /* Area size */ + DWORD n_clst, n; + WORD as; + FATFS *fs; + DSTATUS stat; - /* Check validity of the parameters */ - if (drv >= _DRIVES) return FR_INVALID_DRIVE; - if (partition >= 2) return FR_MKFS_ABORTED; + /* + * Check validity of the parameters + */ + if (drv >= _DRIVES) + return FR_INVALID_DRIVE; + if (partition >= 2) + return FR_MKFS_ABORTED; - /* Check mounted drive and clear work area */ - fs = FatFs[drv]; - if (!fs) return FR_NOT_ENABLED; - fs->fs_type = 0; - drv = LD2PD(drv); + /* + * Check mounted drive and clear work area + */ + fs = FatFs[drv]; + if (!fs) + return FR_NOT_ENABLED; + fs->fs_type = 0; + drv = LD2PD(drv); - /* Get disk statics */ - stat = disk_initialize(drv); - if (stat & STA_NOINIT) return FR_NOT_READY; - if (stat & STA_PROTECT) return FR_WRITE_PROTECTED; - if (disk_ioctl(drv, GET_SECTOR_COUNT, &n_part) != RES_OK || n_part < MIN_SECTOR) - return FR_MKFS_ABORTED; - if (n_part > MAX_SECTOR) n_part = MAX_SECTOR; - b_part = (!partition) ? 63 : 0; /* Boot sector */ - n_part -= b_part; + /* + * Get disk statics + */ + stat = disk_initialize(drv); + if (stat & STA_NOINIT) + return FR_NOT_READY; + if (stat & STA_PROTECT) + return FR_WRITE_PROTECTED; + if (disk_ioctl(drv, GET_SECTOR_COUNT, &n_part) != RES_OK + || n_part < MIN_SECTOR) + return FR_MKFS_ABORTED; + if (n_part > MAX_SECTOR) + n_part = MAX_SECTOR; + b_part = (!partition) ? 63 : 0; /* Boot sector */ + n_part -= b_part; #if _MAX_SS == 512 - if (!allocsize) { /* Auto selection of cluster size */ - for (n = 0; n_part < sstbl[n]; n++) ; - allocsize = cstbl[n]; - } + if (!allocsize) { /* Auto selection of cluster size */ + for (n = 0; n_part < sstbl[n]; n++); + allocsize = cstbl[n]; + } #endif - for (as = 512; as <= 32768U && as != allocsize; as <<= 1); - if (as != allocsize) return FR_MKFS_ABORTED; -#if _MAX_SS != 512 /* Check disk sector size */ - if (disk_ioctl(drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK - || SS(fs) > _MAX_SS - || SS(fs) > allocsize) - return FR_MKFS_ABORTED; + for (as = 512; as <= 32768U && as != allocsize; as <<= 1); + if (as != allocsize) + return FR_MKFS_ABORTED; +#if _MAX_SS != 512 /* Check disk sector size */ + if (disk_ioctl(drv, GET_SECTOR_SIZE, &SS(fs)) != RES_OK + || SS(fs) > _MAX_SS || SS(fs) > allocsize) + return FR_MKFS_ABORTED; #endif - allocsize /= SS(fs); /* Number of sectors per cluster */ + allocsize /= SS(fs); /* Number of sectors per cluster */ - /* Pre-compute number of clusters and FAT type */ - n_clst = n_part / allocsize; - fmt = FS_FAT12; - if (n_clst >= 0xFF5) fmt = FS_FAT16; - if (n_clst >= 0xFFF5) fmt = FS_FAT32; + /* + * Pre-compute number of clusters and FAT type + */ + n_clst = n_part / allocsize; + fmt = FS_FAT12; + if (n_clst >= 0xFF5) + fmt = FS_FAT16; + if (n_clst >= 0xFFF5) + fmt = FS_FAT32; - /* Determine offset and size of FAT structure */ - switch (fmt) { - case FS_FAT12: - n_fat = ((n_clst * 3 + 1) / 2 + 3 + SS(fs) - 1) / SS(fs); - n_rsv = 1 + partition; - n_dir = N_ROOTDIR * 32 / SS(fs); - break; - case FS_FAT16: - n_fat = ((n_clst * 2) + 4 + SS(fs) - 1) / SS(fs); - n_rsv = 1 + partition; - n_dir = N_ROOTDIR * 32 / SS(fs); - break; - default: - n_fat = ((n_clst * 4) + 8 + SS(fs) - 1) / SS(fs); - n_rsv = 33 - partition; - n_dir = 0; - } - b_fat = b_part + n_rsv; /* FATs start sector */ - b_dir = b_fat + n_fat * N_FATS; /* Directory start sector */ - b_data = b_dir + n_dir; /* Data start sector */ + /* + * Determine offset and size of FAT structure + */ + switch (fmt) { + case FS_FAT12: + n_fat = ((n_clst * 3 + 1) / 2 + 3 + SS(fs) - 1) / SS(fs); + n_rsv = 1 + partition; + n_dir = N_ROOTDIR * 32 / SS(fs); + break; + case FS_FAT16: + n_fat = ((n_clst * 2) + 4 + SS(fs) - 1) / SS(fs); + n_rsv = 1 + partition; + n_dir = N_ROOTDIR * 32 / SS(fs); + break; + default: + n_fat = ((n_clst * 4) + 8 + SS(fs) - 1) / SS(fs); + n_rsv = 33 - partition; + n_dir = 0; + } + b_fat = b_part + n_rsv; /* FATs start sector */ + b_dir = b_fat + n_fat * N_FATS; /* Directory start sector */ + b_data = b_dir + n_dir; /* Data start sector */ - /* Align data start sector to erase block boundary (for flash memory media) */ - if (disk_ioctl(drv, GET_BLOCK_SIZE, &n) != RES_OK) return FR_MKFS_ABORTED; - n = (b_data + n - 1) & ~(n - 1); - n_fat += (n - b_data) / N_FATS; - /* b_dir and b_data are no longer used below */ + /* + * Align data start sector to erase block boundary (for flash memory media) + */ + if (disk_ioctl(drv, GET_BLOCK_SIZE, &n) != RES_OK) + return FR_MKFS_ABORTED; + n = (b_data + n - 1) & ~(n - 1); + n_fat += (n - b_data) / N_FATS; + /* + * b_dir and b_data are no longer used below + */ - /* Determine number of cluster and final check of validity of the FAT type */ - n_clst = (n_part - n_rsv - n_fat * N_FATS - n_dir) / allocsize; - if ( (fmt == FS_FAT16 && n_clst < 0xFF5) - || (fmt == FS_FAT32 && n_clst < 0xFFF5)) - return FR_MKFS_ABORTED; + /* + * Determine number of cluster and final check of validity of the FAT type + */ + n_clst = (n_part - n_rsv - n_fat * N_FATS - n_dir) / allocsize; + if ((fmt == FS_FAT16 && n_clst < 0xFF5) + || (fmt == FS_FAT32 && n_clst < 0xFFF5)) + return FR_MKFS_ABORTED; - /* Create partition table if needed */ - if (!partition) { - DWORD n_disk = b_part + n_part; + /* + * Create partition table if needed + */ + if (!partition) { + DWORD n_disk = b_part + n_part; - tbl = fs->win+MBR_Table; - ST_DWORD(tbl, 0x00010180); /* Partition start in CHS */ - if (n_disk < 63UL * 255 * 1024) { /* Partition end in CHS */ - n_disk = n_disk / 63 / 255; - tbl[7] = (BYTE)n_disk; - tbl[6] = (BYTE)((n_disk >> 2) | 63); - } else { - ST_WORD(&tbl[6], 0xFFFF); - } - tbl[5] = 254; - if (fmt != FS_FAT32) /* System ID */ - tbl[4] = (n_part < 0x10000) ? 0x04 : 0x06; - else - tbl[4] = 0x0c; - ST_DWORD(tbl+8, 63); /* Partition start in LBA */ - ST_DWORD(tbl+12, n_part); /* Partition size in LBA */ - ST_WORD(tbl+64, 0xAA55); /* Signature */ - if (disk_write(drv, fs->win, 0, (BYTE)1) != RES_OK) - return FR_DISK_ERR; - } + tbl = fs->win + MBR_Table; + ST_DWORD(tbl, 0x00010180); /* Partition start in CHS */ + if (n_disk < 63UL * 255 * 1024) { /* Partition end in CHS */ + n_disk = n_disk / 63 / 255; + tbl[7] = (BYTE) n_disk; + tbl[6] = (BYTE) ((n_disk >> 2) | 63); + } else { + ST_WORD(&tbl[6], 0xFFFF); + } + tbl[5] = 254; + if (fmt != FS_FAT32) /* System ID */ + tbl[4] = (n_part < 0x10000) ? 0x04 : 0x06; + else + tbl[4] = 0x0c; + ST_DWORD(tbl + 8, 63); /* Partition start in LBA */ + ST_DWORD(tbl + 12, n_part); /* Partition size in LBA */ + ST_WORD(tbl + 64, 0xAA55); /* Signature */ + if (disk_write(drv, fs->win, 0, (BYTE) 1) != RES_OK) + return FR_DISK_ERR; + } - /* Create boot record */ - tbl = fs->win; /* Clear buffer */ - mem_set(tbl, 0, SS(fs)); - ST_DWORD(tbl+BS_jmpBoot, 0x90FEEB); /* Boot code (jmp $, nop) */ - ST_WORD(tbl+BPB_BytsPerSec, SS(fs)); /* Sector size */ - tbl[BPB_SecPerClus] = (BYTE)allocsize; /* Sectors per cluster */ - ST_WORD(tbl+BPB_RsvdSecCnt, n_rsv); /* Reserved sectors */ - tbl[BPB_NumFATs] = N_FATS; /* Number of FATs */ - ST_WORD(tbl+BPB_RootEntCnt, SS(fs) / 32 * n_dir); /* Number of rootdir entries */ - if (n_part < 0x10000) { /* Number of total sectors */ - ST_WORD(tbl+BPB_TotSec16, n_part); - } else { - ST_DWORD(tbl+BPB_TotSec32, n_part); - } - tbl[BPB_Media] = 0xF8; /* Media descripter */ - ST_WORD(tbl+BPB_SecPerTrk, 63); /* Number of sectors per track */ - ST_WORD(tbl+BPB_NumHeads, 255); /* Number of heads */ - ST_DWORD(tbl+BPB_HiddSec, b_part); /* Hidden sectors */ - n = get_fattime(); /* Use current time as a VSN */ - if (fmt != FS_FAT32) { - ST_DWORD(tbl+BS_VolID, n); /* Volume serial number */ - ST_WORD(tbl+BPB_FATSz16, n_fat); /* Number of secters per FAT */ - tbl[BS_DrvNum] = 0x80; /* Drive number */ - tbl[BS_BootSig] = 0x29; /* Extended boot signature */ - mem_cpy(tbl+BS_VolLab, "NO NAME FAT ", 19); /* Volume lavel, FAT signature */ - } else { - ST_DWORD(tbl+BS_VolID32, n); /* Volume serial number */ - ST_DWORD(tbl+BPB_FATSz32, n_fat); /* Number of secters per FAT */ - ST_DWORD(tbl+BPB_RootClus, 2); /* Root directory cluster (2) */ - ST_WORD(tbl+BPB_FSInfo, 1); /* FSInfo record offset (bs+1) */ - ST_WORD(tbl+BPB_BkBootSec, 6); /* Backup boot record offset (bs+6) */ - tbl[BS_DrvNum32] = 0x80; /* Drive number */ - tbl[BS_BootSig32] = 0x29; /* Extended boot signature */ - mem_cpy(tbl+BS_VolLab32, "NO NAME FAT32 ", 19); /* Volume lavel, FAT signature */ - } - ST_WORD(tbl+BS_55AA, 0xAA55); /* Signature */ - if (disk_write(drv, tbl, b_part+0,(BYTE) 1) != RES_OK) - return FR_DISK_ERR; - if (fmt == FS_FAT32) - disk_write(drv, tbl, b_part+6, (BYTE)1); + /* + * Create boot record + */ + tbl = fs->win; /* Clear buffer */ + mem_set(tbl, 0, SS(fs)); + ST_DWORD(tbl + BS_jmpBoot, 0x90FEEB); /* Boot code (jmp $, nop) */ + ST_WORD(tbl + BPB_BytsPerSec, SS(fs)); /* Sector size */ + tbl[BPB_SecPerClus] = (BYTE) allocsize; /* Sectors per cluster */ + ST_WORD(tbl + BPB_RsvdSecCnt, n_rsv); /* Reserved sectors */ + tbl[BPB_NumFATs] = N_FATS; /* Number of FATs */ + ST_WORD(tbl + BPB_RootEntCnt, SS(fs) / 32 * n_dir); /* Number of rootdir entries */ + if (n_part < 0x10000) { /* Number of total sectors */ + ST_WORD(tbl + BPB_TotSec16, n_part); + } else { + ST_DWORD(tbl + BPB_TotSec32, n_part); + } + tbl[BPB_Media] = 0xF8; /* Media descripter */ + ST_WORD(tbl + BPB_SecPerTrk, 63); /* Number of sectors per track */ + ST_WORD(tbl + BPB_NumHeads, 255); /* Number of heads */ + ST_DWORD(tbl + BPB_HiddSec, b_part); /* Hidden sectors */ + n = get_fattime(); /* Use current time as a VSN */ + if (fmt != FS_FAT32) { + ST_DWORD(tbl + BS_VolID, n); /* Volume serial number */ + ST_WORD(tbl + BPB_FATSz16, n_fat); /* Number of secters per FAT */ + tbl[BS_DrvNum] = 0x80; /* Drive number */ + tbl[BS_BootSig] = 0x29; /* Extended boot signature */ + mem_cpy(tbl + BS_VolLab, "NO NAME FAT ", 19); /* Volume lavel, FAT signature */ + } else { + ST_DWORD(tbl + BS_VolID32, n); /* Volume serial number */ + ST_DWORD(tbl + BPB_FATSz32, n_fat); /* Number of secters per FAT */ + ST_DWORD(tbl + BPB_RootClus, 2); /* Root directory cluster (2) */ + ST_WORD(tbl + BPB_FSInfo, 1); /* FSInfo record offset (bs+1) */ + ST_WORD(tbl + BPB_BkBootSec, 6); /* Backup boot record offset (bs+6) */ + tbl[BS_DrvNum32] = 0x80; /* Drive number */ + tbl[BS_BootSig32] = 0x29; /* Extended boot signature */ + mem_cpy(tbl + BS_VolLab32, "NO NAME FAT32 ", 19); /* Volume lavel, FAT signature */ + } + ST_WORD(tbl + BS_55AA, 0xAA55); /* Signature */ + if (disk_write(drv, tbl, b_part + 0, (BYTE) 1) != RES_OK) + return FR_DISK_ERR; + if (fmt == FS_FAT32) + disk_write(drv, tbl, b_part + 6, (BYTE) 1); - /* Initialize FAT area */ - for (m = 0; m < N_FATS; m++) { - mem_set(tbl, 0, SS(fs)); /* 1st sector of the FAT */ - if (fmt != FS_FAT32) { - n = (fmt == FS_FAT12) ? 0x00FFFFF8 : 0xFFFFFFF8; - ST_DWORD(tbl, n); /* Reserve cluster #0-1 (FAT12/16) */ - } else { - ST_DWORD(tbl+0, 0xFFFFFFF8); /* Reserve cluster #0-1 (FAT32) */ - ST_DWORD(tbl+4, 0xFFFFFFFF); - ST_DWORD(tbl+8, 0x0FFFFFFF); /* Reserve cluster #2 for root dir */ - } - if (disk_write(drv, tbl, b_fat++,(BYTE) 1) != RES_OK) - return FR_DISK_ERR; - mem_set(tbl, 0, SS(fs)); /* Following FAT entries are filled by zero */ - for (n = 1; n < n_fat; n++) { - if (disk_write(drv, tbl, b_fat++,(BYTE) 1) != RES_OK) - return FR_DISK_ERR; - } - } + /* + * Initialize FAT area + */ + for (m = 0; m < N_FATS; m++) { + mem_set(tbl, 0, SS(fs)); /* 1st sector of the FAT */ + if (fmt != FS_FAT32) { + n = (fmt == FS_FAT12) ? 0x00FFFFF8 : 0xFFFFFFF8; + ST_DWORD(tbl, n); /* Reserve cluster #0-1 (FAT12/16) */ + } else { + ST_DWORD(tbl + 0, 0xFFFFFFF8); /* Reserve cluster #0-1 (FAT32) */ + ST_DWORD(tbl + 4, 0xFFFFFFFF); + ST_DWORD(tbl + 8, 0x0FFFFFFF); /* Reserve cluster #2 for root dir */ + } + if (disk_write(drv, tbl, b_fat++, (BYTE) 1) != RES_OK) + return FR_DISK_ERR; + mem_set(tbl, 0, SS(fs)); /* Following FAT entries are filled by zero */ + for (n = 1; n < n_fat; n++) { + if (disk_write(drv, tbl, b_fat++, (BYTE) 1) != RES_OK) + return FR_DISK_ERR; + } + } - /* Initialize Root directory */ - m = (BYTE)((fmt == FS_FAT32) ? allocsize : n_dir); - do { - if (disk_write(drv, tbl, b_fat++, (BYTE)1) != RES_OK) - return FR_DISK_ERR; - } while (--m); + /* + * Initialize Root directory + */ + m = (BYTE) ((fmt == FS_FAT32) ? allocsize : n_dir); + do { + if (disk_write(drv, tbl, b_fat++, (BYTE) 1) != RES_OK) + return FR_DISK_ERR; + } while (--m); - /* Create FSInfo record if needed */ - if (fmt == FS_FAT32) { - ST_WORD(tbl+BS_55AA, 0xAA55); - ST_DWORD(tbl+FSI_LeadSig, 0x41615252); - ST_DWORD(tbl+FSI_StrucSig, 0x61417272); - ST_DWORD(tbl+FSI_Free_Count, n_clst - 1); - ST_DWORD(tbl+FSI_Nxt_Free, 0xFFFFFFFF); - disk_write(drv, tbl, b_part+1, (BYTE)1); - disk_write(drv, tbl, b_part+7, (BYTE)1); - } + /* + * Create FSInfo record if needed + */ + if (fmt == FS_FAT32) { + ST_WORD(tbl + BS_55AA, 0xAA55); + ST_DWORD(tbl + FSI_LeadSig, 0x41615252); + ST_DWORD(tbl + FSI_StrucSig, 0x61417272); + ST_DWORD(tbl + FSI_Free_Count, n_clst - 1); + ST_DWORD(tbl + FSI_Nxt_Free, 0xFFFFFFFF); + disk_write(drv, tbl, b_part + 1, (BYTE) 1); + disk_write(drv, tbl, b_part + 7, (BYTE) 1); + } - return (disk_ioctl(drv, CTRL_SYNC, (void*)NULL) == RES_OK) ? FR_OK : FR_DISK_ERR; + return (disk_ioctl(drv, CTRL_SYNC, (void *) NULL) == + RES_OK) ? FR_OK : FR_DISK_ERR; } -#endif /* _USE_MKFS && !_FS_READONLY */ +#endif /* _USE_MKFS && !_FS_READONLY */ #if _USE_STRFUNC /*-----------------------------------------------------------------------*/ -/* Get a string from the file */ +/* + * Get a string from the file + */ /*-----------------------------------------------------------------------*/ -char* f_gets ( - char* buff, /* Pointer to the string buffer to read */ - int len, /* Size of string buffer */ - FIL* fil /* Pointer to the file object */ -) +char *f_gets(char *buff, /* Pointer to the string buffer to read */ + int len, /* Size of string buffer */ + FIL * fil /* Pointer to the file object */ + ) { - int i = 0; - char *p = buff; - UINT rc; + int i = 0; + char *p = buff; + UINT rc; - while (i < len - 1) { /* Read bytes until buffer gets filled */ - f_read(fil, p, 1, &rc); - if (rc != 1) break; /* Break when no data to read */ + while (i < len - 1) { /* Read bytes until buffer gets filled */ + f_read(fil, p, 1, &rc); + if (rc != 1) + break; /* Break when no data to read */ #if _USE_STRFUNC >= 2 - if (*p == '\r') continue; /* Strip '\r' */ + if (*p == '\r') + continue; /* Strip '\r' */ #endif - i++; - if (*p++ == '\n') break; /* Break when reached end of line */ - } - *p = 0; - return i ? buff : NULL; /* When no data read (eof or error), return with error. */ + i++; + if (*p++ == '\n') + break; /* Break when reached end of line */ + } + *p = 0; + return i ? buff : NULL; /* When no data read (eof or error), return with error. */ } @@ -2805,132 +3207,158 @@ char* f_gets ( #if !_FS_READONLY #include /*-----------------------------------------------------------------------*/ -/* Put a character to the file */ +/* + * Put a character to the file + */ /*-----------------------------------------------------------------------*/ -int f_putc ( - int chr, /* A character to be output */ - FIL* fil /* Ponter to the file object */ -) +int f_putc(int chr, /* A character to be output */ + FIL * fil /* Ponter to the file object */ + ) { - UINT bw; - char c; + UINT bw; + char c; #if _USE_STRFUNC >= 2 - if (chr == '\n') f_putc ('\r', fil); /* LF -> CRLF conversion */ + if (chr == '\n') + f_putc('\r', fil); /* LF -> CRLF conversion */ #endif - if (!fil) { /* Special value may be used to switch the destination to any other device */ - /* put_console(chr); */ - return chr; - } - c = (char)chr; - f_write(fil, &c, 1, &bw); /* Write a byte to the file */ - return bw ? chr : EOF; /* Return the result */ + if (!fil) { /* Special value may be used to switch the destination to any other device */ + /* + * put_console(chr); + */ + return chr; + } + c = (char) chr; + f_write(fil, &c, 1, &bw); /* Write a byte to the file */ + return bw ? chr : EOF; /* Return the result */ } /*-----------------------------------------------------------------------*/ -/* Put a string to the file */ +/* + * Put a string to the file + */ /*-----------------------------------------------------------------------*/ -int f_puts ( - const char* str, /* Pointer to the string to be output */ - FIL* fil /* Pointer to the file object */ -) +int f_puts(const char *str, /* Pointer to the string to be output */ + FIL * fil /* Pointer to the file object */ + ) { - int n; + int n; - for (n = 0; *str; str++, n++) { - if (f_putc(*str, fil) == EOF) return EOF; - } - return n; + for (n = 0; *str; str++, n++) { + if (f_putc(*str, fil) == EOF) + return EOF; + } + return n; } /*-----------------------------------------------------------------------*/ -/* Put a formatted string to the file */ +/* + * Put a formatted string to the file + */ /*-----------------------------------------------------------------------*/ -int f_printf ( - FIL* fil, /* Pointer to the file object */ - const char* str, /* Pointer to the format string */ - ... /* Optional arguments... */ -) +int f_printf(FIL * fil, /* Pointer to the file object */ + const char *str, /* Pointer to the format string */ + ... /* Optional arguments... */ + ) { - va_list arp; - UCHAR c, f, r; - ULONG val; - char s[16]; - int i, w, res, cc; + va_list arp; + UCHAR c, f, r; + ULONG val; + char s[16]; + int i, w, res, cc; - va_start(arp, str); + va_start(arp, str); - for (cc = res = 0; cc != EOF; res += cc) { - c = *str++; - if (c == 0) break; /* End of string */ - if (c != '%') { /* Non escape cahracter */ - cc = f_putc(c, fil); - if (cc != EOF) cc = 1; - continue; - } - w = f = 0; - c = *str++; - if (c == '0') { /* Flag: '0' padding */ - f = 1; c = *str++; - } - while (c >= '0' && c <= '9') { /* Precision */ - w = w * 10 + (c - '0'); - c = *str++; - } - if (c == 'l') { /* Prefix: Size is long int */ - f |= 2; c = *str++; - } - if (c == 's') { /* Type is string */ - cc = f_puts(va_arg(arp, char*), fil); - continue; - } - if (c == 'c') { /* Type is character */ - cc = f_putc(va_arg(arp, int), fil); - if (cc != EOF) cc = 1; - continue; - } - r = 0; - if (c == 'd') r = 10; /* Type is signed decimal */ - if (c == 'u') r = 10; /* Type is unsigned decimal */ - if (c == 'X') r = 16; /* Type is unsigned hexdecimal */ - if (r == 0) break; /* Unknown type */ - if (f & 2) { /* Get the value */ - val = (ULONG)va_arg(arp, long); - } else { - val = (c == 'd') ? (ULONG)(long)va_arg(arp, int) : (ULONG)va_arg(arp, unsigned int); - } - /* Put numeral string */ - if (c == 'd') { - if (val & 0x80000000) { - val = 0 - val; - f |= 4; - } - } - i = sizeof(s) - 1; s[i] = 0; - do { - c = (UCHAR)(val % r + '0'); - if (c > '9') c += 7; - s[--i] = c; - val /= r; - } while (i && val); - if (i && (f & 4)) s[--i] = '-'; - w = sizeof(s) - 1 - w; - while (i && i > w) s[--i] = (f & 1) ? '0' : ' '; - cc = f_puts(&s[i], fil); - } + for (cc = res = 0; cc != EOF; res += cc) { + c = *str++; + if (c == 0) + break; /* End of string */ + if (c != '%') { /* Non escape cahracter */ + cc = f_putc(c, fil); + if (cc != EOF) + cc = 1; + continue; + } + w = f = 0; + c = *str++; + if (c == '0') { /* Flag: '0' padding */ + f = 1; + c = *str++; + } + while (c >= '0' && c <= '9') { /* Precision */ + w = w * 10 + (c - '0'); + c = *str++; + } + if (c == 'l') { /* Prefix: Size is long int */ + f |= 2; + c = *str++; + } + if (c == 's') { /* Type is string */ + cc = f_puts(va_arg(arp, char *), fil); + continue; + } + if (c == 'c') { /* Type is character */ + cc = f_putc(va_arg(arp, int), fil); + if (cc != EOF) + cc = 1; + continue; + } + r = 0; + if (c == 'd') + r = 10; /* Type is signed decimal */ + if (c == 'u') + r = 10; /* Type is unsigned decimal */ + if (c == 'X') + r = 16; /* Type is unsigned hexdecimal */ + if (r == 0) + break; /* Unknown type */ + if (f & 2) { /* Get the value */ + val = (ULONG) va_arg(arp, long); + } else { + val = + (c == 'd') ? (ULONG) (long) va_arg(arp, + int) : (ULONG) va_arg(arp, + unsigned + int); + } + /* + * Put numeral string + */ + if (c == 'd') { + if (val & 0x80000000) { + val = 0 - val; + f |= 4; + } + } + i = sizeof(s) - 1; + s[i] = 0; + do { + c = (UCHAR) (val % r + '0'); + if (c > '9') + c += 7; + s[--i] = c; + val /= r; + } while (i && val); + if (i && (f & 4)) + s[--i] = '-'; + w = sizeof(s) - 1 - w; + while (i && i > w) + s[--i] = (f & 1) ? '0' : ' '; + cc = f_puts(&s[i], fil); + } - va_end(arp); - return (cc == EOF) ? cc : res; + va_end(arp); + return (cc == EOF) ? cc : res; } -#endif /* !_FS_READONLY */ -#endif /* _USE_STRFUNC */ +#endif /* !_FS_READONLY */ +#endif /* _USE_STRFUNC */ diff --git a/snes/fatfstest/main.c b/snes/fatfstest/main.c index 6473fab..beb8da1 100644 --- a/snes/fatfstest/main.c +++ b/snes/fatfstest/main.c @@ -13,18 +13,6 @@ #include "debug.h" #include "crc.h" -/* - -o relocate main code -o exec loaded file - -o debug STA global -o optimize internal transfer buffer -o direct writeto mempage - - -*/ - #define ROM_NAME "TURRICAN.SMC" #define BLOCK_SIZE 512 @@ -32,14 +20,14 @@ o direct writeto mempage #define BANK_COUNT 16 #define BASE_ADDR 0x008000 -typedef void (*FUNC)(void); +typedef void (*FUNC) (void); padStatus pad1; DWORD acc_size; /* Work register for fs command */ WORD acc_files, acc_dirs; FILINFO finfo; FATFS fatfs[2]; /* File system object for each logical * drive */ -//BYTE Buff[512]; /* Working buffer */ +// BYTE Buff[512]; /* Working buffer */ DWORD p1, p2, p3; DWORD addr; DWORD crc_addr; @@ -57,7 +45,9 @@ void initInternalRegisters(void) characterLocation[2] = 0x0000; characterLocation[3] = 0x0000; debug_init(); -} void preInit(void) +} + +void preInit(void) { // For testing purpose ... @@ -137,7 +127,7 @@ void wait(void) void boot(DWORD addr) { FUNC fn; - printfc("SNES::boot addr=%lx\n",addr); + printfc("SNES::boot addr=%lx\n", addr); fn = (FUNC) addr; fn(); @@ -153,7 +143,7 @@ void boot(DWORD addr) debug_enable(); printfc("SNES::main: Try to init disk\n"); - put_rc(f_mount((BYTE)0, &fatfs[0])); + put_rc(f_mount((BYTE) 0, &fatfs[0])); printfs(0, "FATFS OPTIXX.ORG "); printfc("SNES::main: Try to get free\n"); @@ -228,7 +218,7 @@ void boot(DWORD addr) printfc("SNES::main: open %s \n", ROM_NAME); printfs(0, "OPEN %s", ROM_NAME); - put_rc(f_open(&file1, ROM_NAME, (BYTE)FA_READ)); + put_rc(f_open(&file1, ROM_NAME, (BYTE) FA_READ)); p1 = BANK_SIZE * BANK_COUNT; p2 = 0; p3 = 0; @@ -242,7 +232,7 @@ void boot(DWORD addr) res = f_read(&file1, (byte *) (addr), cnt, &s2); - if (res != FR_OK) { + if (res != FR_OK) { printfc("SNES::main: read failed\n"); put_rc(res); break; @@ -252,32 +242,31 @@ void boot(DWORD addr) printfc("SNES::main: read cnt=%i s2=%i\n", cnt, s2); break; } - #if 0 printc_packet(addr, 512, (byte *) (addr)); wait(); #endif - + addr += s2; if (addr % 0x10000 == 0) { printfc("SNES::main: read cnt=%i p1=%li p2=%li s2=%i \n", cnt, - p1, p2, s2); + p1, p2, s2); #if 0 - crc = crc_update_mem(crc_addr,0x8000); - printfc("SNES::main: crc_addr=%lx crc=%x\n",crc_addr,crc); - crc_addr+=0x8000; + crc = crc_update_mem(crc_addr, 0x8000); + printfc("SNES::main: crc_addr=%lx crc=%x\n", crc_addr, crc); + crc_addr += 0x8000; #endif printfs((1 + bank), "BANK %i ADDR 0X%lx ", bank, addr); - + addr += 0x8000; bank++; } } put_rc(f_close(&file1)); - addr = *(byte *)0xFFFD; + addr = *(byte *) 0xFFFD; addr = addr << 8; - addr |= (*(byte *)0xFFFC); + addr |= (*(byte *) 0xFFFC); boot(addr); while (1) { wait(); @@ -287,7 +276,9 @@ void boot(DWORD addr) void IRQHandler(void) { -} void NMIHandler(void) +} + +void NMIHandler(void) { // processEvents(); diff --git a/snes/fatfstest/myEvents.c b/snes/fatfstest/myEvents.c index addb098..832c70d 100644 --- a/snes/fatfstest/myEvents.c +++ b/snes/fatfstest/myEvents.c @@ -5,93 +5,99 @@ extern padStatus pad1; extern word scrollValue; -char fadeOut(word counter) { - static byte fadeOutValue; +char fadeOut(word counter) +{ + static byte fadeOutValue; - if(counter == 0) { - // init fade value - fadeOutValue = 0x0f; - } else { - fadeOutValue--; - } + if (counter == 0) { + // init fade value + fadeOutValue = 0x0f; + } else { + fadeOutValue--; + } - *(byte*) 0x2100 = fadeOutValue; + *(byte *) 0x2100 = fadeOutValue; - if(fadeOutValue == 0x00) { - return EVENT_STOP; - } else { - return EVENT_CONTINUE; - } + if (fadeOutValue == 0x00) { + return EVENT_STOP; + } else { + return EVENT_CONTINUE; + } } -char fadeIn(word counter) { - static byte fadeInValue; +char fadeIn(word counter) +{ + static byte fadeInValue; - if(counter == 0) { - // init fade value - fadeInValue = 0x00; - } else { - fadeInValue++; - } + if (counter == 0) { + // init fade value + fadeInValue = 0x00; + } else { + fadeInValue++; + } - *(byte*) 0x2100 = fadeInValue; + *(byte *) 0x2100 = fadeInValue; - if(fadeInValue >= 0x0f) { - return EVENT_STOP; - } else { - return EVENT_CONTINUE; - } + if (fadeInValue >= 0x0f) { + return EVENT_STOP; + } else { + return EVENT_CONTINUE; + } } -char mosaicOut(word counter) { - static byte mosaicOutValue; +char mosaicOut(word counter) +{ + static byte mosaicOutValue; - if(counter == 0) { - // init fade value - mosaicOutValue = 0xff; - } else { - mosaicOutValue -= 0x10; - } + if (counter == 0) { + // init fade value + mosaicOutValue = 0xff; + } else { + mosaicOutValue -= 0x10; + } - *(byte*) 0x2106 = mosaicOutValue; + *(byte *) 0x2106 = mosaicOutValue; - if(mosaicOutValue == 0x0f) { - return EVENT_STOP; - } else { - return EVENT_CONTINUE; - } + if (mosaicOutValue == 0x0f) { + return EVENT_STOP; + } else { + return EVENT_CONTINUE; + } } -char mosaicIn(word counter) { - static byte mosaicInValue; +char mosaicIn(word counter) +{ + static byte mosaicInValue; - if(counter == 0) { - // init fade value - mosaicInValue = 0x0f; - } else { - mosaicInValue += 0x10; - } + if (counter == 0) { + // init fade value + mosaicInValue = 0x0f; + } else { + mosaicInValue += 0x10; + } - *(byte*) 0x2106 = mosaicInValue; + *(byte *) 0x2106 = mosaicInValue; - if(mosaicInValue == 0xff) { - return EVENT_STOP; - } else { - return EVENT_CONTINUE; - } + if (mosaicInValue == 0xff) { + return EVENT_STOP; + } else { + return EVENT_CONTINUE; + } } -char NMIReadPad(word counter) { - pad1 = readPad((byte) 0); +char NMIReadPad(word counter) +{ + pad1 = readPad((byte) 0); - return EVENT_CONTINUE; + return EVENT_CONTINUE; } -char scrollLeft(word counter) { - scrollValue++; +char scrollLeft(word counter) +{ + scrollValue++; - *(byte*) 0x210d = (byte) scrollValue; - *(byte*) 0x210d = (byte) (scrollValue>>8); + *(byte *) 0x210d = (byte) scrollValue; + *(byte *) 0x210d = (byte) (scrollValue >> 8); - return EVENT_CONTINUE; -} \ No newline at end of file + return EVENT_CONTINUE; +} diff --git a/snes/fatfstest/pad.c b/snes/fatfstest/pad.c index 69aefa3..9304eb1 100644 --- a/snes/fatfstest/pad.c +++ b/snes/fatfstest/pad.c @@ -2,22 +2,25 @@ #include "pad.h"; #include "debug.h"; -void enablePad(void) { - // Enable pad reading and NMI - *(byte*)0x4200 = 0x01; -} - -void disablePad(void) { +void enablePad(void) +{ // Enable pad reading and NMI - *(byte*)0x4200 = 0x00; + *(byte *) 0x4200 = 0x01; } -padStatus readPad(byte padNumber) { - word test; - padStatus *status; - padNumber = padNumber << 1; - test = (word) *(byte*)0x4218+padNumber << 8; - test |= (word) *(byte*)0x4219+padNumber; - status = (padStatus *) &test; - return *status; +void disablePad(void) +{ + // Enable pad reading and NMI + *(byte *) 0x4200 = 0x00; +} + +padStatus readPad(byte padNumber) +{ + word test; + padStatus *status; + padNumber = padNumber << 1; + test = (word) * (byte *) 0x4218 + padNumber << 8; + test |= (word) * (byte *) 0x4219 + padNumber; + status = (padStatus *) & test; + return *status; }