diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-29 19:22:40 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-29 19:22:40 -0800 |
| commit | 5e455ca92280e3c22f5484cb81a2aef0cdfb5de4 (patch) | |
| tree | d32d5aeebbef8fc2d15c42b281c893940f7f6b5b /include/usrp_uhd/device_addr.hpp | |
| parent | aa2c904d7a6dad83f4a516a5a38ee9e765b9dfac (diff) | |
| download | uhd-5e455ca92280e3c22f5484cb81a2aef0cdfb5de4.tar.gz uhd-5e455ca92280e3c22f5484cb81a2aef0cdfb5de4.tar.bz2 uhd-5e455ca92280e3c22f5484cb81a2aef0cdfb5de4.zip | |
Minimal framework in place to handle udp discovery.
Added usrp2 stuff, udp wrapper, discovery function.
Added app called discover usrps (usrp2 only for now).
Diffstat (limited to 'include/usrp_uhd/device_addr.hpp')
| -rw-r--r-- | include/usrp_uhd/device_addr.hpp | 13 |
1 files changed, 1 insertions, 12 deletions
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 <string> #include <iostream> #include <netinet/ether.h> -#include <arpa/inet.h> +#include <stdint.h> namespace usrp_uhd{ @@ -36,16 +36,6 @@ namespace usrp_uhd{ }; /*! - * 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. */ enum device_addr_type_t{ @@ -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 */ |