FIX: minor fixes to the new feature in "hf 14a reader". Not turning off the field...

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index ee2132ef34cbbaf5bb02b5901673830409866373..b84d048473583badf59c4cd4c05fca3e54d4d6c4 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -1127,9 +1127,7 @@ void MifareCIdent(){
        \r
        uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r
        uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r
        \r
        uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r
        uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

-       \r
-       iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-       \r
+\r

        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                isOK = 0;\r
        ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
        if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
                isOK = 0;\r


@@ -1145,6 +1143,5 @@ void MifareCIdent(){
        };\r
 \r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r
        };\r
 \r
        cmd_send(CMD_ACK,isOK,0,0,0,0);\r

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

 }\r
 \r
 }\r
 \r

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index 27f0ac3657b9ab7f13f3f3f04d563d37b397d82e..5798fee63c25d2601cd8eadab8518f6da98738a3 100644 (file)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -376,6 +376,7 @@ int CmdHF14AReader(const char *Cmd)
        PrintAndLog(" Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
        
        // disconnect
        PrintAndLog(" Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
        
        // disconnect

+       c.cmd = CMD_READER_ISO_14443a;

        c.arg[0] = 0;
        c.arg[1] = 0;
        c.arg[2] = 0;
        c.arg[0] = 0;
        c.arg[1] = 0;
        c.arg[2] = 0;

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 41ea1030517d7319f166914ea5e3673fa10e9acb..3516fca499fd3daa921345b7b4e0eb0d39f0dd85 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -236,7 +236,7 @@ int mfCSetUID(uint8_t *uid, uint8_t *oldUID, bool wantWipe) {
        memcpy(block0, uid, 4); \r
        block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // Mifare UID BCC\r
        // mifare classic SAK(byte 5) and ATQA(byte 6 and 7)\r
        memcpy(block0, uid, 4); \r
        block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // Mifare UID BCC\r
        // mifare classic SAK(byte 5) and ATQA(byte 6 and 7)\r

-       block0[5] = 0x88;\r
+       block0[5] = 0x08;\r

        block0[6] = 0x04;\r
        block0[7] = 0x00;\r
        \r
        block0[6] = 0x04;\r
        block0[7] = 0x00;\r
        \r


@@ -246,7 +246,7 @@ int mfCSetUID(uint8_t *uid, uint8_t *oldUID, bool wantWipe) {
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params) {\r
 \r
        uint8_t isOK = 0;\r
 int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params) {\r
 \r
        uint8_t isOK = 0;\r

-       UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
+       UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r

        memcpy(c.d.asBytes, data, 16); \r
        SendCommand(&c);\r
 \r
        memcpy(c.d.asBytes, data, 16); \r
        SendCommand(&c);\r
 \r


@@ -265,7 +265,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r
        uint8_t isOK = 0;\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
+       UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r

        SendCommand(&c);\r
 \r
   UsbCommand resp;\r
        SendCommand(&c);\r
 \r
   UsbCommand resp;\r