From 619ef2ba373ed71439b6b78b558f1fc90ca40f40 Mon Sep 17 00:00:00 2001 From: vratiskol Date: Sat, 16 Mar 2019 03:46:36 +0100 Subject: [PATCH] Use Variable --- armsrc/mifareutil.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c index 929851b4b..fa4a6518e 100644 --- a/armsrc/mifareutil.c +++ b/armsrc/mifareutil.c @@ -592,7 +592,7 @@ void emlClearMem(void) { memset(emCARD, 0, CARD_MEMORY_SIZE); // fill sectors trailer data - for (uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16))) + for (uint16_t b = 3; b <= MIFARE_4K_MAXBLOCK; ((b <= MIFARE_2K_MAXBLOCK ) ? (b += 4) : (b += 16))) emlSetMem((uint8_t *)trailer, b, 1); // uid @@ -601,9 +601,11 @@ void emlClearMem(void) { } uint8_t SectorTrailer(uint8_t blockNo) { - if (blockNo < 32 * 4) { + if (blockNo <= MIFARE_2K_MAXBLOCK) { + if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x03)); return (blockNo | 0x03); } else { + if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Sector Trailer for block %d : %d", blockNo, (blockNo | 0x0f)); return (blockNo | 0x0f); } }