CHG: Minor tweaks, the tracing dissappeared, the spindelay for powering up too...

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 1aa656ee88b29304174bf31f53003d6bcf014196..b240878277a841205a6e0f1e7e7e13e5d427b55e 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -370,19 +370,37 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 // 1 = read
 // 0 = write
 // Quite simpel tag
-void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
-       
-       if ( cmdsize > 1) {
-               switch(cmd[0]) {
-                       case LEGIC_READ                 :snprintf(exp, size, "READ Byte(%d)", cmd[1]);break;
-                       case LEGIC_WRITE                :snprintf(exp, size, "WRITE Byte(%d)", cmd[1]);break;
-                       default                                 :snprintf(exp, size, "?"); break;
-               }               
-       } else {                
-               switch(cmd[0]) {
-                       case LEGIC_HSK                  :snprintf(exp, size, "END Handshake");break;
-                       default                                 :snprintf(exp, size, "?"); break;
-               }               
+void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){     
+       uint8_t bitsend = cmd[0];       
+       switch (bitsend){
+               case 7:
+                       snprintf(exp, size, "IV 0x%02X", cmd[1]);
+                       break;
+               case 6: {
+                       switch ( cmd[1] ) {
+                               case LEGIC_MIM_22:       snprintf(exp, size, "MIM22"); break;
+                               case LEGIC_MIM_256:      snprintf(exp, size, "MIM256"); break;
+                               case LEGIC_MIM_1024: snprintf(exp, size, "MIM1024"); break;
+                               case LEGIC_ACK_22:       snprintf(exp, size, "ACK 22"); break;
+                               case LEGIC_ACK_256:      snprintf(exp, size, "ACK 256/1024"); break;
+                       }
+                       break;
+               }
+               case 9:
+               case 11: {
+                       uint8_t cmdBit = (cmd[1] & 1);
+                       uint8_t address = (cmd[2] << 7) | cmd[1] >> 1;
+                       
+                       if (cmdBit == LEGIC_READ) 
+                               snprintf(exp, size, "READ Byte(%d)", address);
+                       
+                       if (cmdBit == LEGIC_WRITE ) 
+                               snprintf(exp, size, "WRITE Byte(%d)", address);
+                       break;
+               }
+               case 12:
+               default:
+                       break;
        }
 }
 
@@ -648,7 +666,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                uint8_t parityBits = parityBytes[j>>3];
                if (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]);
                }
@@ -665,14 +682,20 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                }
        }
 
-       if (data_len == 0 )
+       if (data_len == 0 ) {
                sprintf(line[0],"<empty trace - possible error>");
+               return tracepos;
+       }
 
-       //--- Draw the CRC column
+       // Draw the CRC column
        char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : "    "));
 
        EndOfTransmissionTimestamp = timestamp + duration;
 
+       // Always annotate LEGIC read/tag
+       if ( protocol == LEGIC )
+               annotateLegic(explanation,sizeof(explanation),frame,data_len);
+       
        if (!isResponse)        {
                switch(protocol) {
                        case ICLASS:            annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
@@ -681,7 +704,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                        case ISO_14443B:        annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;
                        case TOPAZ:                     annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;
                        case ISO_7816_4:        annotateIso7816(explanation,sizeof(explanation),frame,data_len); break;
-                       case LEGIC:                     annotateLegic(explanation,sizeof(explanation),frame,data_len); break;
+
                        default:                        break;
                }
        }
@@ -689,7 +712,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        int num_lines = MIN((data_len - 1)/16 + 1, 16);
        for (int j = 0; j < num_lines ; j++) {
                if (j == 0) {
-                       PrintAndLog(" %10d | %10d | %s |%-64s | %s| %s",
+                       PrintAndLog(" %10u | %10u | %s |%-64s | %s| %s",
                                (timestamp - first_timestamp),
                                (EndOfTransmissionTimestamp - first_timestamp),
                                (isResponse ? "Tag" : "Rdr"),
@@ -708,7 +731,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
        
        if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
                uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
-                       PrintAndLog(" %10d | %10d | %s |fdt (Frame Delay Time): %d",
+                       PrintAndLog(" %10u | %10u | %s |fdt (Frame Delay Time): %d",
                                (EndOfTransmissionTimestamp - first_timestamp),
                                (next_timestamp - first_timestamp),
                                "   ",
@@ -871,6 +894,12 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
                return 1;
        }
+       ans = HFLegicInfo("", false);
+       if ( ans == 0) {
+               PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
+               return 1;
+       }
+       
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
        return 0;
 }