Reorganized structure into include, lib, test, firmware, fpga.

The fpga and firmware are empty placeholders for now.

43 files changed, 284 insertions, 278 deletions

diff --git a/.gitignore b/.gitignore
index 6a9409823..e9db284b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/usrp_uhd.pc
 /Makefile
 /Makefile.in
 /aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 3fe105aa3..84f1bf68d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,22 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = \
-	usrp_dboard \
-	usrp_uhd
+SUBDIRS = include lib test
+
+########################################################################
+## Handle the pkgconfig file generation
+########################################################################
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = usrp_uhd.pc
+
+EXTRA_DIST = $(srcdir)/usrp_uhd.pc.in
+BUILT_SOURCES = usrp_uhd.pc
+
+usrp_uhd.pc: $(srcdir)/usrp_uhd.pc.in Makefile
+	$(SED) \
+		-e 's|@prefix[@]|$(prefix)|g' \
+		-e 's|@exec_prefix[@]|$(exec_prefix)|g' \
+		-e 's|@libdir[@]|$(libdir)|g' \
+		-e 's|@includedir[@]|$(includedir)|g' \
+		-e 's|@VERSION[@]|$(VERSION)|g' \
+	$< > $@
diff --git a/Makefile.common b/Makefile.common
index b7e672baf..3b1464439 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -2,20 +2,12 @@
 # Copyright 2010 Ettus Research LLC
 #
 
-########################################################################
-## Makefile variables for the top level component: the uhd
-########################################################################
-USRP_UHD_INCLUDES = \
-	-I$(top_srcdir)/usrp_uhd/include
+USRP_UHD_LA = $(top_srcdir)/lib/libusrp_uhd.la
 
-USRP_UHD_LA = \
-	$(top_srcdir)/usrp_uhd/lib/libusrp_uhd.la
-	
-########################################################################
-## Makefile variables for the usrp dboard component
-########################################################################
-USRP_DBOARD_INCLUDES = \
-	-I$(top_srcdir)/usrp_dboard/include
+GENERAL_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	$(BOOST_CPPFLAGS)
 
-USRP_DBOARD_LA = \
-	$(top_srcdir)/usrp_dboard/lib/libusrp_dboard.la
+GENERAL_LDDFLAGS = \
+	$(BOOST_LDFLAGS) \
+	$(BOOST_THREAD_LIB)
diff --git a/configure.ac b/configure.ac
index c9c59fbcf..e36fce8ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,12 +28,17 @@ AC_PATH_PROG(PYTHON, python)
 ##################################################
 AC_CONFIG_FILES([ \
 	Makefile \
-	usrp_uhd/usrp_uhd.pc \
-	usrp_uhd/Makefile \
-	usrp_uhd/include/Makefile \
-	usrp_uhd/lib/Makefile \
-	usrp_dboard/Makefile \
-	usrp_dboard/include/Makefile \
-	usrp_dboard/lib/Makefile \
+	include/Makefile \
+	include/usrp_uhd/Makefile \
+	include/usrp_uhd/usrp/Makefile \
+	include/usrp_uhd/usrp/dboard/Makefile \
+	include/usrp_uhd/usrp/mboard/Makefile \
+	include/usrp_uhd/quadradio/Makefile \
+	lib/Makefile \
+	lib/usrp/Makefile \
+	lib/usrp/dboard/Makefile \
+	lib/usrp/mboard/Makefile \
+	lib/quadradio/Makefile \
+	test/Makefile \
 ])
 AC_OUTPUT
diff --git a/firmware/README b/firmware/README
new file mode 100644
index 000000000..a010493c8
--- /dev/null
+++ b/firmware/README
@@ -0,0 +1,4 @@
+This is a placeholder for the firmware code (microblaze and 8051).
+
+The layout should have a common library of source and header files.
+Each usrp-like will have its own device-specific libs and apps.
diff --git a/fpga/README b/fpga/README
new file mode 100644
index 000000000..aacafecfd
--- /dev/null
+++ b/fpga/README
@@ -0,0 +1,4 @@
+This is a placeholder for the fpga code (verilog, makefiles, corgens...)
+
+The layout should have a common library and various top level builds
+and testbenches that are organized hierarchically.
diff --git a/usrp_dboard/.gitignore b/include/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/usrp_dboard/.gitignore
+++ b/include/.gitignore
diff --git a/usrp_uhd/include/Makefile.am b/include/Makefile.am
index 1ec431648..0ffe6f3d1 100644
--- a/usrp_uhd/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,13 +4,8 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS =
+SUBDIRS = usrp_uhd
 
 this_includedir = $(includedir)
 this_include_HEADERS = \
 	usrp_uhd.hpp
-
-usrp_uhd_includedir = $(includedir)/usrp_uhd
-usrp_uhd_include_HEADERS = \
-	usrp_uhd/usrp_addr.hpp \
-	usrp_uhd/wax.hpp
diff --git a/usrp_uhd/include/usrp_uhd.hpp b/include/usrp_uhd.hpp
index 6bf97a5a4..1cbd064b7 100644
--- a/usrp_uhd/include/usrp_uhd.hpp
+++ b/include/usrp_uhd.hpp
@@ -5,22 +5,22 @@
 #ifndef INCLUDED_USRP_UHD_HPP
 #define INCLUDED_USRP_UHD_HPP
 
-#include <usrp_uhd/usrp_addr.hpp>
+#include <usrp_uhd/device_addr.hpp>
 #include <usrp_uhd/wax.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <vector>
 #include <sys/uio.h>
 
-namespace usrp{
+namespace usrp_uhd{
 
-    class uhd{
+    class usrp_uhd{
 
     public:
-        typedef boost::shared_ptr<uhd> sptr;
+        typedef boost::shared_ptr<usrp_uhd> sptr;
         typedef boost::function<bool(void *data, size_t len)> recv_hdlr_t;
-        uhd(usrp_addr_t usrp_addr);
-        ~uhd(void);
+        usrp_uhd(device_addr_t device_addr);
+        ~usrp_uhd(void);
 
         //the io interface
         void send(const std::vector<iovec> &iovs);
@@ -38,6 +38,6 @@ namespace usrp{
         wax::type d_mboard;
     };
 
-} //namespace usrp
+} //namespace usrp_uhd
 
 #endif /* INCLUDED_USRP_UHD_HPP */
diff --git a/usrp_dboard/include/.gitignore b/include/usrp_uhd/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/usrp_dboard/include/.gitignore
+++ b/include/usrp_uhd/.gitignore
diff --git a/include/usrp_uhd/Makefile.am b/include/usrp_uhd/Makefile.am
new file mode 100644
index 000000000..9d12f2097
--- /dev/null
+++ b/include/usrp_uhd/Makefile.am
@@ -0,0 +1,12 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = usrp quadradio
+
+this_includedir = $(includedir)/usrp_uhd
+this_include_HEADERS = \
+	device_addr.hpp \
+	wax.hpp
diff --git a/usrp_uhd/include/usrp_uhd/usrp_addr.hpp b/include/usrp_uhd/device_addr.hpp
index e8c282288..f0be44c1f 100644
--- a/usrp_uhd/include/usrp_uhd/usrp_addr.hpp
+++ b/include/usrp_uhd/device_addr.hpp
@@ -2,22 +2,22 @@
 // Copyright 2010 Ettus Research LLC
 //
 
-#ifndef INCLUDED_USRP_ADDR_HPP
-#define INCLUDED_USRP_ADDR_HPP
+#ifndef INCLUDED_USRP_UHD_DEVICE_ADDR_HPP
+#define INCLUDED_USRP_UHD_DEVICE_ADDR_HPP
 
 #include <string>
 #include <iostream>
 #include <netinet/ether.h>
 #include <arpa/inet.h>
 
-namespace usrp{
+namespace usrp_uhd{
 
     /*!
     * Wrapper for an ethernet mac address.
     * Provides conversion between string and binary formats.
     */
     struct mac_addr_t{
-        struct ether_addr d_mac_addr;
+        struct ether_addr mac_addr;
         mac_addr_t(const std::string &str = "00:00:00:00:00:00");
         std::string to_string(void) const;
     };
@@ -27,28 +27,28 @@ namespace usrp{
     * Provides conversion between string and binary formats.
     */
     struct ip_addr_t{
-        struct in_addr d_ip_addr;
+        struct in_addr ip_addr;
         ip_addr_t(const std::string &str = "0.0.0.0");
         std::string to_string(void) const;
     };
 
     /*!
-    * Possible usrp mboard interface types.
+    * Possible usrp device interface types.
     */
-    enum usrp_addr_type_t{
-        USRP_ADDR_TYPE_AUTO,
-        USRP_ADDR_TYPE_VIRTUAL,
-        USRP_ADDR_TYPE_USB,
-        USRP_ADDR_TYPE_ETH,
-        USRP_ADDR_TYPE_UDP,
-        USRP_ADDR_TYPE_GPMC
+    enum device_addr_type_t{
+        DEVICE_ADDR_TYPE_AUTO,
+        DEVICE_ADDR_TYPE_VIRTUAL,
+        DEVICE_ADDR_TYPE_USB,
+        DEVICE_ADDR_TYPE_ETH,
+        DEVICE_ADDR_TYPE_UDP,
+        DEVICE_ADDR_TYPE_GPMC
     };
 
     /*!
-    * Structure to hold properties that identify a usrp mboard.
+    * Structure to hold properties that identify a usrp device.
     */
-    struct usrp_addr_t{
-        usrp_addr_type_t type;
+    struct device_addr_t{
+        device_addr_type_t type;
         struct{
             size_t num_rx_dsps;
             size_t num_tx_dsps;
@@ -70,21 +70,21 @@ namespace usrp{
         } gpmc_args;
 
         /*!
-         * \brief Convert a usrp usrp_addr_t into a string representation
+         * \brief Convert a usrp device_addr_t into a string representation
          */
         std::string to_string(void) const;
 
         /*!
-         * \brief Default constructor to initialize the usrp_addr_t struct
+         * \brief Default constructor to initialize the device_addr_t struct
          */
-        usrp_addr_t(usrp_addr_type_t usrp_addr_type = USRP_ADDR_TYPE_AUTO);
+        device_addr_t(device_addr_type_t device_addr_type = DEVICE_ADDR_TYPE_AUTO);
     };
 
-} //namespace usrp
+} //namespace usrp_uhd
 
 //ability to use types with stream operators
-std::ostream& operator<<(std::ostream &os, const usrp::usrp_addr_t &x);
-std::ostream& operator<<(std::ostream &os, const usrp::mac_addr_t &x);
-std::ostream& operator<<(std::ostream &os, const usrp::ip_addr_t &x);
+std::ostream& operator<<(std::ostream &os, const usrp_uhd::device_addr_t &x);
+std::ostream& operator<<(std::ostream &os, const usrp_uhd::mac_addr_t &x);
+std::ostream& operator<<(std::ostream &os, const usrp_uhd::ip_addr_t &x);
 
-#endif /* INCLUDED_USRP_ADDR_HPP */
+#endif /* INCLUDED_USRP_UHD_DEVICE_ADDR_HPP */
diff --git a/usrp_dboard/lib/.gitignore b/include/usrp_uhd/quadradio/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/usrp_dboard/lib/.gitignore
+++ b/include/usrp_uhd/quadradio/.gitignore
diff --git a/usrp_dboard/Makefile.am b/include/usrp_uhd/quadradio/Makefile.am
index a5a0ceb25..66fc4dd71 100644
--- a/usrp_dboard/Makefile.am
+++ b/include/usrp_uhd/quadradio/Makefile.am
@@ -4,4 +4,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = include lib
+SUBDIRS =
diff --git a/usrp_uhd/include/.gitignore b/include/usrp_uhd/usrp/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/usrp_uhd/include/.gitignore
+++ b/include/usrp_uhd/usrp/.gitignore
diff --git a/include/usrp_uhd/usrp/Makefile.am b/include/usrp_uhd/usrp/Makefile.am
new file mode 100644
index 000000000..913f80a6d
--- /dev/null
+++ b/include/usrp_uhd/usrp/Makefile.am
@@ -0,0 +1,7 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = mboard dboard
diff --git a/usrp_uhd/lib/.gitignore b/include/usrp_uhd/usrp/dboard/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/usrp_uhd/lib/.gitignore
+++ b/include/usrp_uhd/usrp/dboard/.gitignore
diff --git a/usrp_dboard/include/Makefile.am b/include/usrp_uhd/usrp/dboard/Makefile.am
index fc549bfe0..66fc4dd71 100644
--- a/usrp_dboard/include/Makefile.am
+++ b/include/usrp_uhd/usrp/dboard/Makefile.am
@@ -5,6 +5,3 @@
 include $(top_srcdir)/Makefile.common
 
 SUBDIRS =
-
-noinst_HEADERS = \
-	usrp_dboard/interface.hpp
diff --git a/usrp_uhd/.gitignore b/include/usrp_uhd/usrp/mboard/.gitignore
index 2cc79dbab..b336cc7ce 100644
--- a/usrp_uhd/.gitignore
+++ b/include/usrp_uhd/usrp/mboard/.gitignore
@@ -1,3 +1,2 @@
 /Makefile
 /Makefile.in
-/usrp_uhd.pc
diff --git a/include/usrp_uhd/usrp/mboard/Makefile.am b/include/usrp_uhd/usrp/mboard/Makefile.am
new file mode 100644
index 000000000..66fc4dd71
--- /dev/null
+++ b/include/usrp_uhd/usrp/mboard/Makefile.am
@@ -0,0 +1,7 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS =
diff --git a/usrp_uhd/include/usrp_uhd/wax.hpp b/include/usrp_uhd/wax.hpp
index 9d32314f7..9d32314f7 100644
--- a/usrp_uhd/include/usrp_uhd/wax.hpp
+++ b/include/usrp_uhd/wax.hpp
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/usrp_uhd/lib/Makefile.am b/lib/Makefile.am
index 2b744b4fc..efb655640 100644
--- a/usrp_uhd/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,23 +4,18 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS =
+SUBDIRS = usrp quadradio
 
-AM_CPPFLAGS = \
-	$(USRP_UHD_INCLUDES) \
-	$(BOOST_CPPFLAGS)
+AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
 
 lib_LTLIBRARIES = \
 	libusrp_uhd.la
 
 libusrp_uhd_la_SOURCES = \
-	usrp_addr.cpp \
+	device_addr.cpp \
 	usrp_uhd.cpp \
 	wax.cpp
 
-libusrp_uhd_la_LIBADD = \
-	$(BOOST_LDFLAGS) \
-	$(BOOST_THREAD_LIB) \
-	$(USRP_DBOARD_LA)
+libusrp_uhd_la_LIBADD = $(GENERAL_LDDFLAGS)
 
 noinst_HEADERS =
diff --git a/usrp_uhd/lib/usrp_addr.cpp b/lib/device_addr.cpp
index ddae7cd80..ac66c0d25 100644
--- a/usrp_uhd/lib/usrp_addr.cpp
+++ b/lib/device_addr.cpp
@@ -2,15 +2,15 @@
 // Copyright 2010 Ettus Research LLC
 //
 
-#include <usrp_uhd/usrp_addr.hpp>
+#include <usrp_uhd/device_addr.hpp>
 #include <sstream>
 #include <cstring>
 #include <cstdio>
 #include <stdexcept>
 
 //----------------------- u2 mac addr wrapper ------------------------//
-usrp::mac_addr_t::mac_addr_t(const std::string &str){
-    //ether_aton_r(str.c_str(), &d_mac_addr);
+usrp_uhd::mac_addr_t::mac_addr_t(const std::string &str){
+    //ether_aton_r(str.c_str(), &mac_addr);
     bool good = false;
     char p[6] = {0x00, 0x50, 0xC2, 0x85, 0x30, 0x00}; // Matt's IAB
 
@@ -25,43 +25,43 @@ usrp::mac_addr_t::mac_addr_t(const std::string &str){
     }
 
     if (not good) throw std::runtime_error("Invalid mac address: " + str);
-    memcpy(&d_mac_addr, p, sizeof(d_mac_addr));
+    memcpy(&mac_addr, p, sizeof(mac_addr));
 }
 
-std::string usrp::mac_addr_t::to_string(void) const{
+std::string usrp_uhd::mac_addr_t::to_string(void) const{
     char addr_buf[128];
-    //ether_ntoa_r(&d_mac_addr, addr_buf);
-    const uint8_t *p = reinterpret_cast<const uint8_t *>(&d_mac_addr);
+    //ether_ntoa_r(&mac_addr, addr_buf);
+    const uint8_t *p = reinterpret_cast<const uint8_t *>(&mac_addr);
     sprintf(addr_buf, "%02x:%02x:%02x:%02x:%02x:%02x",
         p[0], p[1], p[2], p[3], p[4], p[5]);
     return std::string(addr_buf);
 }
 
-std::ostream& operator<<(std::ostream &os, const usrp::mac_addr_t &x){
+std::ostream& operator<<(std::ostream &os, const usrp_uhd::mac_addr_t &x){
     os << x.to_string();
     return os;
 }
 
 //----------------------- u2 ipv4 wrapper ----------------------------//
-usrp::ip_addr_t::ip_addr_t(const std::string &str){
-    int ret = inet_pton(AF_INET, str.c_str(), &d_ip_addr);
+usrp_uhd::ip_addr_t::ip_addr_t(const std::string &str){
+    int ret = inet_pton(AF_INET, str.c_str(), &ip_addr);
     if (ret == 0) throw std::runtime_error("Invalid ip address: " + str);
 }
 
-std::string usrp::ip_addr_t::to_string(void) const{
+std::string usrp_uhd::ip_addr_t::to_string(void) const{
     char addr_buf[128];
-    inet_ntop(AF_INET, &d_ip_addr, addr_buf, INET_ADDRSTRLEN);
+    inet_ntop(AF_INET, &ip_addr, addr_buf, INET_ADDRSTRLEN);
     return std::string(addr_buf);
 }
 
-std::ostream& operator<<(std::ostream &os, const usrp::ip_addr_t &x){
+std::ostream& operator<<(std::ostream &os, const usrp_uhd::ip_addr_t &x){
     os << x.to_string();
     return os;
 }
 
-//----------------------- usrp usrp_addr_t wrapper -------------------------//
-usrp::usrp_addr_t::usrp_addr_t(usrp_addr_type_t usrp_addr_type){
-    type = usrp_addr_type;
+//----------------------- usrp device_addr_t wrapper -------------------------//
+usrp_uhd::device_addr_t::device_addr_t(device_addr_type_t device_addr_type){
+    type = device_addr_type;
     virtual_args.num_rx_dsps = 0;
     virtual_args.num_tx_dsps = 0;
     virtual_args.num_dboards = 0;
@@ -72,34 +72,34 @@ usrp::usrp_addr_t::usrp_addr_t(usrp_addr_type_t usrp_addr_type){
     udp_args.ip_addr = ip_addr_t("255.255.255.255");
 }
 
-std::string usrp::usrp_addr_t::to_string(void) const{
+std::string usrp_uhd::device_addr_t::to_string(void) const{
     std::stringstream out;
     out << "USRP Type: ";
     switch(type){
-    case USRP_ADDR_TYPE_AUTO:
+    case DEVICE_ADDR_TYPE_AUTO:
         out << "Automatic" << std::endl;
         break;
-    case USRP_ADDR_TYPE_VIRTUAL:
+    case DEVICE_ADDR_TYPE_VIRTUAL:
         out << "Virtual" << std::endl;
         out << "Num RX DSPs: " << virtual_args.num_rx_dsps << std::endl;
         out << "Num TX DSPs: " << virtual_args.num_rx_dsps << std::endl;
         out << "Num dboards: " << virtual_args.num_dboards << std::endl;
         break;
-    case USRP_ADDR_TYPE_USB:
+    case DEVICE_ADDR_TYPE_USB:
         out << "USB Port" << std::endl;
         out << "Vendor ID: 0x" << std::hex << usb_args.vendor_id << std::endl;
         out << "Product ID: 0x" << std::hex << usb_args.product_id << std::endl;
         break;
-    case USRP_ADDR_TYPE_ETH:
+    case DEVICE_ADDR_TYPE_ETH:
         out << "Raw Ethernet" << std::endl;
         out << "Interface: " << eth_args.ifc << std::endl;
         out << "MAC Addr: " << eth_args.mac_addr << std::endl;
         break;
-    case USRP_ADDR_TYPE_UDP:
+    case DEVICE_ADDR_TYPE_UDP:
         out << "UDP Socket" << std::endl;
         out << "IP Addr: " << udp_args.ip_addr << std::endl;
         break;
-    case USRP_ADDR_TYPE_GPMC:
+    case DEVICE_ADDR_TYPE_GPMC:
         out << "GPMC" << std::endl;
         break;
     default:
@@ -109,7 +109,7 @@ std::string usrp::usrp_addr_t::to_string(void) const{
     return out.str();
 }
 
-std::ostream& operator<<(std::ostream &os, const usrp::usrp_addr_t &x)
+std::ostream& operator<<(std::ostream &os, const usrp_uhd::device_addr_t &x)
 {
   os << x.to_string();
   return os;
diff --git a/lib/quadradio/.gitignore b/lib/quadradio/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/lib/quadradio/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/lib/quadradio/Makefile.am b/lib/quadradio/Makefile.am
new file mode 100644
index 000000000..66fc4dd71
--- /dev/null
+++ b/lib/quadradio/Makefile.am
@@ -0,0 +1,7 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS =
diff --git a/lib/usrp/.gitignore b/lib/usrp/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/lib/usrp/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/lib/usrp/Makefile.am b/lib/usrp/Makefile.am
new file mode 100644
index 000000000..913f80a6d
--- /dev/null
+++ b/lib/usrp/Makefile.am
@@ -0,0 +1,7 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = mboard dboard
diff --git a/lib/usrp/dboard/.gitignore b/lib/usrp/dboard/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/lib/usrp/dboard/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/lib/usrp/dboard/Makefile.am b/lib/usrp/dboard/Makefile.am
new file mode 100644
index 000000000..66fc4dd71
--- /dev/null
+++ b/lib/usrp/dboard/Makefile.am
@@ -0,0 +1,7 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS =
diff --git a/lib/usrp/mboard/.gitignore b/lib/usrp/mboard/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/lib/usrp/mboard/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/lib/usrp/mboard/Makefile.am b/lib/usrp/mboard/Makefile.am
new file mode 100644
index 000000000..66fc4dd71
--- /dev/null
+++ b/lib/usrp/mboard/Makefile.am
@@ -0,0 +1,7 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS =
diff --git a/lib/usrp_uhd.cpp b/lib/usrp_uhd.cpp
new file mode 100644
index 000000000..a838b717b
--- /dev/null
+++ b/lib/usrp_uhd.cpp
@@ -0,0 +1,8 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#include <usrp_uhd.hpp>
+
+usrp_uhd::usrp_uhd::usrp_uhd(device_addr_t device_addr){}
+usrp_uhd::usrp_uhd::~usrp_uhd(void){}
diff --git a/usrp_uhd/lib/wax.cpp b/lib/wax.cpp
index 888e581f3..888e581f3 100644
--- a/usrp_uhd/lib/wax.cpp
+++ b/lib/wax.cpp
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 000000000..3d6649c66
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,3 @@
+/Makefile
+/Makefile.in
+/wax_test
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 000000000..3373d838c
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,20 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS =
+
+AM_CPPFLAGS = $(GENERAL_CPPFLAGS)
+
+LDADD = \
+	$(GENERAL_LDDFLAGS)
+	$(USRP_UHD_LA)
+
+noinst_PROGRAMS = \
+	wax_test
+
+wax_test_SOURCES = wax_test.cpp
+
+TESTS = $(noinst_PROGRAMS)
diff --git a/test/wax_test.cpp b/test/wax_test.cpp
new file mode 100644
index 000000000..88c9e0f32
--- /dev/null
+++ b/test/wax_test.cpp
@@ -0,0 +1,81 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#include <usrp_uhd/wax.hpp>
+#include <iostream>
+#include <stdexcept>
+#include <vector>
+#include <boost/assert.hpp>
+
+class wax_demo : public wax::obj{
+private:
+    std::vector<float> d_nums;
+    std::vector<wax_demo> d_subs;
+public:
+    wax_demo(size_t sub_demos, size_t len){
+        d_nums = std::vector<float>(len);
+        if (sub_demos != 0){
+            for (size_t i = 0; i < len; i++){
+                d_subs.push_back(wax_demo(sub_demos-1, len));
+            }
+        }
+    }
+    ~wax_demo(void){
+        /* NOP */
+    }
+    void get(const wax::type &key, wax::type &value){
+        if (d_subs.size() == 0){
+            value = d_nums[wax::cast<size_t>(key)];
+        }else{
+            value = obj::cast(&d_subs[wax::cast<size_t>(key)]);
+        }
+    }
+    void set(const wax::type &key, const wax::type &value){
+        if (d_subs.size() == 0){
+            d_nums[wax::cast<size_t>(key)] = wax::cast<float>(value);
+        }else{
+            throw std::runtime_error("cant set to a wax demo with sub demos");
+        }
+    }
+};
+
+#define transform(i, j, k) float(i * j * k + i + j + k);
+
+int main(void){
+    try{
+        wax_demo wd(2, 10);
+        //test chained access
+        std::cout << "chain 1" << std::endl;
+        wd[size_t(0)];
+        std::cout << "chain 2" << std::endl;
+        wd[size_t(0)][size_t(0)];
+        std::cout << "chain 3" << std::endl;
+        wd[size_t(0)][size_t(0)][size_t(0)];
+        //set a bunch of values
+        std::cout << "set and get all" << std::endl;
+        for (size_t i = 0; i < 10; i++){
+            for (size_t j = 0; j < 10; j++){
+                for (size_t k = 0; k < 10; k++){
+                    float val = transform(i, j, k);
+                    //std::cout << i << " " << j << " " << k << std::endl;
+                    wd[i][j][k] = val;
+                    BOOST_ASSERT(wax::cast<float>(wd[i][j][k]) == val);
+                }
+            }
+        }
+        //test storing a proxy
+        std::cout << "store proxy" << std::endl;
+        wax::proxy p = wd[size_t(0)][size_t(0)];
+        p[size_t(0)] = float(5);
+        //test printing a type
+        std::cout << "print type" << std::endl;
+        wax::type test_type = float(3.33);
+        std::cout << test_type << std::endl;
+        std::cout << "done" << std::endl;
+    }catch(std::exception const& e){
+        std::cout << "Exception: " << e.what() << std::endl;
+        return ~0;
+    }
+    return 0;
+}
diff --git a/usrp_dboard/include/usrp_dboard/interface.hpp b/usrp_dboard/include/usrp_dboard/interface.hpp
deleted file mode 100644
index c8e655736..000000000
--- a/usrp_dboard/include/usrp_dboard/interface.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-
-#ifndef INCLUDED_USRP_DBOARD_INTERFACE_HPP
-#define INCLUDED_USRP_DBOARD_INTERFACE_HPP
-
-#include <boost/shared_ptr.hpp>
-#include <stdint.h>
-
-namespace usrp_dboard{
-
-/*!
- * The daughter board interface to be subclassed.
- * Each mboard should have a specially taylored dboard interface.
- * This interface provides i2c, spi, gpio access for dboard instances.
- */
-class interface{
-public:
-    typedef boost::shared_ptr<interface> sptr;
-
-    //tells the host which device to use
-    enum spi_dev_t{
-        SPI_TX_DEV,
-        SPI_RX_DEV,
-    };
-
-    //args for writing spi data
-    enum spi_push_t{
-        SPI_PUSH_RISE,
-        SPI_PUSH_FALL
-    };
-
-    //args for reading spi data
-    enum spi_latch_t{
-        SPI_LATCH_RISE,
-        SPI_LATCH_FALL
-    };
-
-    //tell the host which gpio bank
-    enum gpio_bank_t{
-        GPIO_TX_BANK,
-        GPIO_RX_BANK
-    };
-
-    //structors
-    interface(void);
-    virtual ~interface(void);
-
-    /*!
-     * Set daughterboard GPIO data direction register.
-     *
-     * \param bank      GPIO_TX_BANK or GPIO_RX_BANK
-     * \param value     16-bits, 0=FPGA input, 1=FPGA output
-     * \param mask      16-bits, 0=ignore, 1=set
-     */
-    virtual void set_gpio_ddr(gpio_bank_t bank, uint16_t value, uint16_t mask) = 0;
-
-    /*!
-     * Set daughterboard GPIO pin values.
-     *
-     * \param bank     GPIO_TX_BANK or GPIO_RX_BANK
-     * \param value    16 bits, 0=low, 1=high
-     * \param mask     16 bits, 0=ignore, 1=set
-     */
-    virtual void write_gpio(gpio_bank_t bank, uint16_t value, uint16_t mask) = 0;
-
-    /*!
-     * Read daughterboard GPIO pin values
-     *
-     * \param bank     GPIO_TX_BANK or GPIO_RX_BANK
-     * \return the value of the gpio bank
-     */
-    virtual uint16_t read_gpio(gpio_bank_t bank) = 0;
-
-    /*!
-     * \brief Write to I2C peripheral
-     * \param i2c_addr		I2C bus address (7-bits)
-     * \param buf		the data to write
-     * Writes are limited to a maximum of of 64 bytes.
-     */
-    virtual void write_i2c (int i2c_addr, const std::string &buf) = 0;
-
-    /*!
-     * \brief Read from I2C peripheral
-     * \param i2c_addr		I2C bus address (7-bits)
-     * \param len		number of bytes to read
-     * \return the data read if successful, else a zero length string.
-     * Reads are limited to a maximum of 64 bytes.
-     */
-    virtual std::string read_i2c (int i2c_addr, size_t len) = 0;
-
-    /*!
-     * \brief Write data to SPI bus peripheral.
-     *
-     * \param dev which spi device
-     * \param push args for writing
-     * \param buf		the data to write
-     *
-     * Writes are limited to a maximum of 64 bytes.
-     */
-    virtual void write_spi (spi_dev_t dev, spi_push_t push, const std::string &buf) = 0;
-
-    /*!
-     * \brief Read data from SPI bus peripheral.
-     *
-     * \param dev which spi device
-     * \param push args for reading
-     * \param len		number of bytes to read.  Must be in [0,64].
-     * \return the data read if sucessful, else a zero length string.
-     *
-     * Reads are limited to a maximum of 64 bytes.
-     */
-    virtual std::string read_spi (spi_dev_t dev, spi_latch_t latch, size_t len) = 0;
-};
-
-} //namespace usrp_dboard
-
-#endif /* INCLUDED_USRP_DBOARD_INTERFACE_HPP */
diff --git a/usrp_dboard/lib/Makefile.am b/usrp_dboard/lib/Makefile.am
deleted file mode 100644
index 69f2c8568..000000000
--- a/usrp_dboard/lib/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright 2010 Ettus Research LLC
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS =
-
-AM_CPPFLAGS = \
-	$(USRP_DBOARD_INCLUDES) \
-	$(BOOST_CPPFLAGS)
-
-noinst_LTLIBRARIES = \
-	libusrp_dboard.la
-
-libusrp_dboard_la_SOURCES = \
-	interface.cpp
-
-libusrp_dboard_la_LIBADD = \
-	$(BOOST_LDFLAGS) \
-	$(BOOST_THREAD_LIB)
-
-noinst_HEADERS =
diff --git a/usrp_dboard/lib/interface.cpp b/usrp_dboard/lib/interface.cpp
deleted file mode 100644
index 5fedf9c46..000000000
--- a/usrp_dboard/lib/interface.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-
-#include <usrp_dboard/interface.hpp>
-
-usrp_dboard::interface::interface(void){
-    /* NOP */
-}
-
-usrp_dboard::interface::~interface(void){
-    /* NOP */
-}
diff --git a/usrp_uhd/usrp_uhd.pc.in b/usrp_uhd.pc.in
index 18194a741..18194a741 100644
--- a/usrp_uhd/usrp_uhd.pc.in
+++ b/usrp_uhd.pc.in
diff --git a/usrp_uhd/Makefile.am b/usrp_uhd/Makefile.am
deleted file mode 100644
index c218af41a..000000000
--- a/usrp_uhd/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright 2010 Ettus Research LLC
-#
-
-include $(top_srcdir)/Makefile.common
-
-SUBDIRS = include lib
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = usrp_uhd.pc
-
-EXTRA_DIST = \
-	usrp_uhd.pc.in
diff --git a/usrp_uhd/lib/usrp_uhd.cpp b/usrp_uhd/lib/usrp_uhd.cpp
deleted file mode 100644
index 6dd9bee7b..000000000
--- a/usrp_uhd/lib/usrp_uhd.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-
-#include <usrp_uhd.hpp>
-
-using namespace usrp;
-
-uhd::uhd(usrp_addr_t usrp_addr){}
-uhd::~uhd(void){}