memcpy(block0, uid, 4); \r
block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // Mifare UID BCC\r
\r
- return mfCSetBlock(0, block0, oldUID, wantWipe);\r
+ return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
}\r
\r
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe) {\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, 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
\r
\r
if (resp != NULL) {\r
isOK = resp->arg[0] & 0xff;\r
- PrintAndLog("isOk:%02x", isOK);\r
- memcpy(uid, resp->d.asBytes, 4); \r
+ if (uid != NULL) memcpy(uid, resp->d.asBytes, 4); \r
if (!isOK) return 2;\r
} else {\r
PrintAndLog("Command execute timeout");\r