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

Adaptation of the implementation of read function to that currently used in master branch

Browse source
This commit is contained in:
tharexde 2020-10-27 19:16:54 +01:00
commit 140037d9f0
4 changed files with 19 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

28
armsrc/em4x50.c
View file

@ -907,13 +907,9 @@ void em4x50_info(em4x50_data_t *etd) {
void em4x50_read(em4x50_data_t *etd) {
// reads in two different ways:
// - using "selective read mode" -> bidirectional communication
// - using "standard read mode" -> unidirectional communication (read
// data that tag transmits "voluntarily")
// reads by using "selective read mode" -> bidirectional communication
bool bsuccess = false, blogin = false;
int now = 0;
uint8_t status = 0;
uint32_t words[EM4X50_NO_WORDS] = {0x0};
@ -922,26 +918,16 @@ void em4x50_read(em4x50_data_t *etd) {
// set gHigh and gLow
if (get_signalproperties() && find_em4x50_tag()) {
if (etd->addr_given) {
// try to login with given password
if (etd->pwd_given)
blogin = login(etd->password1);
// selective read mode
// only one word has to be read -> first word read = last word read
bsuccess = selective_read(etd->addresses, words);
// try to login with given password
if (etd->pwd_given)
blogin = login(etd->password1);
// only one word has to be read -> first word read = last word read
bsuccess = selective_read(etd->addresses, words);
} else {
// standard read mode
bsuccess = standard_read(&now, words);
}
}
status = (now << 2) + (bsuccess << 1) + blogin;
status = (bsuccess << 1) + blogin;
LOW(GPIO_SSC_DOUT);
lf_finalize();