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

style

Browse source
This commit is contained in:
iceman1001 2019-04-13 01:43:22 +02:00
commit 6803e6d1c0
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
armsrc/iso14443a.c
View file

@ -756,6 +756,7 @@ static int GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *l
// clear RXRDY: // clear RXRDY:
uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
(void)b;
while (!BUTTON_PRESS()) { while (!BUTTON_PRESS()) {
WDT_HIT(); WDT_HIT();
@ -908,6 +909,7 @@ void SimulateIso14443aTag(int tagType, int flags, uint8_t *data) {
response1[1] = 0x00; response1[1] = 0x00;
sak = 0x0A; sak = 0x0A;
} }
break;
default: { default: {
Dbprintf("Error: unkown tagtype (%d)", tagType); Dbprintf("Error: unkown tagtype (%d)", tagType);
return; return;
@ -1410,8 +1412,7 @@ void PrepareDelayedTransfer(uint16_t delay) {
delay &= 0x07; delay &= 0x07;
if (!delay) return; if (!delay) return;
uint8_t bitmask = 0; uint8_t bitmask = 0, bits_to_shift;
uint8_t bits_to_shift = 0;
uint8_t bits_shifted = 0; uint8_t bits_shifted = 0;
uint16_t i = 0; uint16_t i = 0;
@ -1551,7 +1552,6 @@ void CodeIso14443aBitsAsReaderPar(const uint8_t *cmd, uint16_t bits, const uint8
} else { } else {
// Sequence Y // Sequence Y
ToSend[++ToSendMax] = SEC_Y; ToSend[++ToSendMax] = SEC_Y;
last = 0;
} }
ToSend[++ToSendMax] = SEC_Y; ToSend[++ToSendMax] = SEC_Y;
@ -1574,7 +1574,7 @@ void CodeIso14443aAsReaderPar(const uint8_t *cmd, uint16_t len, const uint8_t *p
int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) { int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
*len = 0; *len = 0;
uint32_t timer = 0, vtime = 0; uint32_t timer = 0, vtime;
int analogCnt = 0; int analogCnt = 0;
int analogAVG = 0; int analogAVG = 0;
@ -1599,6 +1599,7 @@ int EmGetCmd(uint8_t *received, uint16_t *len, uint8_t *par) {
// Clear RXRDY: // Clear RXRDY:
uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
(void)b;
for (;;) { for (;;) {
WDT_HIT(); WDT_HIT();
@ -1811,6 +1812,7 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, uint8_t *receive
// clear RXRDY: // clear RXRDY:
uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
(void)b;
uint32_t timeout = iso14a_get_timeout(); uint32_t timeout = iso14a_get_timeout();
for (;;) { for (;;) {
@ -2354,7 +2356,7 @@ void ReaderIso14443a(UsbCommand *c) {
size_t lenbits = c->arg[1] >> 16; size_t lenbits = c->arg[1] >> 16;
uint32_t timeout = c->arg[2]; uint32_t timeout = c->arg[2];
uint8_t *cmd = c->d.asBytes; uint8_t *cmd = c->d.asBytes;
uint32_t arg0 = 0; uint32_t arg0;
uint8_t buf[USB_CMD_DATA_SIZE] = {0x00}; uint8_t buf[USB_CMD_DATA_SIZE] = {0x00};
uint8_t par[MAX_PARITY_SIZE] = {0x00}; uint8_t par[MAX_PARITY_SIZE] = {0x00};