Fix Gcc 8 warnings (#632)

[proxmark3-svn] / armsrc / hfsnoop.c

diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 5338bd0d6e47884214f9063c2b639b863a01131f..d06af44383df8d4a451c7b8121536ee79f87e051 100644 (file)
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -2,14 +2,14 @@
 #include "apps.h"
 #include "BigBuf.h"
 #include "util.h"
 #include "apps.h"
 #include "BigBuf.h"
 #include "util.h"

+#include "usb_cdc.h"   // for usb_poll_validate_length

 
 static void RAMFUNC optimizedSnoop(void);
 
 static void RAMFUNC optimizedSnoop(void)
 {
 
 static void RAMFUNC optimizedSnoop(void);
 
 static void RAMFUNC optimizedSnoop(void)
 {

-       BigBuf_free();

        int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory
        int n = BigBuf_max_traceLen() / sizeof(uint16_t); // take all memory

-        
+

        uint16_t *dest = (uint16_t *)BigBuf_get_addr();
        uint16_t *destend = dest + n;
 
        uint16_t *dest = (uint16_t *)BigBuf_get_addr();
        uint16_t *destend = dest + n;
 


@@ -20,18 +20,20 @@ static void RAMFUNC optimizedSnoop(void)
                if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)
                {
                        *dest = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);
                if(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)
                {
                        *dest = (uint16_t)(AT91C_BASE_SSC->SSC_RHR);

-                       dest = dest + 1;
+                       dest++;

                }
        }
        //Resetting Frame mode (First set in fpgaloader.c)
                }
        }
        //Resetting Frame mode (First set in fpgaloader.c)

-       AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0); 
+       AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(8) | AT91C_SSC_MSBF | SSC_FRAME_MODE_WORDS_PER_TRANSFER(0);

 }
 
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {
 }
 
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {

+       BigBuf_free(); BigBuf_Clear();
+       

        Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
        Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);

-       bool trigger_cnt;
-       LED_D_OFF();
+       int trigger_cnt;
+       LED_D_ON();

        // Select correct configs
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        // Set up the synchronous serial port
        // Select correct configs
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        // Set up the synchronous serial port


@@ -42,32 +44,32 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
        SpinDelay(100);
 
        AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(16); // Setting Frame Mode For better performance on high speed data transfer.
        SpinDelay(100);
 
        AT91C_BASE_SSC->SSC_RFMR = SSC_FRAME_MODE_BITS_IN_WORD(16); // Setting Frame Mode For better performance on high speed data transfer.

-  
+

        trigger_cnt = 0;
        trigger_cnt = 0;

-       uint16_t r;
-       for(;;) {
+       uint16_t r = 0;
+       while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
+               WDT_HIT();

                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                        r = (uint16_t)AT91C_BASE_SSC->SSC_RHR;
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                        r = (uint16_t)AT91C_BASE_SSC->SSC_RHR;

-                       if (!(trigger_cnt == triggersToSkip) && ( (r >> 8) >= 240))
-                       {
-                               Dbprintf("Trigger kicked! Value: %d.", r >> 8);
-                               trigger_cnt++;
-                               break;
-                       }
+                       r = MAX(r & 0xff, r >> 8); 
+                       if (r >= 240) {
+                               if (++trigger_cnt > triggersToSkip)
+                                       break;
+                       } 

                }
        }
                }
        }

-       Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r >> 8);
-       int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
-       while(waitcount != 0) {
-               if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-                       waitcount--;
+
+       if(!BUTTON_PRESS()) {
+               int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
+               while(waitcount != 0) {
+                       if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
+                               waitcount--;

                }
                }

+               optimizedSnoop();
+               Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);

        }
 
        }
 

-       // Snooooop!!!
-       optimizedSnoop();
-
-       DbpString("Done.");
+       DbpString("HF Snoop end");

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LED_D_OFF();
 }
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LED_D_OFF();
 }