Added stuff for usrp addresses, wax framework, build structure.

5 files changed, 224 insertions, 0 deletions

diff --git a/usrp_uhd/lib/.gitignore b/usrp_uhd/lib/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/usrp_uhd/lib/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/usrp_uhd/lib/Makefile.am b/usrp_uhd/lib/Makefile.am
new file mode 100644
index 000000000..09e15301b
--- /dev/null
+++ b/usrp_uhd/lib/Makefile.am
@@ -0,0 +1,25 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS =
+
+AM_CPPFLAGS = \
+	$(USRP_UHD_INCLUDES) \
+	$(BOOST_CPPFLAGS)
+
+lib_LTLIBRARIES = \
+	libusrp_uhd.la
+
+libusrp_uhd_la_SOURCES = \
+	usrp_addr.cpp \
+	usrp_uhd.cpp \
+	wax.cpp
+
+libusrp_uhd_la_LIBADD = \
+	$(BOOST_LDFLAGS) \
+	$(BOOST_THREAD_LIB)
+
+noinst_HEADERS =
diff --git a/usrp_uhd/lib/usrp_addr.cpp b/usrp_uhd/lib/usrp_addr.cpp
new file mode 100644
index 000000000..ddae7cd80
--- /dev/null
+++ b/usrp_uhd/lib/usrp_addr.cpp
@@ -0,0 +1,116 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#include <usrp_uhd/usrp_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);
+    bool good = false;
+    char p[6] = {0x00, 0x50, 0xC2, 0x85, 0x30, 0x00}; // Matt's IAB
+
+    switch (str.size()){
+    case 5:
+      good = sscanf(str.c_str(), "%hhx:%hhx", &p[4], &p[5]) == 2;
+      break;
+    case 17:
+      good = sscanf(str.c_str(), "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+            &p[0], &p[1], &p[2], &p[3], &p[4], &p[5]) == 6;
+      break;
+    }
+
+    if (not good) throw std::runtime_error("Invalid mac address: " + str);
+    memcpy(&d_mac_addr, p, sizeof(d_mac_addr));
+}
+
+std::string usrp::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);
+    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){
+    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);
+    if (ret == 0) throw std::runtime_error("Invalid ip address: " + str);
+}
+
+std::string usrp::ip_addr_t::to_string(void) const{
+    char addr_buf[128];
+    inet_ntop(AF_INET, &d_ip_addr, addr_buf, INET_ADDRSTRLEN);
+    return std::string(addr_buf);
+}
+
+std::ostream& operator<<(std::ostream &os, const usrp::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;
+    virtual_args.num_rx_dsps = 0;
+    virtual_args.num_tx_dsps = 0;
+    virtual_args.num_dboards = 0;
+    usb_args.vendor_id = 0xffff;
+    usb_args.product_id = 0xffff;
+    eth_args.ifc = "eth0";
+    eth_args.mac_addr = mac_addr_t("ff:ff:ff:ff:ff:ff");
+    udp_args.ip_addr = ip_addr_t("255.255.255.255");
+}
+
+std::string usrp::usrp_addr_t::to_string(void) const{
+    std::stringstream out;
+    out << "USRP Type: ";
+    switch(type){
+    case USRP_ADDR_TYPE_AUTO:
+        out << "Automatic" << std::endl;
+        break;
+    case USRP_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:
+        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:
+        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:
+        out << "UDP Socket" << std::endl;
+        out << "IP Addr: " << udp_args.ip_addr << std::endl;
+        break;
+    case USRP_ADDR_TYPE_GPMC:
+        out << "GPMC" << std::endl;
+        break;
+    default:
+        out << "Unknown" << std::endl;
+    }
+    out << std::endl;
+    return out.str();
+}
+
+std::ostream& operator<<(std::ostream &os, const usrp::usrp_addr_t &x)
+{
+  os << x.to_string();
+  return os;
+}
diff --git a/usrp_uhd/lib/usrp_uhd.cpp b/usrp_uhd/lib/usrp_uhd.cpp
new file mode 100644
index 000000000..6dd9bee7b
--- /dev/null
+++ b/usrp_uhd/lib/usrp_uhd.cpp
@@ -0,0 +1,10 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#include <usrp_uhd.hpp>
+
+using namespace usrp;
+
+uhd::uhd(usrp_addr_t usrp_addr){}
+uhd::~uhd(void){}
diff --git a/usrp_uhd/lib/wax.cpp b/usrp_uhd/lib/wax.cpp
new file mode 100644
index 000000000..888e581f3
--- /dev/null
+++ b/usrp_uhd/lib/wax.cpp
@@ -0,0 +1,71 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#include <usrp_uhd/wax.hpp>
+#include <stdexcept>
+#include <boost/bind.hpp>
+#include <boost/format.hpp>
+
+/***********************************************************************
+ * WAX Object
+ **********************************************************************/
+wax::obj::obj(void){
+    /* NOP */
+}
+
+wax::obj::~obj(void){
+    /* NOP */
+}
+
+wax::proxy wax::obj::operator[](const type &key){
+    return proxy(
+        boost::bind(&obj::get, this, key, _1),
+        boost::bind(&obj::set, this, key, _1)
+    );
+}
+
+/***********************************************************************
+ * WAX Proxy
+ **********************************************************************/
+wax::proxy::proxy(wax::proxy::getter_t getter, wax::proxy::setter_t setter)
+: d_getter(getter), d_setter(setter){
+    /* NOP */
+}
+
+wax::proxy::~proxy(void){
+    /* NOP */
+}
+
+wax::proxy wax::proxy::operator[](const type &key){
+    type val((*this)());
+    //check if its a regular pointer and call
+    if (val.type() == typeid(obj::ptr)){
+        return (*cast<obj::ptr>(val))[key];
+    }
+    //check if its a smart pointer and call
+    if (val.type() == typeid(obj::sptr)){
+        return (*cast<obj::sptr>(val))[key];
+    }
+    //unknown type
+    throw std::runtime_error("cannot use [] on non wax::obj pointer");
+}
+
+wax::proxy wax::proxy::operator=(const type &val){
+    d_setter(val);
+    return *this;
+}
+
+wax::type wax::proxy::operator()(void){
+    type val;
+    d_getter(val);
+    return val;
+}
+
+/***********************************************************************
+ * WAX Type
+ **********************************************************************/
+std::ostream& operator<<(std::ostream &os, const wax::type &x){
+    os << boost::format("WAX type (%s)") % x.type().name();
+    return os;
+}