B100 firmware changes to allow slave mode TX/RX.

4 files changed, 59 insertions, 162 deletions

diff --git a/firmware/fx2/b100/usrp_common.c b/firmware/fx2/b100/usrp_common.c
index 4b6dde881..7aedce9f7 100644
--- a/firmware/fx2/b100/usrp_common.c
+++ b/firmware/fx2/b100/usrp_common.c
@@ -32,12 +32,11 @@ init_usrp (void)
   CPUCS = bmCLKSPD1;	// CPU runs @ 48 MHz
   CKCON = 0;		// MOVX takes 2 cycles
 
-  // IFCLK is generated internally and runs at 48 MHz; GPIF "master mode"
-
-  IFCONFIG = bmIFCLKSRC | bm3048MHZ | bmIFCLKOE | bmIFCLKPOL | bmIFGPIF;
+  // IFCLK is generated internally and runs at 48 MHz; slave FIFO mode
+  IFCONFIG = bmIFCLKSRC | bm3048MHZ | bmIFCLKOE | bmIFSLAVE;
   SYNCDELAY;
 
-  // configure IO ports (B and D are used by GPIF)
+  // configure IO ports (B and D are used by slave FIFO)
 
   IOA = bmPORT_A_INITIAL;	// Port A initial state
   OEA = bmPORT_A_OUTPUTS;	// Port A direction register
@@ -77,23 +76,25 @@ init_usrp (void)
 
   EP2FIFOCFG =             bmWORDWIDE;			SYNCDELAY;
   EP2FIFOCFG = bmAUTOOUT | bmWORDWIDE;			SYNCDELAY;
-  EP6FIFOCFG = bmZEROLENIN | bmWORDWIDE;			SYNCDELAY;
+  EP6FIFOCFG = bmZEROLENIN            | bmWORDWIDE;			SYNCDELAY;
+  EP6FIFOCFG = bmZEROLENIN | bmAUTOIN | bmWORDWIDE;			SYNCDELAY;
   //EP6FIFOCFG = bmWORDWIDE;			SYNCDELAY;
   EP4FIFOCFG =             bmWORDWIDE;      SYNCDELAY;
   EP4FIFOCFG = bmAUTOOUT | bmWORDWIDE;      SYNCDELAY;
-  EP8FIFOCFG = bmAUTOIN  | bmWORDWIDE;      SYNCDELAY;
+  EP8FIFOCFG = bmZEROLENIN |            bmWORDWIDE;      SYNCDELAY;
+  EP8FIFOCFG = bmZEROLENIN | bmAUTOIN | bmWORDWIDE;      SYNCDELAY;
 
   EP0BCH = 0;			SYNCDELAY;
 
   // arm EP1OUT so we can receive "out" packets (TRM pg 8-8)
 
   EP1OUTBC = 0;			SYNCDELAY;
-
+/*
   EP2GPIFFLGSEL = 0x00;		SYNCDELAY; // For EP2OUT, GPIF uses EF flag
   EP6GPIFFLGSEL = 0x00;		SYNCDELAY; // For EP6IN,  GPIF uses FF flag
   EP4GPIFFLGSEL = 0x00;   SYNCDELAY;
   EP8GPIFFLGSEL = 0x00;   SYNCDELAY;
-
+*/
   // set autoin length for EP6
   // FIXME should be f(enumeration)
 
diff --git a/firmware/fx2/b100/usrp_main.c b/firmware/fx2/b100/usrp_main.c
index 391a6d94f..45fa60ae9 100644
--- a/firmware/fx2/b100/usrp_main.c
+++ b/firmware/fx2/b100/usrp_main.c
@@ -21,7 +21,6 @@
 #include "usrp_common.h"
 #include "usrp_commands.h"
 #include "fpga.h"
-#include "usrp_gpif_inline.h"
 #include "timer.h"
 #include "i2c.h"
 #include "isr.h"
@@ -64,7 +63,7 @@ bit enable_gpif = 0;
 #define	  USRP_HASH_SIZE      16
 xdata at USRP_HASH_SLOT_1_ADDR unsigned char hash1[USRP_HASH_SIZE];
 
-void clear_fpga_data_fifo(void);
+//void clear_fpga_data_fifo(void);
 
 static void
 get_ep0_data (void)
@@ -175,12 +174,10 @@ app_vendor_cmd (void)
       break;
       
     case VRQ_ENABLE_GPIF:
-      enable_gpif = (wValueL != 0) ? 1 : 0;
-      set_led_1(enable_gpif);
       break;
     
     case VRQ_CLEAR_FPGA_FIFO:
-        clear_fpga_data_fifo();
+        //clear_fpga_data_fifo();
         break;
 
     default:
@@ -194,125 +191,12 @@ app_vendor_cmd (void)
   return 1;
 }
 
-static int short_pkt_state = 0;
-#define SHORT_PACKET_DETECTED (short_pkt_state != bitSHORT_PACKET_SIGNAL)
-
-//yes, this is a little opaque
-//basically this is necessary because while all the logic to inform the FPGA
-//of what we're trying to do via the CTL pins is contained within the flowstates,
-//we need to assert the endpoint select pin one clock cycle before the flowstate starts.
-//this is the job of the wave descriptor. rather than switch between waves, since that
-//involves a little more setup, we just modify the wave table on the fly.
-inline static void setup_wave_data_read(void) {
-    GPIF_WAVE_DATA[80] = 0x06;
-    GPIF_WAVE_DATA[81] = 0x06;
-}
-
-inline static void setup_wave_ctrl_read(void) {
-    GPIF_WAVE_DATA[80] = 0x0E;
-    GPIF_WAVE_DATA[81] = 0x0E;
-}
-
-inline static void setup_wave_data_write(void) {
-    GPIF_WAVE_DATA[112] = 0x00;
-    GPIF_WAVE_DATA[113] = 0x00;
-}
-
-inline static void setup_wave_ctrl_write(void) {
-    GPIF_WAVE_DATA[112] = 0x08;
-    GPIF_WAVE_DATA[113] = 0x08;
-}
-
-inline static void handle_data_write(void) {
-    GPIFTCB1 = 0x01;	//SYNCDELAY;
-    GPIFTCB0 = 0x00;
-    setup_flowstate_data_write ();
-    setup_wave_data_write();
-    GPIFTRIG = bmGPIF_EP2_START | bmGPIF_WRITE; 	// start the xfer
-    SYNCDELAY;
-    while (!(GPIFTRIG & bmGPIF_IDLE));
-}
-
-inline static void handle_ctrl_write(void) {
-    GPIFTCB1 = 0x00;
-    GPIFTCB0 = 0x10;
-    setup_flowstate_ctrl_write ();
-    setup_wave_ctrl_write();
-    GPIFTRIG = bmGPIF_EP4_START | bmGPIF_WRITE; 	// start the xfer
-    SYNCDELAY;
-    while (!(GPIFTRIG & bmGPIF_IDLE));
-}
-
-inline static void handle_data_read(void) {
-    GPIFTCB1 = 0x01;
-    GPIFTCB0 = 0x00;
-    setup_flowstate_data_read ();
-    setup_wave_data_read();
-    short_pkt_state = bitSHORT_PACKET_SIGNAL;
-    GPIFTRIG = bmGPIF_EP6_START | bmGPIF_READ; 	// start the xfer
-    SYNCDELAY;
-    while (!(GPIFTRIG & bmGPIF_IDLE));
-    INPKTEND = 0x06;	// tell USB we filled buffer (6 is our endpoint num)
-    SYNCDELAY;
-    if(SHORT_PACKET_DETECTED) {
-        while(!(EP6CS & bmEPEMPTY)); //wait for packet to send
-        INPKTEND = 0x06; //send a ZLP
-        //toggle_led_1(); //FIXME DEBUG
-    }
-}
-
-inline static void handle_ctrl_read(void) {
-    GPIFTCB1 = 0x00;
-    GPIFTCB0 = 0x10;
-    setup_flowstate_ctrl_read ();
-    setup_wave_ctrl_read();
-    GPIFTRIG = bmGPIF_EP8_START | bmGPIF_READ; 	// start the xfer
-    SYNCDELAY;
-    while (!(GPIFTRIG & bmGPIF_IDLE));
-    INPKTEND = 8;	// tell USB we filled buffer (8 is our endpoint num)
-}
-
-//clear the FPGA datapath by reading but not submitting, instead clearing the FIFO after each transaction
-void clear_fpga_data_fifo(void) {
-    while(fpga_has_data_packet_avail()) {
-        GPIFTCB1 = 0x01;
-        GPIFTCB0 = 0x00;
-        setup_flowstate_data_read ();
-        setup_wave_data_read();
-        GPIFTRIG = bmGPIF_EP6_START | bmGPIF_READ; 	// start the xfer
-        SYNCDELAY;
-        while (!(GPIFTRIG & bmGPIF_IDLE));
-        initialize_gpif_buffer(6); //reset the FIFO instead of committing it
-    }
-}
-
 static void
 main_loop (void)
 {
   while (1){
     if (usb_setup_packet_avail ())
       usb_handle_setup_packet ();
-
-    if(enable_gpif){
-        if  (fx2_has_ctrl_packet_avail()    && fpga_has_room_for_ctrl_packet()) handle_ctrl_write();
-        if  (fx2_has_room_for_ctrl_packet() && fpga_has_ctrl_packet_avail())    handle_ctrl_read();
-        
-        //we do this
-        if  (fx2_has_data_packet_avail()    && fpga_has_room_for_data_packet()) handle_data_write();
-        if  (fx2_has_room_for_data_packet() && fpga_has_data_packet_avail())    handle_data_read();
-        //five times so that
-        if  (fx2_has_data_packet_avail()    && fpga_has_room_for_data_packet()) handle_data_write();
-        if  (fx2_has_room_for_data_packet() && fpga_has_data_packet_avail())    handle_data_read();
-        //we can piggyback
-        if  (fx2_has_data_packet_avail()    && fpga_has_room_for_data_packet()) handle_data_write();
-        if  (fx2_has_room_for_data_packet() && fpga_has_data_packet_avail())    handle_data_read();
-        //data transfers
-        if  (fx2_has_data_packet_avail()    && fpga_has_room_for_data_packet()) handle_data_write();
-        if  (fx2_has_room_for_data_packet() && fpga_has_data_packet_avail())    handle_data_read();
-        //without loop overhead
-        if  (fx2_has_data_packet_avail()    && fpga_has_room_for_data_packet()) handle_data_write();
-        if  (fx2_has_room_for_data_packet() && fpga_has_data_packet_avail())    handle_data_read();
-    }
   }
 }
 
@@ -363,15 +247,9 @@ patch_usb_descriptors(void)
 void
 main (void)
 {
-  enable_gpif = 0;
-
   memset (hash1, 0, USRP_HASH_SIZE);	// zero fpga bitstream hash.  This forces reload
   
   init_usrp ();
-  init_gpif ();
-  
-  // if (UC_START_WITH_GSTATE_OUTPUT_ENABLED)
-  //IFCONFIG |= bmGSTATE;			// no conflict, start with it on
 
   set_led_0 (0);
   set_led_1 (0);
@@ -389,6 +267,37 @@ main (void)
 
   fx2_renumerate ();	// simulates disconnect / reconnect
 
-  setup_flowstate_common();
+//  setup_flowstate_common();
+
+//set up gpif slave mode here
+  //set slave FIFO mode
+  //set synchronous slave mode
+  ////both done in init_usrp()
+  
+  //set FLAGA, FLAGB, FLAGC, FLAGD to be EP2EF, EP4EF, EP6PF, EP8PF
+  PINFLAGSAB = (bmEP2EF) | (bmEP4EF << 4);
+  PINFLAGSCD = (bmEP6PF) | (bmEP8PF << 4);
+
+  //ok as far as i can tell, DECIS is reversed compared to the FX2 TRM.
+  //p15.34 says DECIS high implements [assert when (fill > level)], observed opposite
+
+  EP6FIFOPFH = 0x09;
+  SYNCDELAY;
+  EP6FIFOPFL = 0xFD;
+  SYNCDELAY;
+
+//  EP2FIFOPFH = 0x08;
+//  SYNCDELAY;
+// EP2FIFOPFL = 0x00;
+//  SYNCDELAY;
+
+  //assert FIFOEMPTY one cycle sooner so we get it in time at the FPGA
+  EP2FIFOCFG |= bmBIT5; 
+  
+  //set FIFOPINPOLAR to normal (active low) mode
+  FIFOPINPOLAR = 0x00;
+  SYNCDELAY;
+  PORTACFG = 0x80;
+  
   main_loop ();
 }
diff --git a/firmware/fx2/b100/usrp_regs.h b/firmware/fx2/b100/usrp_regs.h
index f6695d9f9..3d65337f5 100644
--- a/firmware/fx2/b100/usrp_regs.h
+++ b/firmware/fx2/b100/usrp_regs.h
@@ -41,8 +41,6 @@
 #define bmALTERA_NCONFIG	bmBIT1
 #define bmALTERA_DATA0		bmBIT3
 #define bmALTERA_NSTATUS	bmBIT4
-#define bmRESET_FPGA_FIFOS  bmBIT7
-
 
 #define	bmALTERA_BITS		(bmALTERA_DCLK			\
 				 | bmALTERA_NCONFIG		\
@@ -64,7 +62,6 @@
 sbit at PORT_A_ADDR+0 bitALTERA_DCLK;	// 0x80 is the bit address of PORT A
 sbit at PORT_A_ADDR+1 bitALTERA_NCONFIG;
 sbit at PORT_A_ADDR+3 bitALTERA_DATA0;
-sbit at PORT_A_ADDR+6 bitSHORT_PACKET_SIGNAL;
 
 sbit at PORT_C_ADDR+7 bitALTERA_CONF_DONE;
 
@@ -102,29 +99,4 @@ sbit at PORT_C_ADDR+7 bitALTERA_CONF_DONE;
 #define	bmPORT_E_OUTPUTS	(0)
 #define	bmPORT_E_INITIAL	(0)
 
-/*
- * FPGA output lines that are tied to FX2 RDYx inputs.
- * These are readable using GPIFREADYSTAT.
- */
-//#define	bmFPGA_HAS_SPACE		bmBIT0	// usbrdy[0] has room for 512 byte packet
-//#define	bmFPGA_PKT_AVAIL		bmBIT1	// usbrdy[1] has >= 512 bytes available
-
-#define bmDATA_EMPTY            bmBIT0 //data output FIFO has no data ready
-#define bmDATA_FIFO_FULL        bmBIT1 //data input FIFO is full
-#define bmCTRL_EMPTY            bmBIT2 //control output FIFO has no data ready
-#define bmCTRL_FIFO_FULL        bmBIT3 //control input FIFO is full
-
-// #define	bmTX_UNDERRUN			bmBIT2  // usbrdy[2] D/A ran out of data
-// #define	bmRX_OVERRUN			bmBIT3	// usbrdy[3] A/D ran out of buffer
-
-/*
- * FPGA input lines that are tied to the FX2 CTLx outputs.
- *
- * These are controlled by the GPIF microprogram...
- */
-// WE					bmBIT0	// usbctl[0] write enable
-// RE					bmBIT1	// usbctl[1] read enable
-// OE					bmBIT2	// usbctl[2] output enable
-// EP                   bmBIT3  // usbctl[3] endpoint select (data/ctrl)
-
 #endif /* _USRP_REV1_REGS_H_ */
diff --git a/firmware/fx2/common/fx2regs.h b/firmware/fx2/common/fx2regs.h
index aa44791d0..acbc0b89e 100644
--- a/firmware/fx2/common/fx2regs.h
+++ b/firmware/fx2/common/fx2regs.h
@@ -91,7 +91,6 @@ EXTERN xdata _AT_(0xE60A) volatile BYTE REVID             ;  // Chip Revision
 EXTERN xdata _AT_(0xE60B) volatile BYTE REVCTL            ;  // Chip Revision Control
 
 // Endpoint Configuration
-
 EXTERN xdata _AT_(0xE610) volatile BYTE EP1OUTCFG         ;  // Endpoint 1-OUT Configuration
 EXTERN xdata _AT_(0xE611) volatile BYTE EP1INCFG          ;  // Endpoint 1-IN Configuration
 EXTERN xdata _AT_(0xE612) volatile BYTE EP2CFG            ;  // Endpoint 2 Configuration
@@ -654,6 +653,22 @@ sfr at 0xF8 EIP; // EIP Bit Values differ from Reg320
 #define bmIFCFG0      bmBIT0
 #define bmIFCFGMASK   (bmIFCFG0 | bmIFCFG1)
 #define bmIFGPIF      bmIFCFG1
+#define bmIFSLAVE     (bmIFCFG0 | bmIFCFG1)
+
+/* Slave FIFO pin flags configuration bits (PINFLAGS) */
+#define bmINDEXED     0x0 //which fifo selected by FIFOADR
+#define bmEP2PF       0x4
+#define bmEP4PF       0x5
+#define bmEP6PF       0x6
+#define bmEP8PF       0x7
+#define bmEP2EF       0x8
+#define bmEP4EF       0x9
+#define bmEP6EF       0xA
+#define bmEP8EF       0xB
+#define bmEP2FF       0xC
+#define bmEP4FF       0xD
+#define bmEP6FF       0xE
+#define bmEP8FF       0xF
 
 /* EP 2468 FIFO Configuration bits (EP2FIFOCFG,EP4FIFOCFG,EP6FIFOCFG,EP8FIFOCFG) */
 #define bmINFM       bmBIT6