chg 'hf mf chk':

[proxmark3-svn] / armsrc / mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index a3807cf7150adefc05f534aedf19302f52ae74bc..8fe502ca3135c6d184cabcac2677fb5b41202e76 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -980,16 +980,17 @@ void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
        uint8_t set14aTimeout = (arg1 >> 8) & 0xff;\r
        uint8_t keyCount = arg2;\r
 \r
+       LED_A_ON();\r
+\r
        // clear debug level\r
        int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r
        MF_DBGLEVEL = MF_DBG_NONE;\r
 \r
-       LED_A_ON();\r
-       LED_B_OFF();\r
-       LED_C_OFF();\r
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
 \r
-       if (clearTrace) clear_trace();\r
+       if (clearTrace) {\r
+               clear_trace();\r
+       }\r
        set_tracing(true);\r
 \r
        if (set14aTimeout){\r
@@ -1001,30 +1002,28 @@ void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
                uint8_t sectorCnt = blockNo;\r
                int res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, OLD_MF_DBGLEVEL, &keyIndex);\r
 \r
-               LED_B_ON();\r
                if (res >= 0) {\r
                        cmd_send(CMD_ACK, 1, 0, 0, keyIndex, 80);\r
                } else {\r
                        cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);\r
                }\r
-               LED_B_OFF();\r
        } else {        \r
                int res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, OLD_MF_DBGLEVEL);\r
                \r
-               LED_B_ON();\r
                if (res > 0) {\r
                        cmd_send(CMD_ACK, 1, 0, 0, datain + (res - 1) * 6, 6);\r
                } else {\r
                        cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);\r
                }\r
-               LED_B_OFF();\r
        }\r
 \r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
-       LEDsoff();\r
+       LED_D_OFF();\r
 \r
        // restore debug level\r
        MF_DBGLEVEL = OLD_MF_DBGLEVEL;\r
+       \r
+       LED_A_OFF();\r
 }\r
 \r
 //-----------------------------------------------------------------------------\r