aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2/usrp2_impl.hpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-03-01 15:59:40 -0800
committerJosh Blum <josh@joshknows.com>2012-03-23 14:36:56 -0700
commitf59ef44a43d0d16655cb67a3d0334e8cacd76f09 (patch)
tree0f7fb004ca2f3c304ce0a9361ba52f2ae09e49a1 /host/lib/usrp/usrp2/usrp2_impl.hpp
parentcda81f584ca36dffeb8d2184f5769f9c8b9ab4eb (diff)
downloaduhd-f59ef44a43d0d16655cb67a3d0334e8cacd76f09.tar.gz
uhd-f59ef44a43d0d16655cb67a3d0334e8cacd76f09.tar.bz2
uhd-f59ef44a43d0d16655cb67a3d0334e8cacd76f09.zip
usrp2: integrated fifo ctrl into usrp2 modules, implemented window'd acking
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
-rw-r--r--host/lib/usrp/usrp2/usrp2_impl.hpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 291208eff..3d2fbf14f 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -18,6 +18,7 @@
#ifndef INCLUDED_USRP2_IMPL_HPP
#define INCLUDED_USRP2_IMPL_HPP
+#include "gpio_core_200.hpp"
#include "usrp2_iface.hpp"
#include "usrp2_fifo_ctrl.hpp"
#include "clock_ctrl.hpp"
@@ -53,14 +54,11 @@ static const size_t USRP2_SRAM_BYTES = size_t(1 << 20);
static const boost::uint32_t USRP2_TX_ASYNC_SID = 2;
static const boost::uint32_t USRP2_RX_SID_BASE = 3;
-/*!
- * Make a usrp2 dboard interface.
- * \param iface the usrp2 interface object
- * \param clk_ctrl the clock control object
- * \return a sptr to a new dboard interface
- */
+//! Make a usrp2 dboard interface.
uhd::usrp::dboard_iface::sptr make_usrp2_dboard_iface(
- usrp2_iface::sptr iface,
+ wb_iface::sptr wb_iface,
+ uhd::i2c_iface::sptr i2c_iface,
+ uhd::spi_iface::sptr spi_iface,
usrp2_clock_ctrl::sptr clk_ctrl
);