diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-25 16:07:07 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-25 16:07:07 -0800 |
| commit | 998aebf83c2796fdfabc2efd804ca14103adcaaf (patch) | |
| tree | 7e3675ffc14e41e390369fdeca4b9d7643ae6834 /lib | |
| parent | 069a7ce0570001ea3d9512a11d238ea4d6773f1d (diff) | |
| download | uhd-998aebf83c2796fdfabc2efd804ca14103adcaaf.tar.gz uhd-998aebf83c2796fdfabc2efd804ca14103adcaaf.tar.bz2 uhd-998aebf83c2796fdfabc2efd804ca14103adcaaf.zip | |
Various tweaks, switched to boost unit testing.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/device_addr.cpp | 11 | ||||
| -rw-r--r-- | lib/usrp/dboard/base.cpp | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/device_addr.cpp b/lib/device_addr.cpp index b28082069..8f14a6ec1 100644 --- a/lib/device_addr.cpp +++ b/lib/device_addr.cpp @@ -10,7 +10,9 @@ #include <boost/algorithm/string.hpp> //----------------------- u2 mac addr wrapper ------------------------// -usrp_uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str){ +usrp_uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str_){ + std::string mac_addr_str = (mac_addr_str_ == "")? "ff:ff:ff:ff:ff:ff" : mac_addr_str_; + //ether_aton_r(str.c_str(), &mac_addr); uint8_t p[6] = {0x00, 0x50, 0xC2, 0x85, 0x30, 0x00}; // Matt's IAB @@ -56,7 +58,8 @@ std::ostream& operator<<(std::ostream &os, const usrp_uhd::mac_addr_t &x){ } //----------------------- u2 ipv4 wrapper ----------------------------// -usrp_uhd::ip_addr_t::ip_addr_t(const std::string &ip_addr_str){ +usrp_uhd::ip_addr_t::ip_addr_t(const std::string &ip_addr_str_){ + std::string ip_addr_str = (ip_addr_str_ == "")? "255.255.255.255" : ip_addr_str_; int ret = inet_pton(AF_INET, ip_addr_str.c_str(), &ip_addr); if (ret == 0) throw std::runtime_error("Invalid ip address: " + ip_addr_str); } @@ -81,8 +84,8 @@ usrp_uhd::device_addr_t::device_addr_t(device_addr_type_t device_addr_type){ usb_args.vendor_id = 0xffff; usb_args.product_id = 0xffff; eth_args.ifc = "eth0"; - eth_args.mac_addr = "ff:ff:ff:ff:ff:ff"; - udp_args.addr = "255.255.255.255"; + eth_args.mac_addr = ""; + udp_args.addr = ""; discovery_args.mboard_id = ~0; } diff --git a/lib/usrp/dboard/base.cpp b/lib/usrp/dboard/base.cpp index d8a6e66c2..c80cdadeb 100644 --- a/lib/usrp/dboard/base.cpp +++ b/lib/usrp/dboard/base.cpp @@ -9,9 +9,8 @@ using namespace usrp_uhd::usrp::dboard; /*********************************************************************** * base dboard base class **********************************************************************/ -base::base(ctor_args_t const& args) - : _subdev_index(args.get<0>()), _dboard_interface(args.get<1>()){ - /* NOP */ +base::base(ctor_args_t const& args){ + boost::tie(_subdev_index, _dboard_interface) = args; } base::~base(void){ |