chg: syntax suger

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index b240878277a841205a6e0f1e7e7e13e5d427b55e..bc8d2ecccd8f2a861c7b01fe9bcfef185c92f200 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -389,7 +389,7 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
                case 9:
                case 11: {
                        uint8_t cmdBit = (cmd[1] & 1);
                case 9:
                case 11: {
                        uint8_t cmdBit = (cmd[1] & 1);

-                       uint8_t address = (cmd[2] << 7) | cmd[1] >> 1;
+                       uint16_t address = (cmd[2] << 7) | cmd[1] >> 1;

                        
                        if (cmdBit == LEGIC_READ) 
                                snprintf(exp, size, "READ Byte(%d)", address);
                        
                        if (cmdBit == LEGIC_READ) 
                                snprintf(exp, size, "READ Byte(%d)", address);


@@ -515,20 +515,6 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
        }
 }
 
        }
 }
 

-uint8_t legic_CRC_check(bool isResponse, uint8_t* data, uint8_t len){
-       if (len > 2) return 2;
-       
-       uint8_t calccrc = CRC8Legic(data, len);
-       
-       return 0;
-       // crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
-       // crc_clear(&legic_crc);
-       // crc_update(&legic_crc, 1, 1); /* CMD_READ */
-       // crc_update(&legic_crc, byte_index, cmd_sz-1);
-       // crc_update(&legic_crc, value, 8);
-       // return crc_finish(&legic_crc);
-}
-

 bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen)
 {
        return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
 bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen)
 {
        return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);


@@ -645,8 +631,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                        default: 
                                break;
                }
                        default: 
                                break;
                }

-       } else if ( data_len == 2 && protocol == LEGIC ){
-               crcStatus = legic_CRC_check(isResponse, frame, data_len);               

        }
        //0 CRC-command, CRC not ok
        //1 CRC-command, CRC ok
        }
        //0 CRC-command, CRC not ok
        //1 CRC-command, CRC ok


@@ -664,7 +648,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
                }
                uint8_t parityBits = parityBytes[j>>3];
                        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
                }
                uint8_t parityBits = parityBytes[j>>3];

-               if (protocol != ISO_14443B && protocol != ISO_7816_4 &&  (isResponse || protocol == ISO_14443A)  && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+               if (protocol != LEGIC && protocol != ISO_14443B && protocol != ISO_7816_4 &&  (isResponse || protocol == ISO_14443A)  && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {

                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
                } else {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
                } else {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);


@@ -848,8 +832,12 @@ int CmdHFList(const char *Cmd) {
        PrintAndLog("Recorded Activity (TraceLen = %d bytes)", traceLen);
        PrintAndLog("");
        PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
        PrintAndLog("Recorded Activity (TraceLen = %d bytes)", traceLen);
        PrintAndLog("");
        PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");

-       PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
-       PrintAndLog("iClass    - Timings are not as accurate");
+       if ( protocol == ISO_14443A )
+               PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
+       if ( protocol == ICLASS )
+               PrintAndLog("iClass    - Timings are not as accurate");
+       if ( protocol == LEGIC )
+               PrintAndLog("LEGIC    - Timings are in ticks (1us == 1.5ticks)");

        PrintAndLog("");
     PrintAndLog("      Start |        End | Src | Data (! denotes parity error)                                   | CRC | Annotation         |");
        PrintAndLog("------------|------------|-----|-----------------------------------------------------------------|-----|--------------------|");
        PrintAndLog("");
     PrintAndLog("      Start |        End | Src | Data (! denotes parity error)                                   | CRC | Annotation         |");
        PrintAndLog("------------|------------|-----|-----------------------------------------------------------------|-----|--------------------|");


@@ -894,7 +882,7 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
                return 1;
        }
                PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
                return 1;
        }

-       ans = HFLegicInfo("", false);
+       ans = HFLegicReader("", false);

        if ( ans == 0) {
                PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
                return 1;
        if ( ans == 0) {
                PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
                return 1;