From: Iceman Date: Tue, 13 Sep 2016 21:37:39 +0000 (+0200) Subject: Merge pull request #26 from ickerwx/indentation_fix X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/a5d824656811693c9f31cf41766e419b2dd799f9?hp=111c6934d4e5c58883d08210399afe8eaeccc5c3 Merge pull request #26 from ickerwx/indentation_fix Indentation fix --- diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c index cc8cd65a..5d506c3b 100644 --- a/armsrc/iso14443b.c +++ b/armsrc/iso14443b.c @@ -1639,11 +1639,11 @@ void RAMFUNC SnoopIso14443b(void) { if (triggered) LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, NULL, TRUE); - /* And ready to receive another command. */ - UartReset(); - /* And also reset the demod code, which might have been */ - /* false-triggered by the commands from the reader. */ - DemodReset(); + /* And ready to receive another command. */ + UartReset(); + /* And also reset the demod code, which might have been */ + /* false-triggered by the commands from the reader. */ + DemodReset(); } else { time_start = GetCountSspClk() - time_0; } diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c index 63c04ae5..4437b9f2 100644 --- a/bootrom/bootrom.c +++ b/bootrom/bootrom.c @@ -141,10 +141,10 @@ void UsbPacketReceived(uint8_t *packet, int len) { // Wait until flashing of page finishes uint32_t sr; while(!((sr = AT91C_BASE_EFC0->EFC_FSR) & AT91C_MC_FRDY)); - if(sr & (AT91C_MC_LOCKE | AT91C_MC_PROGE)) { - dont_ack = 1; - cmd_send(CMD_NACK,sr,0,0,0,0); - } + if(sr & (AT91C_MC_LOCKE | AT91C_MC_PROGE)) { + dont_ack = 1; + cmd_send(CMD_NACK,sr,0,0,0,0); + } } } break; diff --git a/common/lfdemod.c b/common/lfdemod.c index f231cd69..ff80b8b3 100644 --- a/common/lfdemod.c +++ b/common/lfdemod.c @@ -84,7 +84,9 @@ size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t p 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 default: //test parity - if (parityTest(parityWd, pLen, pType) == 0) return 0; break; + if (parityTest(parityWd, pLen, pType) == 0) + return 0; + break; } bitCnt+=(pLen-1); parityWd = 0;