X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fradios%2Fccspi.c;h=cca3305b7807ba3b0fedd9367dd49183a449d7c9;hp=524052f0fa33450390cdb561b22a12242dffc693;hb=345dd7e12dca804dcd7c8b3f69a332752bcc2642;hpb=8811b9e7eb0c09f5b7568abc5cbe8de90104c38d

diff --git a/firmware/apps/radios/ccspi.c b/firmware/apps/radios/ccspi.c
index 524052f..cca3305 100644
--- a/firmware/apps/radios/ccspi.c
+++ b/firmware/apps/radios/ccspi.c
@@ -1,7 +1,7 @@
 /*! \file ccspi.c
   \author Travis Goodspeed
   \brief Chipcon SPI Register Interface
-  
+
   Unfortunately, there is very little similarity between the CC2420
   and the CC2500, to name just two of the myriad of Chipcon SPI
   radios.  Auto-detection will be a bit difficult, but more to the
@@ -13,9 +13,6 @@
 #include "platform.h"
 #include "command.h"
 #include <stdlib.h> //added for itoa
-#include <signal.h>
-#include <io.h>
-#include <iomacros.h>
 
 #include "ccspi.h"
 #include "spi.h"
@@ -52,14 +49,14 @@ void ccspisetup(){
   SPIDIR|=MOSI+SCK;
   DIRSS;
   DIRCE;
-  
+
   P4OUT|=BIT5; //activate CC2420 voltage regulator
   msdelay(100);
-  
+
   //Reset the CC2420.
   P4OUT&=~BIT6;
   P4OUT|=BIT6;
-  
+
   //Begin a new transaction.
   CLRSS;
   SETSS;
@@ -70,7 +67,7 @@ u8 ccspitrans8(u8 byte){
   register unsigned int bit;
   //This function came from the CCSPI Wikipedia article.
   //Minor alterations.
-  
+
   for (bit = 0; bit < 8; bit++) {
     /* write MOSI on trailing edge of previous clock */
     if (byte & 0x80)
@@ -78,14 +75,14 @@ u8 ccspitrans8(u8 byte){
     else
       CLRMOSI;
     byte <<= 1;
- 
+
     SETCLK;
-  
+
     /* read MISO on trailing edge */
     byte |= READMISO;
     CLRCLK;
   }
-  
+
   return byte;
 }
 
@@ -93,22 +90,22 @@ u8 ccspitrans8(u8 byte){
 //! Writes a register
 u8 ccspi_regwrite(u8 reg, const u8 *buf, int len){
   CLRSS;
-  
+
   reg=ccspitrans8(reg);
   while(len--)
     ccspitrans8(*buf++);
-  
+
   SETSS;
   return reg;//status
 }
 //! Reads a register
 u8 ccspi_regread(u8 reg, u8 *buf, int len){
   CLRSS;
-  
+
   reg=ccspitrans8(reg);
   while(len--)
     *buf++=ccspitrans8(0);
-  
+
   SETSS;
   return reg;//status
 }
@@ -118,9 +115,10 @@ void ccspi_handle_fn( uint8_t const app,
 		      uint8_t const verb,
 		      uint32_t const len){
   unsigned long i;
-  
+  u8 j;
+
   //debugstr("Chipcon SPI handler.");
-  
+
   switch(verb){
   case PEEK:
     cmddata[0]|=0x40; //Set the read bit.
@@ -129,9 +127,11 @@ void ccspi_handle_fn( uint8_t const app,
   case WRITE:
   case POKE:
     CLRSS; //Drop !SS to begin transaction.
+    j=cmddata[0];//Backup address.
     for(i=0;i<len;i++)
       cmddata[i]=ccspitrans8(cmddata[i]);
     SETSS;  //Raise !SS to end transaction.
+    cmddata[0]=j&~0x40;//Restore address.
     txdata(app,verb,len);
     break;
   case SETUP:
@@ -142,12 +142,12 @@ void ccspi_handle_fn( uint8_t const app,
 #ifdef FIFOP
     //Has there been an overflow?
     if((!FIFO)&&FIFOP){
-      debugstr("Clearing overflow");
+      //debugstr("Clearing overflow");
       CLRSS;
       ccspitrans8(0x08); //SFLUSHRX
       SETSS;
     }
-    
+
     //Is there a packet?
     if(FIFOP&&FIFO){
       //Wait for completion.
@@ -161,11 +161,13 @@ void ccspi_handle_fn( uint8_t const app,
       for(i=0;i<cmddata[0]+2;i++)
         cmddata[i]=ccspitrans8(0xde);
       SETSS;
-      
+
       //Flush buffer.
-      CLRSS;
-      ccspitrans8(0x08); //SFLUSHRX
-      SETSS;
+      //CLRSS;
+      //ccspitrans8(0x08); //SFLUSHRX
+      //SETSS;
+      
+      
       //Only should transmit length of one more than the reported
       // length of the frame, which holds the length byte:
       txdata(app,verb,cmddata[0]+1);
@@ -183,7 +185,7 @@ void ccspi_handle_fn( uint8_t const app,
     CLRSS;
     ccspitrans8(CCSPI_SFLUSHRX);
     SETSS;
-    
+
     txdata(app,verb,0);
     break;
 
@@ -203,7 +205,7 @@ void ccspi_handle_fn( uint8_t const app,
         SETSS;
 
         //Load the jamming packet.
-        //TODO try to preload this to get faster effects
+        //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};
@@ -233,12 +235,13 @@ void ccspi_handle_fn( uint8_t const app,
     txdata(app,NOK,0);
 #endif
 
-  case CCSPI_REFLEX_SEQNUM:
+  case CCSPI_REFLEX_AUTOACK:
 #if defined(FIFOP) && defined(SFD) && defined(FIFO) && defined(PLED2DIR) && defined(PLED2PIN) && defined(PLED2OUT)
-    //char byte[4];
+    //txdata(app, verb, 1);
+    debugstr("AutoACK");
+    char byte[4];
     while(1) {
         //Has there been an overflow in the RX buffer?
-        //TODO do we really need to check this??
         if((!FIFO)&&FIFOP){
           //debugstr("Clearing overflow");
           CLRSS;
@@ -252,6 +255,29 @@ void ccspi_handle_fn( uint8_t const app,
 	    PLED2DIR |= PLED2PIN;
 	    PLED2OUT &= ~PLED2PIN;
 
+        //Put radio in TX mode
+        //Note: Not doing this slows down jamming, so can't jam short packets.
+        //      However, if we do this, it seems to mess up our RXFIFO ability.
+        //CLRSS;
+        //ccspitrans8(0x04);
+        //SETSS;
+        //Load the jamming packet
+        CLRSS;
+        ccspitrans8(CCSPI_TXFIFO);
+        char pkt[7] = {0x07, 0x01, 0x08, 0xff, 0xff, 0xff, 0xff};
+        for(i=0;i<pkt[0];i++)
+          ccspitrans8(pkt[i]);
+        SETSS;
+        //Transmit the jamming packet
+        CLRSS;
+        ccspitrans8(0x04);  //STXON
+        SETSS;
+        msdelay(200);       //Instead of examining SFD line status
+        //Flush TX buffer.
+        CLRSS;
+        ccspitrans8(0x09);  //SFLUSHTX
+        SETSS;
+
         //Get the orignally received packet, up to the seqnum field.
         CLRSS;
         ccspitrans8(CCSPI_RXFIFO | 0x40);
@@ -265,31 +291,51 @@ void ccspi_handle_fn( uint8_t const app,
         //Send the sequence number of the jammed packet back to the client
         //itoa(cmddata[3], byte, 16);
         //debugstr(byte);
-        txdata(app,verb,cmddata[3]);
+        //txdata(app,verb,cmddata[3]);
 
-        //Put radio in TX mode
-        CLRSS;
-        ccspitrans8(0x04);
-        SETSS;
+        //TODO turn on AUTOCRC for it to apply to the TX???
+        //     this may overcome issues of bad crc / length issues?
+        //mdmctrl0 (0x11) register set bit 5 to true.
+
+        //Create the forged ACK packet
+        cmddata[0] = 6;     //length of ack frame plus length
+        cmddata[1] = 0x02;  //first byte of FCF
+        cmddata[2] = 0x00;  //second byte of FCF
+        //[3] is already filled with the sequence number
+        int crc = 0;
+        for(i=1;i<4;i++) {
+            int c = cmddata[i];
+            int q = (crc ^ c) & 15;   		//Do low-order 4 bits
+            crc = (crc / 16) ^ (q * 4225);
+            q = (crc ^ (c / 16)) & 15;		//And high 4 bits
+            crc = (crc / 16) ^ (q * 4225);
+        }
+        cmddata[4] = crc & 0xFF;
+        cmddata[5] = (crc >> 8) & 0xFF;
 
-        //Load the packet.
+        for(i=0;i<cmddata[0];i++) {
+            itoa(cmddata[i], byte, 16);
+            debugstr(byte);
+        }
+        //Load the forged ACK packet
         CLRSS;
         ccspitrans8(CCSPI_TXFIFO);
-        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]);
+        for(i=0;i<cmddata[0];i++)
+          ccspitrans8(cmddata[i]);
         SETSS;
-
-        //Transmit the packet.
+        //Transmit the forged ACK packet
+        while(SFD);
         CLRSS;
         ccspitrans8(0x04);  //STXON
         SETSS;
-        msdelay(200);       //Instead of examining SFD line status
-        //Flush TX buffer.
+        msdelay(200);       //TODO try doing this based on SFD line status instead
+        //Flush TX buffer
         CLRSS;
         ccspitrans8(0x09);  //SFLUSHTX
         SETSS;
 
+        //TODO disable AUTOCRC here again to go back to promiscous mode
+
         //Turn off LED 2 (green) as signal
 	    PLED2DIR |= PLED2PIN;
 	    PLED2OUT |= PLED2PIN;
@@ -306,36 +352,37 @@ void ccspi_handle_fn( uint8_t const app,
     CLRSS;
     ccspitrans8(CCSPI_SFLUSHTX);
     SETSS;
-    
+
     txdata(app,verb,0);
     break;
   case CCSPI_TX:
 #ifdef FIFOP
-    
+
     //Wait for last packet to TX.
     //while(ccspi_status()&BIT3);
     
+    //Flush TX buffer.
+    CLRSS;
+    ccspitrans8(0x09); //SFLUSHTX
+    SETSS;
+    
+
     //Load the packet.
     CLRSS;
     ccspitrans8(CCSPI_TXFIFO);
     for(i=0;i<cmddata[0];i++)
       ccspitrans8(cmddata[i]);
     SETSS;
-    
+
     //Transmit the packet.
     CLRSS;
     ccspitrans8(0x04); //STXON
     SETSS;
-    
+
     //Wait for the pulse on SFD, after which the packet has been sent.
     while(!SFD);
     while(SFD);
     
-    //Flush TX buffer.
-    CLRSS;
-    ccspitrans8(0x09); //SFLUSHTX
-    SETSS;
-    
     txdata(app,verb,0);
 #else
     debugstr("Can't TX a packet with SFD and FIFOP definitions.");