github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

em4x70: clean up check_ack function

Browse source
This commit is contained in:
Christian Molson 2020-12-14 00:38:41 -05:00
commit afbef5ba73
1 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
armsrc/em4x70.c
View file

@ -287,30 +287,17 @@ static void em4x70_send_word(const uint16_t word) {
} }
static bool check_ack(void) { static bool check_ack(void) {
// returns true if signal structue corresponds to ACK, anything else is // returns true if signal structue corresponds to ACK, anything else is
// counted as NAK (-> false) // counted as NAK (-> false)
uint32_t start_ticks = GetTicks(); // ACK 64 + 64
while (TICKS_ELAPSED(start_ticks) < (4 * EM4X70_T_TAG_FULL_PERIOD)) { // NACK 64 + 48
/* if (check_pulse_length(get_pulse_length(FALLING_EDGE), 2 * EM4X70_T_TAG_FULL_PERIOD) &&
ACK check_pulse_length(get_pulse_length(FALLING_EDGE), 2 * EM4X70_T_TAG_FULL_PERIOD)) {
64 (48+16) // ACK
64 (48+16)
NACK
64 (48+16)
48 (32+16)
*/
if (check_pulse_length(get_pulse_length(FALLING_EDGE), 2 * EM4X70_T_TAG_FULL_PERIOD)) {
// The received signal is either ACK or NAK.
if (check_pulse_length(get_pulse_length(FALLING_EDGE), 2 * EM4X70_T_TAG_FULL_PERIOD)) {
return true; return true;
} else {
// It's NAK -> stop searching
break;
}
}
} }
// Othewise it was a NACK or Listen Window
return false; return false;
} }
@ -415,7 +402,7 @@ static int write(const uint16_t word, const uint8_t address) {
// look for ACK sequence // look for ACK sequence
if (check_ack()) { if (check_ack()) {
// now EM4x70 needs T0 * EM4X70_T_TAG_TWEE (EEPROM write time) // now EM4x70 needs EM4X70_T_TAG_TWEE (EEPROM write time)
// for saving data and should return with ACK // for saving data and should return with ACK
WaitTicks(EM4X70_T_TAG_WEE); WaitTicks(EM4X70_T_TAG_WEE);
if (check_ack()) { if (check_ack()) {