X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e619ddc071e882bb9de75d2e0905c4eda2b11516..db44e049b05060bf42f9059d0fdaf0e6959bc018:/client/cmdhf.c?ds=sidebyside

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 1aa656ee..95d4f53a 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -373,16 +373,20 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 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;
-		}		
+		
+		uint8_t cmdBit = (cmd[0] & 1);
+		uint8_t address = (cmd[1] << 7) | cmd[0] >> 1;
+		
+		if (cmdBit == LEGIC_READ)
+			snprintf(exp, size, "READ Byte(%d)", address);
+		else if (cmdBit == LEGIC_WRITE )
+			snprintf(exp, size, "WRITE Byte(%d)", address);
+		else 
+			snprintf(exp, size, "?");
+				
 	} else {		
-		switch(cmd[0]) {
-			case LEGIC_HSK			:snprintf(exp, size, "END Handshake");break;
-			default					:snprintf(exp, size, "?"); break;
-		}		
+		if ( cmd[0] == LEGIC_HSK_22 ) snprintf(exp, size, "MIM22");
+		if ( cmd[0] == LEGIC_HSK_256 ) snprintf(exp, size, "MIN256/1024");
 	}
 }
 
@@ -648,7 +652,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]);
 		}
@@ -689,7 +692,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 +711,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),
 				"   ",