summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-01-12 16:23:54 -0800
committerJosh Blum <josh@joshknows.com>2010-01-12 16:23:54 -0800
commit087b97e0fc28793ea39d81e60b3fddae51c5929e (patch)
tree7098f93d0a39ab50a0eea43356ac0857c584ee25 /lib
parentcbb8e474bb5592753a340ba31d3afbab7226f7c6 (diff)
downloaduhd-087b97e0fc28793ea39d81e60b3fddae51c5929e.tar.gz
uhd-087b97e0fc28793ea39d81e60b3fddae51c5929e.tar.bz2
uhd-087b97e0fc28793ea39d81e60b3fddae51c5929e.zip
added interface for usrp dboards to communicate to mboards
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am7
-rw-r--r--lib/usrp/Makefile.am2
-rw-r--r--lib/usrp/dboard/Makefile.am11
-rw-r--r--lib/usrp/dboard/interface.cpp15
4 files changed, 31 insertions, 4 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index efb655640..6146f4025 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,14 +8,15 @@ SUBDIRS = usrp quadradio
AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
-lib_LTLIBRARIES = \
- libusrp_uhd.la
+lib_LTLIBRARIES = libusrp_uhd.la
libusrp_uhd_la_SOURCES = \
device_addr.cpp \
usrp_uhd.cpp \
wax.cpp
-libusrp_uhd_la_LIBADD = $(GENERAL_LDDFLAGS)
+libusrp_uhd_la_LIBADD = \
+ $(GENERAL_LDDFLAGS) \
+ $(USRP_UHD_USRP_DBOARD_LA)
noinst_HEADERS =
diff --git a/lib/usrp/Makefile.am b/lib/usrp/Makefile.am
index 913f80a6d..ac06d5b5b 100644
--- a/lib/usrp/Makefile.am
+++ b/lib/usrp/Makefile.am
@@ -4,4 +4,4 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = mboard dboard
+SUBDIRS = dboard mboard
diff --git a/lib/usrp/dboard/Makefile.am b/lib/usrp/dboard/Makefile.am
index 66fc4dd71..8d77dcc42 100644
--- a/lib/usrp/dboard/Makefile.am
+++ b/lib/usrp/dboard/Makefile.am
@@ -5,3 +5,14 @@
include $(top_srcdir)/Makefile.common
SUBDIRS =
+
+AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
+
+noinst_LTLIBRARIES = lib.la
+
+lib_la_SOURCES = \
+ interface.cpp
+
+lib_la_LIBADD = $(GENERAL_LDDFLAGS)
+
+noinst_HEADERS =
diff --git a/lib/usrp/dboard/interface.cpp b/lib/usrp/dboard/interface.cpp
new file mode 100644
index 000000000..5575568c6
--- /dev/null
+++ b/lib/usrp/dboard/interface.cpp
@@ -0,0 +1,15 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#include <usrp_uhd/usrp/dboard/interface.hpp>
+
+using namespace usrp_uhd::usrp::dboard;
+
+interface::interface(void){
+ /* NOP */
+}
+
+interface::~interface(void){
+ /* NOP */
+}