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

formal adjustments

Browse source
This commit is contained in:
tharexde 2020-06-27 00:20:56 +02:00
commit 86eaac46dc
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
armsrc/em4x50.c
View file

@ -604,7 +604,9 @@ static int get_word_from_bitstream(uint8_t bits[EM4X50_TAG_WORD]) {
} }
} }
//==============================================================================
// login function // login function
//==============================================================================
static bool login(uint8_t password[4]) { static bool login(uint8_t password[4]) {
@ -631,7 +633,9 @@ static bool login(uint8_t password[4]) {
return false; return false;
} }
//==============================================================================
// reset function // reset function
//==============================================================================
static bool reset(void) { static bool reset(void) {
@ -653,7 +657,9 @@ static bool reset(void) {
return false; return false;
} }
//==============================================================================
// read functions // read functions
//==============================================================================
static bool standard_read(int *now) { static bool standard_read(int *now) {
@ -756,7 +762,7 @@ void em4x50_info(em4x50_data_t *etd) {
void em4x50_sread(em4x50_data_t *etd) { void em4x50_sread(em4x50_data_t *etd) {
// reads single word in two alternative ways: // reads in two different ways:
// - using "selective read mode" -> bidirectional communication // - using "selective read mode" -> bidirectional communication
// - using "standard read mode" -> unidirectional communication (read // - using "standard read mode" -> unidirectional communication (read
// data that tag transmits "voluntarily") // data that tag transmits "voluntarily")
@ -764,7 +770,7 @@ void em4x50_sread(em4x50_data_t *etd) {
bool bsuccess = false, blogin = false; bool bsuccess = false, blogin = false;
int now = 0; int now = 0;
uint8_t status = 0; uint8_t status = 0;
uint8_t addresses[] = {0x00, 0x00, 0x00, 0x00}; // fwr = 0, lwr = 33 uint8_t addresses[] = {0x00, 0x00, 0x00, 0x00};
init_tag(); init_tag();
em4x50_setup_read(); em4x50_setup_read();
@ -790,14 +796,16 @@ void em4x50_sread(em4x50_data_t *etd) {
bsuccess = standard_read(&now); bsuccess = standard_read(&now);
} }
status = (now << 2) + (bsuccess << 1) + blogin; status = (now << 2) + (bsuccess << 1) + blogin;
lf_finalize(); lf_finalize();
reply_ng(CMD_ACK, status, (uint8_t *)tag.sectors, 238); reply_ng(CMD_ACK, status, (uint8_t *)tag.sectors, 238);
} }
//==============================================================================
// write functions // write functions
//==============================================================================
static bool write(uint8_t word[4], uint8_t address) { static bool write(uint8_t word[4], uint8_t address) {