[Commit-gnuradio] r8328 - usrp2/trunk/firmware/lib

[matt]

Author: matt
Date: 2008-05-08 17:09:28 -0600 (Thu, 08 May 2008)
New Revision: 8328

Modified:
   usrp2/trunk/firmware/lib/memory_map.h
Log:
changed definitions on the GPIO lines


Modified: usrp2/trunk/firmware/lib/memory_map.h
===================================================================
--- usrp2/trunk/firmware/lib/memory_map.h       2008-05-08 21:40:12 UTC (rev 
8327)
+++ usrp2/trunk/firmware/lib/memory_map.h       2008-05-08 23:09:28 UTC (rev 
8328)
@@ -149,15 +149,16 @@
 
 typedef struct {
   volatile uint32_t    io;       // tx data in high 16, rx in low 16
-  volatile uint32_t    rx_mode;  // 16 2-bit fields
-  volatile uint32_t    tx_mode;  // 16 2-bit fields
+  volatile uint32_t    tx_sel;   // 16 2-bit fields select which source goes 
to TX DB
+  volatile uint32_t    rx_sel;   // 16 2-bit fields select which source goes 
to RX DB
+  volatile uint32_t     ddr;      // 32 bits, 1 means output
 } gpio_regs_t;
 
 // each 2-bit mode field is layed out this way
-#define GPIOM_INPUT    0 // pin is an input, readable by proc through io reg
-#define        GPIOM_OUTPUT    1 // pin is an output, writable by proc through 
io reg
-#define        GPIOM_FPGA_0    2 // pin is an output, writable from FPGA fabric
-#define        GPIOM_FPGA_1    3 // pin is an output, writable from FPGA fabric
+#define GPIOM_SW       0 // if pin is an output, set by software in the io reg
+#define        GPIOM_ATR       1 // if pin is an output, set by ATR logic
+#define        GPIOM_DEBUG_0   2 // if pin is an output, debug lines from FPGA 
fabric
+#define        GPIOM_DEBUG_1   3 // if pin is an output, debug lines from FPGA 
fabric
 
 #define gpio_base ((gpio_regs_t *) GPIO_BASE)