diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 61189c0e4..26119ab25 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -993,7 +993,7 @@ static void PacketReceived(PacketCommandNG *packet) { ReaderMifare(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2]); break; case CMD_MIFARE_READBL: - MifareReadBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); + MifareReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes); break; case CMD_MIFAREU_READBL: MifareUReadBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes); @@ -1008,10 +1008,10 @@ static void PacketReceived(PacketCommandNG *packet) { MifareUSetPwd(packet->oldarg[0], packet->data.asBytes); break; case CMD_MIFARE_READSC: - MifareReadSector(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); + MifareReadSector(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes); break; case CMD_MIFARE_WRITEBL: - MifareWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); + MifareWriteBlock(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes); break; //case CMD_MIFAREU_WRITEBL_COMPAT: //MifareUWriteBlockCompat(packet->oldarg[0], packet->data.asBytes); @@ -1037,7 +1037,7 @@ static void PacketReceived(PacketCommandNG *packet) { break; } case CMD_SIMULATE_MIFARE_CARD: - Mifare1ksim(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); + Mifare1ksim(packet->oldarg[0], packet->oldarg[1], packet->data.asBytes); break; // emulator @@ -1051,10 +1051,10 @@ static void PacketReceived(PacketCommandNG *packet) { MifareEMemSet(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); break; case CMD_MIFARE_EML_MEMGET: - MifareEMemGet(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); + MifareEMemGet(packet->oldarg[0], packet->oldarg[1]); break; case CMD_MIFARE_EML_CARDLOAD: - MifareECardLoad(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes); + MifareECardLoad(packet->oldarg[0], packet->oldarg[1]); break; // Work with "magic Chinese" card diff --git a/armsrc/apps.h b/armsrc/apps.h index 4f75935c8..f3bbbe2c8 100644 --- a/armsrc/apps.h +++ b/armsrc/apps.h @@ -142,12 +142,12 @@ void EPA_PACE_Collect_Nonce(PacketCommandNG *c); void EPA_PACE_Replay(PacketCommandNG *c); // mifarecmd.h -void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain); +void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain); void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain); void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes); void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain); -void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain); -void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain); +void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t *datain); +void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain); //void MifareUWriteBlockCompat(uint8_t arg0,uint8_t *datain); void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain); void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain); @@ -158,8 +158,8 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da void MifareSetDbgLvl(uint16_t arg0); void MifareEMemClr(void); void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain); -void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain); -void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain); +void MifareEMemGet(uint32_t arg0, uint32_t arg1); +void MifareECardLoad(uint32_t arg0, uint32_t arg1); void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain); // Work with "magic Chinese" card void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain); void MifareCIdent(); // is "magic chinese" card? diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index 94d152693..2e4cb865b 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -38,7 +38,7 @@ static uint8_t dummy_answer = 0; // Select, Authenticate, Read a MIFARE tag. // read block //----------------------------------------------------------------------------- -void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) { +void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) { // params uint8_t blockNo = arg0; uint8_t keyType = arg1; @@ -198,7 +198,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) { // Select, Authenticate, Read a MIFARE tag. // read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes) //----------------------------------------------------------------------------- -void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) { +void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t *datain) { // params uint8_t sectorNo = arg0; uint8_t keyType = arg1; @@ -363,7 +363,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain) // Select, Authenticate, Write a MIFARE tag. // read block //----------------------------------------------------------------------------- -void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) { +void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) { // params uint8_t blockNo = arg0; uint8_t keyType = arg1; @@ -1636,7 +1636,7 @@ void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width } -void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) { +void MifareEMemGet(uint32_t arg0, uint32_t arg1) { FpgaDownloadAndGo(FPGA_BITSTREAM_HF); uint8_t buf[PM3_CMD_DATA_SIZE] = {0x00}; emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4) @@ -1650,7 +1650,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) // Load a card into the emulator memory // //----------------------------------------------------------------------------- -void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) { +void MifareECardLoad(uint32_t arg0, uint32_t arg1) { uint64_t ui64Key; uint32_t cuid = 0; uint8_t numSectors = arg0; diff --git a/armsrc/mifaresim.c b/armsrc/mifaresim.c index f25b72d51..501d93a8a 100644 --- a/armsrc/mifaresim.c +++ b/armsrc/mifaresim.c @@ -415,7 +415,7 @@ static bool MifareSimInit(uint16_t flags, uint8_t *datain, tag_response_info_t * *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is infinite ... * (unless reader attack mode enabled then it runs util it gets enough nonces to recover all keys attmpted) */ -void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) { +void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain) { tag_response_info_t *responses; uint8_t cardSTATE = MFEMUL_NOFIELD; uint8_t uid_len = 0; // 4,7, 10 diff --git a/armsrc/mifaresim.h b/armsrc/mifaresim.h index 7f92815d5..2dc9650cc 100644 --- a/armsrc/mifaresim.h +++ b/armsrc/mifaresim.h @@ -19,7 +19,7 @@ # define CheckCrc14A(data, len) check_crc(CRC_14443_A, (data), (len)) #endif -void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain); +void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t *datain); #define AC_DATA_READ 0 #define AC_DATA_WRITE 1