\r
#include "crc.h"\r
\r
-// the block number for the ISO14443-4 PCB\r
-uint8_t pcb_blocknum = 0;\r
-// Deselect card by sending a s-block. the crc is precalced for speed\r
-static uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};\r
-\r
-\r
//-----------------------------------------------------------------------------\r
// Select, Authenticate, Read a MIFARE tag. \r
// read block\r
LEDsoff();\r
}\r
cmd_send(CMD_ACK,1,0,0,0,0);\r
- } \r
- cmd_send(CMD_ACK,1,0,0,0,0);\r
}\r
\r
// Arg0 = BlockNo,\r
{\r
// free eventually allocated BigBuf memory\r
BigBuf_free();\r
- // clear trace\r
clear_trace();\r
\r
// params\r
Dbprintf("Data exceeds buffer!!");\r
break;\r
}\r
- \r
- // UL-C authentication\r
- if ( useKey ) {\r
- uint8_t key[16] = {0x00}; \r
- memcpy(key, datain, sizeof(key) );\r
-\r
- if ( !mifare_ultra_auth(key) ) {\r
- OnError(1);\r
- return; \r
- }\r
- }\r
\r
- // UL-EV1 / NTAG authentication\r
- if (usePwd) { \r
- uint8_t pwd[4] = {0x00};\r
- memcpy(pwd, datain, sizeof(pwd));\r
- uint8_t pack[4] = {0,0,0,0};\r
-\r
- if (!mifare_ul_ev1_auth(pwd, pack)){\r
- OnError(1);\r
- return; \r
- }\r
- }\r
- \r
- for (int i = 0; i < blocks; i++){\r
- if ((i*4) + 4 > CARD_MEMORY_SIZE) {\r
- Dbprintf("Data exceeds buffer!!");\r
- break;\r
- }\r
- \r
len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);\r
\r
if (len) {\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
\r
countblocks *= 4;\r
- cmd_send(CMD_ACK, 1, countblocks, countblocks, 0, 0);\r
+ cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
+ \r
+ BigBuf_free();\r
}\r
\r
//-----------------------------------------------------------------------------\r
cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
-}\r
-\r
-void OnSuccess(){\r
- pcb_blocknum = 0;\r
- ReaderTransmit(deselect_cmd, 3 , NULL);\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
- LEDsoff();\r
-}\r
-\r
-void OnError(uint8_t reason){\r
- pcb_blocknum = 0;\r
- ReaderTransmit(deselect_cmd, 3 , NULL);\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
- cmd_send(CMD_ACK,0,reason,0,0,0);\r
- LEDsoff();\r
-}\r
+}
\ No newline at end of file