From 5e455ca92280e3c22f5484cb81a2aef0cdfb5de4 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 29 Jan 2010 19:22:40 -0800 Subject: Minimal framework in place to handle udp discovery. Added usrp2 stuff, udp wrapper, discovery function. Added app called discover usrps (usrp2 only for now). --- include/usrp_uhd/device_addr.hpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'include/usrp_uhd/device_addr.hpp') diff --git a/include/usrp_uhd/device_addr.hpp b/include/usrp_uhd/device_addr.hpp index 412a847a5..011e474df 100644 --- a/include/usrp_uhd/device_addr.hpp +++ b/include/usrp_uhd/device_addr.hpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace usrp_uhd{ @@ -35,16 +35,6 @@ namespace usrp_uhd{ std::string to_string(void) const; }; - /*! - * Wrapper for an ipv4 address. - * Provides conversion between string and binary formats. - */ - struct ip_addr_t{ - struct in_addr ip_addr; - ip_addr_t(const std::string &ip_addr_str = "0.0.0.0"); - std::string to_string(void) const; - }; - /*! * Possible usrp device interface types. */ @@ -103,6 +93,5 @@ namespace usrp_uhd{ //ability to use types with stream operators 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_UHD_DEVICE_ADDR_HPP */ -- cgit v1.2.3