CHG; travis CI and multi platform part..

[proxmark3-svn] / armsrc / iso14443b.c

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 5d506c3b739de95da78c9a4e101de09f60fd1bfd..68f0c366865142967db2f23beebd6ec20a5276c6 100644 (file)
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -453,7 +453,7 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
                
        StartCountSspClk();
        
                
        StartCountSspClk();
        

-       volatile uint8_t b;
+       volatile uint8_t b = 0;

 
        // clear receiving shift register and holding register
        // What does this loop do? Is it TR1?
 
        // clear receiving shift register and holding register
        // What does this loop do? Is it TR1?


@@ -467,7 +467,6 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len) {
        // Now run a `software UART' on the stream of incoming samples.
        UartInit(received);
 
        // Now run a `software UART' on the stream of incoming samples.
        UartInit(received);
 

-       b = 0;

        uint8_t mask;
        while( !BUTTON_PRESS() ) {
                WDT_HIT();
        uint8_t mask;
        while( !BUTTON_PRESS() ) {
                WDT_HIT();


@@ -490,11 +489,11 @@ void ClearFpgaShiftingRegisters(void){
        volatile uint8_t b;
 
        // clear receiving shift register and holding register
        volatile uint8_t b;
 
        // clear receiving shift register and holding register

-       while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+       while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};

 
        b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 
 
        b = AT91C_BASE_SSC->SSC_RHR; (void) b;
 

-       while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY));
+       while(!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)) {};

 
        b = AT91C_BASE_SSC->SSC_RHR; (void) b;
        
 
        b = AT91C_BASE_SSC->SSC_RHR; (void) b;