diff options
| author | eb | 2008-10-22 00:56:40 +0000 |
|---|---|---|
| committer | eb | 2008-10-22 00:56:40 +0000 |
| commit | bfe79d23738f24562dc7612049a90e8b20b53f79 (patch) | |
| tree | 312e66fc143621f320f6e57592f5194e15e52e1f /usrp2/firmware/lib | |
| parent | afc6e2b005581d1061b47c464f47ff2b48c6418b (diff) | |
| download | gnuradio-bfe79d23738f24562dc7612049a90e8b20b53f79.tar.gz gnuradio-bfe79d23738f24562dc7612049a90e8b20b53f79.tar.bz2 gnuradio-bfe79d23738f24562dc7612049a90e8b20b53f79.zip | |
Added methods to query daughterboard parameters. Merged eb/u2-wip2
-r9804:9814 into trunk; initialized dacmux in firmware.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9816 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/firmware/lib')
| -rw-r--r-- | usrp2/firmware/lib/memory_map.h | 2 | ||||
| -rw-r--r-- | usrp2/firmware/lib/u2_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usrp2/firmware/lib/memory_map.h b/usrp2/firmware/lib/memory_map.h index 740bf47fa..159b095c1 100644 --- a/usrp2/firmware/lib/memory_map.h +++ b/usrp2/firmware/lib/memory_map.h @@ -412,7 +412,7 @@ typedef struct { * The default value is 0x10 * </pre> */ - volatile uint32_t tx_mux; // FIXME this register is currently unimplemented + volatile uint32_t tx_mux; } dsp_tx_regs_t; diff --git a/usrp2/firmware/lib/u2_init.c b/usrp2/firmware/lib/u2_init.c index 7482040f0..948055694 100644 --- a/usrp2/firmware/lib/u2_init.c +++ b/usrp2/firmware/lib/u2_init.c @@ -87,7 +87,7 @@ u2_init(void) ad9777_write_reg(12, 0); // Initial values for tx and rx mux registers - // dsp_tx_regs->tx_mux = 0x10; + dsp_tx_regs->tx_mux = 0x10; dsp_rx_regs->rx_mux = 0x44444444; // Set up serdes |