X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fradios%2Fccspi.c;h=6df045811068937ceffacd82136c5ae602630ff8;hp=6644a76f5ae629c7f6c33927e12fae6dd0e47905;hb=19c84b41b9fbde102aee56bc137a8a2885194ebf;hpb=b8cf36028990c8152a6cea86d1e5d5ffed770ea8

diff --git a/firmware/apps/radios/ccspi.c b/firmware/apps/radios/ccspi.c
index 6644a76..6df0458 100644
--- a/firmware/apps/radios/ccspi.c
+++ b/firmware/apps/radios/ccspi.c
@@ -88,58 +88,67 @@ u8 ccspitrans8(u8 byte){
 
 
 //! Reflexively jam on the present channel.
-void ccspireflexjam(){
+void ccspireflexjam(u16 delay){
   unsigned long i;
   #if defined(FIFOP) && defined(SFD) && defined(FIFO) && defined(PLED2DIR) && defined(PLED2PIN) && defined(PLED2OUT)
-    debugstr("Reflex jamming until reset.");
-    txdata(CCSPI,CCSPI_REFLEX,1);  //Let the client continue its business.
-    while(1) {
-      //Wait until a packet is received
-      while(!SFD){
-	//Has there been an overflow in the RX buffer?
-        if((!FIFO)&&FIFOP){
-          debugstr("Clearing RX overflow");
-          CLRSS;
-          ccspitrans8(0x08); //SFLUSHRX
-          SETSS;
-        }
+  
+  prep_timer();
+  debugstr("Reflex jamming until reset.");
+  debughex(delay);
+  txdata(CCSPI,CCSPI_REFLEX,1);  //Let the client continue its business.
+  while(1) {
+    //Wait until a packet is received
+    while(!SFD){
+      //Has there been an overflow in the RX buffer?
+      if((!FIFO)&&FIFOP){
+	//debugstr("Clearing RX overflow");
+	CLRSS;
+	ccspitrans8(0x08); //SFLUSHRX
+	SETSS;
       }
-      //Turn on LED 2 (green) as signal
-      PLED2DIR |= PLED2PIN;
-      PLED2OUT &= ~PLED2PIN;
-
-      //Put radio in TX mode
-      CLRSS;
-      ccspitrans8(0x04);
-      SETSS;
-
-      //Load the jamming packet.
-      //Note: attempts to preload this actually slowed the jam time down from 7 to 9 bytes.
-      CLRSS;
-      ccspitrans8(CCSPI_TXFIFO);
-      char pkt[15] = {0x0f, 0x01, 0x08, 0x82, 0xff, 0xff, 0xff, 0xff, 0xde, 0xad, 0xbe, 0xef, 0xba, 0xbe, 0xc0};
-      //char pkt[12] = {0x0c, 0x01, 0x08, 0x82, 0xff, 0xff, 0xff, 0xff, 0xde, 0xad, 0xbe, 0xef};
-      for(i=0;i<pkt[0];i++)
-	ccspitrans8(pkt[i]);
-      SETSS;
-
-      //Transmit the packet.
-      CLRSS;
-      ccspitrans8(0x04); //STXON
-      SETSS;
-      msdelay(100);      //Instead of waiting for pulse on SFD
-      //Flush TX buffer.
-      CLRSS;
-      ccspitrans8(0x09); //SFLUSHTX
-      SETSS;
-
-      //Turn off LED 2 (green) as signal
-      PLED2DIR |= PLED2PIN;
-      PLED2OUT |= PLED2PIN;
     }
+    //Turn on LED 2 (green) as signal
+    PLED2DIR |= PLED2PIN;
+    PLED2OUT &= ~PLED2PIN;
+    
+    
+    
+    //Wait a few us to send it.
+    delay_us(delay);
+
+    //Transmit the packet.
+    CLRSS;
+    ccspitrans8(0x04);
+    SETSS;
+    
+    
+    //Load the next jamming packet.
+    //Note: attempts to preload this actually slowed the jam time down from 7 to 9 bytes.
+    CLRSS;
+    ccspitrans8(CCSPI_TXFIFO);
+    char pkt[5] = {0x05, 0, 0, 0, 0};
+    //char pkt[15] = {0x0f, 0x01, 0x08, 0x82, 0xff, 0xff, 0xff, 0xff, 0xde, 0xad, 0xbe, 0xef, 0xba, 0xbe, 0xc0};
+    //char pkt[12] = {0x0c, 0x01, 0x08, 0x82, 0xff, 0xff, 0xff, 0xff, 0xde, 0xad, 0xbe, 0xef};
+    for(i=0;i<pkt[0];i++)
+      ccspitrans8(pkt[i]);
+    SETSS;
+    
+    //* I think this might be unnecessary.
+    //msdelay(100+delay);      //Instead of waiting for pulse on SFD
+    //delay_ms(1);
+    //Flush TX buffer.
+    CLRSS;
+    ccspitrans8(0x09); //SFLUSHTX
+    SETSS;
+    
+    
+    //Turn off LED 2 (green) as signal
+    PLED2DIR |= PLED2PIN;
+    PLED2OUT |= PLED2PIN;
+  }
 #else
-    debugstr("Can't reflexively jam without SFD, FIFO, FIFOP, and P2LEDx definitions - try using telosb platform.");
-    txdata(app,NOK,0);
+  debugstr("Can't reflexively jam without SFD, FIFO, FIFOP, and P2LEDx definitions - try using telosb platform.");
+  txdata(CCSPI,NOK,0);
 #endif
 }
 
@@ -248,7 +257,7 @@ void ccspi_handle_fn( uint8_t const app,
     break;
 
   case CCSPI_REFLEX:
-    ccspireflexjam();
+    ccspireflexjam(len?cmddataword[0]:0);
     break;
 
   case CCSPI_REFLEX_AUTOACK: