From 3771c150f0345b85e1109197306bf2269db9c1b6 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 13 Aug 2019 17:42:03 +0200 Subject: [PATCH] make style --- armsrc/Standalone/hf_colin.c | 4 ++-- armsrc/appmain.c | 2 +- armsrc/spiffs.c | 36 ++++++++++++++++++------------------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/armsrc/Standalone/hf_colin.c b/armsrc/Standalone/hf_colin.c index 21df29b9d..265b7e3c9 100644 --- a/armsrc/Standalone/hf_colin.c +++ b/armsrc/Standalone/hf_colin.c @@ -746,10 +746,10 @@ readysim: //flags = 0x10; uint16_t flags = 0; flags = 16; - DbprintfEx(FLAG_NEWLINE,"\n\n\n\n\n\n\n\nn\n\nn\n\n\nflags: %d (0x%02x)",flags,flags); + DbprintfEx(FLAG_NEWLINE, "\n\n\n\n\n\n\n\nn\n\nn\n\n\nflags: %d (0x%02x)", flags, flags); cjSetCursLeft(); SpinOff(1000); - Mifare1ksim(flags , 0, cjuid, 0, 0); + Mifare1ksim(flags, 0, cjuid, 0, 0); LED_C_OFF(); SpinOff(50); vtsend_cursor_position_restore(NULL); diff --git a/armsrc/appmain.c b/armsrc/appmain.c index c54ff7255..b593c826b 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1906,7 +1906,7 @@ void __attribute__((noreturn)) AppMain(void) { // If flash is not present, BUSY_TIMEOUT kicks in, let's do it after USB loadT55xxConfig(); - // + // // Enforce a spiffs check/garbage collection at boot so we are likely to never // fall under the 2 contigous free blocks availables rdv40_spiffs_check(); diff --git a/armsrc/spiffs.c b/armsrc/spiffs.c index e642a0e29..cb4412264 100644 --- a/armsrc/spiffs.c +++ b/armsrc/spiffs.c @@ -74,18 +74,18 @@ static s32_t rdv40_spiffs_llerase(u32_t addr, u32_t size) { if (!FlashInit()) { return 130; } - if (DBGLEVEL > 2) Dbprintf("LLERASEDBG : Orig addr : %d\n", addr); - uint8_t block, sector = 0; - block = addr / RDV40_LLERASE_BLOCKSIZE; - if (block){ - addr = addr - (block*RDV40_LLERASE_BLOCKSIZE); - } - if (DBGLEVEL > 2) Dbprintf("LLERASEDBG : Result addr : %d\n", addr); - sector = addr / SPIFFS_CFG_LOG_BLOCK_SZ; - Flash_CheckBusy(BUSY_TIMEOUT); - Flash_WriteEnable(); - if (DBGLEVEL > 2) Dbprintf("LLERASEDBG : block : %d, sector : %d \n", block, sector); - erased = Flash_Erase4k(block, sector); + if (DBGLEVEL > 2) Dbprintf("LLERASEDBG : Orig addr : %d\n", addr); + uint8_t block, sector = 0; + block = addr / RDV40_LLERASE_BLOCKSIZE; + if (block) { + addr = addr - (block * RDV40_LLERASE_BLOCKSIZE); + } + if (DBGLEVEL > 2) Dbprintf("LLERASEDBG : Result addr : %d\n", addr); + sector = addr / SPIFFS_CFG_LOG_BLOCK_SZ; + Flash_CheckBusy(BUSY_TIMEOUT); + Flash_WriteEnable(); + if (DBGLEVEL > 2) Dbprintf("LLERASEDBG : block : %d, sector : %d \n", block, sector); + erased = Flash_Erase4k(block, sector); Flash_CheckBusy(BUSY_TIMEOUT); FlashStop(); @@ -163,12 +163,12 @@ int rdv40_spiffs_unmount() { } int rdv40_spiffs_check() { - rdv40_spiffs_lazy_mount(); - SPIFFS_check(&fs); - SPIFFS_gc_quick(&fs,0); - rdv40_spiffs_lazy_unmount(); - rdv40_spiffs_lazy_mount(); - return SPIFFS_gc(&fs,8192) == SPIFFS_OK; + rdv40_spiffs_lazy_mount(); + SPIFFS_check(&fs); + SPIFFS_gc_quick(&fs, 0); + rdv40_spiffs_lazy_unmount(); + rdv40_spiffs_lazy_mount(); + return SPIFFS_gc(&fs, 8192) == SPIFFS_OK; } ////////////////////////////////////////////////////////////////////////////////