RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-19 19:38:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: better annotation for 'legic'

Browse source
This commit is contained in:
iceman1001 2016-09-07 12:36:46 +02:00
parent e619ddc071
commit 1b12afbd9f
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
client/cmdhf.c
View file

@ -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){ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
if ( cmdsize > 1) { if ( cmdsize > 1) {
switch(cmd[0]) {
case LEGIC_READ :snprintf(exp, size, "READ Byte(%d)", cmd[1]);break; uint8_t cmdBit = (cmd[0] & 1);
case LEGIC_WRITE :snprintf(exp, size, "WRITE Byte(%d)", cmd[1]);break; uint8_t address = (cmd[1] << 7) | cmd[0] >> 1;
default :snprintf(exp, size, "?"); break;
} 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 { } else {
switch(cmd[0]) { if ( cmd[0] == LEGIC_HSK_22 ) snprintf(exp, size, "MIM22");
case LEGIC_HSK :snprintf(exp, size, "END Handshake");break; if ( cmd[0] == LEGIC_HSK_256 ) snprintf(exp, size, "MIN256/1024");
default :snprintf(exp, size, "?"); break;
}
} }
} }
@ -689,7 +693,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
int num_lines = MIN((data_len - 1)/16 + 1, 16); int num_lines = MIN((data_len - 1)/16 + 1, 16);
for (int j = 0; j < num_lines ; j++) { for (int j = 0; j < num_lines ; j++) {
if (j == 0) { if (j == 0) {
PrintAndLog(" %10d | %10d | %s |%-64s | %s| %s", PrintAndLog(" %10u | %10u | %s |%-64s | %s| %s",
(timestamp - first_timestamp), (timestamp - first_timestamp),
(EndOfTransmissionTimestamp - first_timestamp), (EndOfTransmissionTimestamp - first_timestamp),
(isResponse ? "Tag" : "Rdr"), (isResponse ? "Tag" : "Rdr"),
@ -708,7 +712,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) { if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
uint32_t next_timestamp = *((uint32_t *)(trace + tracepos)); 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), (EndOfTransmissionTimestamp - first_timestamp),
(next_timestamp - first_timestamp), (next_timestamp - first_timestamp),
" ", " ",