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

[matt]

Author: matt
Date: 2008-06-25 17:23:45 -0600 (Wed, 25 Jun 2008)
New Revision: 8713

Modified:
   usrp2/trunk/firmware/lib/memory_map.h
Log:
added in new registers for simple uart and for ADC muxing


Modified: usrp2/trunk/firmware/lib/memory_map.h
===================================================================
--- usrp2/trunk/firmware/lib/memory_map.h       2008-06-25 23:21:17 UTC (rev 
8712)
+++ usrp2/trunk/firmware/lib/memory_map.h       2008-06-25 23:23:45 UTC (rev 
8713)
@@ -391,6 +391,7 @@
   volatile uint32_t     dcoffset_i;     // Bit 31 high sets fixed offset mode, 
using lower 14 bits,
                                         // otherwise it is automatic 
   volatile uint32_t     dcoffset_q;     // Bit 31 high sets fixed offset mode, 
using lower 14 bits
+  volatile uint32_t     adc_mux;        // 4 bits -- lowest 2 for adc_i, next 
for adc_q
 
 } dsp_rx_regs_t;
   
@@ -512,8 +513,15 @@
 
 #define UART_BASE  0xE000
 
-#define uart_regs ((wb16550_reg_t *) UART_BASE)
+typedef struct {
+  volatile uint32_t data;
+  volatile uint32_t clkdiv;
+} uart_regs_t;
 
+#define uart_regs ((uart_regs_t *) UART_BASE)
+
+//#define uart_regs ((wb16550_reg_t *) UART_BASE)
+
 ///////////////////////////////////////////////////
 // ATR Controller, Slave 11