Fixed all "misleading-indentation" warnings (fixes #187).

This commit is contained in:
ikarus 2016-09-26 21:15:49 +02:00
commit 2943527472
4 changed files with 12 additions and 10 deletions

View file

@ -391,7 +391,7 @@ int legic_write_byte(int byte, int addr, int addr_sz) {
uint32_t cmd_sz = addr_sz+1+8+4; //crc+data+cmd uint32_t cmd_sz = addr_sz+1+8+4; //crc+data+cmd
legic_prng_forward(2); /* we wait anyways */ legic_prng_forward(2); /* we wait anyways */
while(timer->TC_CV < 387) ; /* ~ 258us */ while(timer->TC_CV < 387) {}; /* ~ 258us */
frame_send_rwd(cmd, cmd_sz); frame_send_rwd(cmd, cmd_sz);
//== wait for ack ==================================== //== wait for ack ====================================
@ -418,7 +418,7 @@ int legic_write_byte(int byte, int addr, int addr_sz) {
} }
} }
timer->TC_CCR = AT91C_TC_SWTRG; timer->TC_CCR = AT91C_TC_SWTRG;
while(timer->TC_CV > 1) ; /* Wait till the clock has reset */ while(timer->TC_CV > 1) {}; /* Wait till the clock has reset */
return -1; return -1;
} }

View file

@ -203,7 +203,7 @@ static void flash_mode(int externally_entered)
size_t rx_len; size_t rx_len;
usb_enable(); usb_enable();
for (volatile size_t i=0; i<0x100000; i++); for (volatile size_t i=0; i<0x100000; i++) {};
for(;;) { for(;;) {
WDT_HIT(); WDT_HIT();

View file

@ -696,14 +696,17 @@ int CmdHF14ACmdRaw(const char *cmd) {
c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us) c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
} }
if(power) if(power) {
c.arg[0] |= ISO14A_NO_DISCONNECT; c.arg[0] |= ISO14A_NO_DISCONNECT;
}
if(datalen > 0) if(datalen > 0) {
c.arg[0] |= ISO14A_RAW; c.arg[0] |= ISO14A_RAW;
}
if(topazmode) if(topazmode) {
c.arg[0] |= ISO14A_TOPAZMODE; c.arg[0] |= ISO14A_TOPAZMODE;
}
// Max buffer is USB_CMD_DATA_SIZE // Max buffer is USB_CMD_DATA_SIZE
c.arg[1] = (datalen & 0xFFFF) | (numbits << 16); c.arg[1] = (datalen & 0xFFFF) | (numbits << 16);

View file

@ -81,10 +81,9 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p
j--; // overwrite parity with next data j--; // overwrite parity with next data
// if parity fails then return 0 // if parity fails then return 0
switch (pType) { switch (pType) {
case 3: if (BitStream[j]==1) return 0; break; //should be 0 spacer bit case 3: if (BitStream[j]==1) {return 0;} break; //should be 0 spacer bit
case 2: if (BitStream[j]==0) return 0; break; //should be 1 spacer bit case 2: if (BitStream[j]==0) {return 0;} break; //should be 1 spacer bit
default: //test parity default: if (parityTest(parityWd, pLen, pType) == 0) {return 0;} break; //test parity
if (parityTest(parityWd, pLen, pType) == 0) return 0; break;
} }
bitCnt+=(pLen-1); bitCnt+=(pLen-1);
parityWd = 0; parityWd = 0;