mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-03-01 02:27:21 +08:00
hf 14b reader - cleanup
This commit is contained in:
parent
e8b5ce9917
commit
3e67ad0b0f
1 changed files with 3 additions and 7 deletions
|
@ -797,7 +797,6 @@ static bool HF14B_Other_Reader(bool verbose) {
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
PrintAndLogEx(SUCCESS, "\n14443-3b tag found:");
|
PrintAndLogEx(SUCCESS, "\n14443-3b tag found:");
|
||||||
PrintAndLogEx(SUCCESS, "unknown tag type answered to a 0x000b3f80 command ans:");
|
PrintAndLogEx(SUCCESS, "unknown tag type answered to a 0x000b3f80 command ans:");
|
||||||
PrintAndLogEx(SUCCESS, "%s", sprint_hex(resp.data.asBytes, 1));
|
|
||||||
switch_off_field_14b();
|
switch_off_field_14b();
|
||||||
return true;
|
return true;
|
||||||
} else if (status > 0) {
|
} else if (status > 0) {
|
||||||
|
@ -817,12 +816,11 @@ static bool HF14B_Other_Reader(bool verbose) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
status = resp.oldarg[0];
|
status = resp.oldarg[0];
|
||||||
PrintAndLogEx(INFO, "status %d", status);
|
PrintAndLogEx(DEBUG, "status %d", status);
|
||||||
|
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
PrintAndLogEx(SUCCESS, "\n14443-3b tag found:");
|
PrintAndLogEx(SUCCESS, "\n14443-3b tag found:");
|
||||||
PrintAndLogEx(SUCCESS, "Unknown tag type answered to a 0x0A command ans:");
|
PrintAndLogEx(SUCCESS, "Unknown tag type answered to a 0x0A command ans:");
|
||||||
PrintAndLogEx(SUCCESS, "%s", sprint_hex(resp.data.asBytes, 1));
|
|
||||||
switch_off_field_14b();
|
switch_off_field_14b();
|
||||||
return true;
|
return true;
|
||||||
} else if (status > 0) {
|
} else if (status > 0) {
|
||||||
|
@ -833,22 +831,20 @@ static bool HF14B_Other_Reader(bool verbose) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
data[0] = ISO14443B_RESET;
|
data[0] = ISO14443B_RESET;
|
||||||
clearCommandBuffer();
|
clearCommandBuffer();
|
||||||
SendCommandMIX(CMD_HF_ISO14443B_COMMAND, flags, 1, 0, data, 1);
|
SendCommandMIX(CMD_HF_ISO14443B_COMMAND, flags, 1, 0, data, 1);
|
||||||
if (!WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) {
|
if (!WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) {
|
||||||
if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
|
if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
|
||||||
switch_off_field_14b();
|
switch_off_field_14b();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
status = resp.oldarg[0];
|
status = resp.oldarg[0];
|
||||||
PrintAndLogEx(INFO, "status %d", status);
|
PrintAndLogEx(DEBUG, "status %d", status);
|
||||||
|
|
||||||
if (status == 0) {
|
if (status == 0) {
|
||||||
PrintAndLogEx(SUCCESS, "\n14443-3b tag found:");
|
PrintAndLogEx(SUCCESS, "\n14443-3b tag found:");
|
||||||
PrintAndLogEx(SUCCESS, "Unknown tag type answered to a 0x0C command ans:");
|
PrintAndLogEx(SUCCESS, "Unknown tag type answered to a 0x0C command ans:");
|
||||||
PrintAndLogEx(SUCCESS, "%s", sprint_hex(resp.data.asBytes, 1));
|
|
||||||
switch_off_field_14b();
|
switch_off_field_14b();
|
||||||
return true;
|
return true;
|
||||||
} else if (status > 0) {
|
} else if (status > 0) {
|
||||||
|
|
Loading…
Reference in a new issue