[Commit-gnuradio] r6533 - gnuradio/branches/developers/matt/u2f/firmware

[eb]

Author: eb
Date: 2007-09-25 12:33:25 -0600 (Tue, 25 Sep 2007)
New Revision: 6533

Modified:
   gnuradio/branches/developers/matt/u2f/firmware/memory_map.h
Log:
additional comments; bit of rearrangement

Modified: gnuradio/branches/developers/matt/u2f/firmware/memory_map.h
===================================================================
--- gnuradio/branches/developers/matt/u2f/firmware/memory_map.h 2007-09-25 
18:18:47 UTC (rev 6532)
+++ gnuradio/branches/developers/matt/u2f/firmware/memory_map.h 2007-09-25 
18:33:25 UTC (rev 6533)
@@ -102,15 +102,14 @@
 
 ////////////////////////////////////////////////
 // GPIO, Slave 4
+
+// These go to the daughterboard i/o pins
+
 #define GPIO_BASE 0xA000
-#define GPIO_DDR 0
-#define GPIO_IO 4
-#define GPIO_RX 0
-#define GPIO_TX 2
 
 typedef struct {
-  volatile unsigned short      ddr_rx;
-  volatile unsigned short      ddr_tx;
+  volatile unsigned short      ddr_rx; // OE mask: 1 = output
+  volatile unsigned short      ddr_tx; // OE mask: 1 = output
   volatile unsigned short      io_rx;
   volatile unsigned short      io_tx;
 } gpio_regs_t;
@@ -122,6 +121,7 @@
 
 ///////////////////////////////////////////////////
 // Ethernet Core, Slave 6
+
 #define ETH_BASE 0xC000
 
 #include "eth_mac_regs.h"
@@ -130,24 +130,26 @@
 
 ////////////////////////////////////////////////////
 // Settings Bus, Slave #7, Not Byte Addressable!
-#define SETTINGS_BASE 0xD000
+//
+// Output-only from processor point-of-view.
+// 1KB of address space (== 256 32-bit write-only regs)
 
+
 // Simple outputs
-#define OUTPUTS_BASE    0xD000
-#define OUTPUTS_CLK     0xD000
-#define OUTPUTS_SERDES  0xD004
-#define OUTPUTS_ADC     0xD008
-#define OUTPUTS_MISC    0xD00C
+#define OUTPUTS_BASE      0xD000
 
+#define BUFFER_POOL_BASE  0xD100
+#define DSP_TX_BASE       0xD200
+#define DSP_RX_BASE       0xD280
+
+#define LAST_SETTING      0xD3FC       // last valid setting register
+
+
 #define SERDES_ENABLE 8
 #define SERDES_PRBSEN 4
 #define SERDES_LOOPEN 2
 #define SERDES_RXEN 1
 
-#define BUFFER_POOL_BASE  0xD100
-#define DSP_TX_BASE       0xD200
-#define DSP_RX_BASE       0xD280
-#define LAST_SETTING      0xD3FC
 
 typedef struct {
   volatile unsigned long       clk_ctrl;