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

cppchecker fixes

Browse source
This commit is contained in:
iceman1001 2021-01-28 12:11:24 +01:00
commit 3c07e264c9
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
armsrc/em4x50.c
View file

@ -646,7 +646,7 @@ static int get_word_from_bitstream(uint32_t *data) {
// simple login to EM4x50, // simple login to EM4x50,
// used in operations that require authentication // used in operations that require authentication
static bool login(uint32_t password) { static int login(uint32_t password) {
if (request_receive_mode() == PM3_SUCCESS) { if (request_receive_mode() == PM3_SUCCESS) {
// send login command // send login command
@ -722,7 +722,7 @@ static bool brute(uint32_t start, uint32_t stop, uint32_t *pwd) {
void em4x50_login(uint32_t *password) { void em4x50_login(uint32_t *password) {
em4x50_setup_read(); em4x50_setup_read();
uint8_t status = PM3_EFAILED; int status = PM3_EFAILED;
if (get_signalproperties() && find_em4x50_tag()) if (get_signalproperties() && find_em4x50_tag())
status = login(*password); status = login(*password);
@ -1111,7 +1111,7 @@ void em4x50_writepwd(em4x50_data_t *etd) {
static void em4x50_sim_send_bit(uint8_t bit) { static void em4x50_sim_send_bit(uint8_t bit) {
//uint16_t timeout = EM4X50_T_TAG_FULL_PERIOD; //uint16_t timeout = EM4X50_T_TAG_FULL_PERIOD;
uint16_t timeout = EM4X50_T_SIMULATION_TIMEOUT_READ; int16_t timeout = EM4X50_T_SIMULATION_TIMEOUT_READ;
for (int t = 0; t < EM4X50_T_TAG_FULL_PERIOD; t++) { for (int t = 0; t < EM4X50_T_TAG_FULL_PERIOD; t++) {
@ -1236,7 +1236,7 @@ static int em4x50_sim_read_bit(void) {
if (timeout <= 0) { if (timeout <= 0) {
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
timeout = EM4X50_T_SIMULATION_TIMEOUT_READ; // timeout = EM4X50_T_SIMULATION_TIMEOUT_READ;
// now we have a reference "position", from here it will take // now we have a reference "position", from here it will take
// slightly less than 32 cycles until the end of the bit period // slightly less than 32 cycles until the end of the bit period
@ -1420,8 +1420,6 @@ static void em4x50_sim_send_nak(void) {
// standard read mode process (simulation mode) // standard read mode process (simulation mode)
static int em4x50_sim_handle_standard_read_command(uint32_t *tag) { static int em4x50_sim_handle_standard_read_command(uint32_t *tag) {
int command = 0;
// extract control data // extract control data
int fwr = reflect32(tag[EM4X50_CONTROL]) & 0xFF; // first word read int fwr = reflect32(tag[EM4X50_CONTROL]) & 0xFF; // first word read
int lwr = (reflect32(tag[EM4X50_CONTROL]) >> 8) & 0xFF; // last word read int lwr = (reflect32(tag[EM4X50_CONTROL]) >> 8) & 0xFF; // last word read
@ -1435,7 +1433,7 @@ static int em4x50_sim_handle_standard_read_command(uint32_t *tag) {
WDT_HIT(); WDT_HIT();
command = em4x50_sim_send_listen_window(tag); int command = em4x50_sim_send_listen_window(tag);
if (command != PM3_SUCCESS) { if (command != PM3_SUCCESS) {
return command; return command;
} }
@ -1461,8 +1459,6 @@ static int em4x50_sim_handle_standard_read_command(uint32_t *tag) {
// selective read mode process (simulation mode) // selective read mode process (simulation mode)
static int em4x50_sim_handle_selective_read_command(uint32_t *tag) { static int em4x50_sim_handle_selective_read_command(uint32_t *tag) {
int command = 0;
// read password // read password
uint32_t address = 0; uint32_t address = 0;
bool addr = em4x50_sim_read_word(&address); bool addr = em4x50_sim_read_word(&address);
@ -1491,7 +1487,7 @@ static int em4x50_sim_handle_selective_read_command(uint32_t *tag) {
WDT_HIT(); WDT_HIT();
command = em4x50_sim_send_listen_window(tag); int command = em4x50_sim_send_listen_window(tag);
if (command != PM3_SUCCESS) { if (command != PM3_SUCCESS) {
return command; return command;
} }