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 2022-07-06 13:45:06 +02:00
commit 167cca5fc0
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/fpgaloader.c
View file

@ -613,10 +613,12 @@ void switch_off(void) {
if (g_dbglevel > 3) { if (g_dbglevel > 3) {
Dbprintf("switch_off"); Dbprintf("switch_off");
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
if (downloaded_bitstream == FPGA_BITSTREAM_HF || downloaded_bitstream == FPGA_BITSTREAM_HF_15) { if (downloaded_bitstream == FPGA_BITSTREAM_HF || downloaded_bitstream == FPGA_BITSTREAM_HF_15) {
FpgaDisableSscDma(); FpgaDisableSscDma();
} }
set_tracing(false); set_tracing(false);
LEDsoff(); LEDsoff();
} }

16
armsrc/hfops.c
View file

@ -122,7 +122,7 @@ static uint32_t EncodeFinish(uint8_t *data) {
return encode_indx; return encode_indx;
} }
static uint32_t HfEncodeTkm(uint8_t *uid, uint8_t modulation, uint8_t *data) { static uint32_t HfEncodeTkm(const uint8_t *uid, uint8_t modulation, uint8_t *data) {
uint32_t len = 0; uint32_t len = 0;
if (modulation == 0) { if (modulation == 0) {
// TK-13 // TK-13
@ -220,21 +220,23 @@ int HfWriteTkm(uint8_t *uid, uint8_t modulation, uint32_t timeout) {
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_212K); FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_212K);
FpgaSetupSsc(FPGA_MAJOR_MODE_HF_SIMULATOR); FpgaSetupSsc(FPGA_MAJOR_MODE_HF_SIMULATOR);
int vHf = 0; // in mV
bool button_pressed = false; bool button_pressed = false;
bool exit_loop = false; bool exit_loop = false;
bool field_on = false; bool field_on = false;
while (exit_loop == false) { while (exit_loop == false) {
button_pressed = BUTTON_PRESS(); button_pressed = BUTTON_PRESS();
if (button_pressed || data_available()) if (button_pressed || data_available()) {
break; break;
}
WDT_HIT(); WDT_HIT();
vHf = (MAX_ADC_HF_VOLTAGE * SumAdc(ADC_CHAN_HF, 32)) >> 15; // in mV
int vHf = (MAX_ADC_HF_VOLTAGE * SumAdc(ADC_CHAN_HF, 32)) >> 15;
if (vHf > MF_MINFIELDV) { if (vHf > MF_MINFIELDV) {
if (!field_on) { if (field_on == false) {
LED_A_ON(); LED_A_ON();
SpinDelay(50); SpinDelay(50);
} }
@ -248,10 +250,10 @@ int HfWriteTkm(uint8_t *uid, uint8_t modulation, uint32_t timeout) {
} }
SpinDelay(3); SpinDelay(3);
for (int i = 0; i < elen;) { for (int i = 0; i < elen;) {
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) { if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
AT91C_BASE_SSC->SSC_THR = data[i]; AT91C_BASE_SSC->SSC_THR = data[i++];
i++;
} }
} }
} }