]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge pull request #26 from ickerwx/indentation_fix
authorIceman <iceman@iuse.se>
Tue, 13 Sep 2016 21:37:39 +0000 (23:37 +0200)
committerGitHub <noreply@github.com>
Tue, 13 Sep 2016 21:37:39 +0000 (23:37 +0200)
Indentation fix

armsrc/iso14443b.c
bootrom/bootrom.c
common/lfdemod.c

index cc8cd65a78df945f376be41719fb4f195661feb9..5d506c3b739de95da78c9a4e101de09f60fd1bfd 100644 (file)
@@ -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;
                        }
index 63c04ae5c952ab4ec61aac15f1d61ba4b188e5a4..4437b9f2711287e3fac9a3afe3c53d02e602e722 100644 (file)
@@ -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;
       
index f231cd69fd54e787506cea2cee9f4d022cf87e0a..ff80b8b341e538a17780756541268f497dce106e 100644 (file)
@@ -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;
Impressum, Datenschutz