Update hfsnoop.c iceman1001-patch-4 337/head
authorIceman <iceman@iuse.se>
Sun, 25 Jun 2017 17:39:45 +0000 (19:39 +0200)
committerGitHub <noreply@github.com>
Sun, 25 Jun 2017 17:39:45 +0000 (19:39 +0200)
chg:  enabled snooping function to break on receiving a usbpackage.

armsrc/hfsnoop.c

index c750ab261eab647a4e41e57c9d77b4fb2a82763a..6a58b20b0e7f9fc6319abc7ea6869f5fa6e9cc60 100644 (file)
@@ -19,7 +19,7 @@ static void RAMFUNC optimizedSnoop(void)
                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)
@@ -28,7 +28,9 @@ static void RAMFUNC optimizedSnoop(void)
 
 void HfSnoop(int samplesToSkip, int triggersToSkip)
 {
-       Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.", samplesToSkip, triggersToSkip);
+       BigBuf_free(); BigBuf_Clear();
+       
+       Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
        int trigger_cnt;
        LED_D_ON();
        // Select correct configs
@@ -40,23 +42,18 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SNOOP);
        SpinDelay(100);
 
-       BigBuf_free();
-       BigBuf_Clear();
-       
        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;
        uint16_t r = 0;
-       while(!BUTTON_PRESS()) {
+       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;
                        r = MAX(r & 0xff, r >> 8); 
-                       if (r >= 240) 
-                       {
-                               if (++trigger_cnt > triggersToSkip) {
+                       if (r >= 240) {
+                               if (++trigger_cnt > triggersToSkip)
                                        break;
-                               }
                        } 
                }
        }
@@ -64,9 +61,8 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
        if(!BUTTON_PRESS()) {
                int waitcount = samplesToSkip; // lets wait 40000 ticks of pck0
                while(waitcount != 0) {
-                       if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
+                       if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY))
                                waitcount--;
-                       }
                }
                optimizedSnoop();
                Dbprintf("Trigger kicked! Value: %d, Dumping Samples Hispeed now.", r);
Impressum, Datenschutz