}\r
\r
int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
- UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
+ UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
\r
- SendCommand(&c);\r
+ SendCommand(&c);\r
\r
UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
\r
}\r
\r
int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r
- UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r
+ UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r
memcpy(c.d.asBytes, data, blocksCount * 16); \r
- SendCommand(&c);\r
+ SendCommand(&c);\r
return 0;\r
}\r
\r
int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint8_t params) {\r
uint8_t isOK = 0;\r
\r
- UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
+ UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
memcpy(c.d.asBytes, data, 16); \r
- SendCommand(&c);\r
+ SendCommand(&c);\r
\r
UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
\r
}\r
return 0;\r
}\r
+\r
+int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r
+ uint8_t isOK = 0;\r
+\r
+ UsbCommand c = {CMD_MIFARE_EML_CGETBLOCK, {params, 0, blockNo}};\r
+ SendCommand(&c);\r
+\r
+ UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+\r
+ if (resp != NULL) {\r
+ isOK = resp->arg[0] & 0xff;\r
+ memcpy(data, resp->d.asBytes, 16); \r
+ if (!isOK) return 2;\r
+ } else {\r
+ PrintAndLog("Command execute timeout");\r
+ return 1;\r
+ }\r
+ return 0;\r
+}\r