diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-13 19:35:38 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-13 19:35:38 -0800 |
| commit | b52880892d1a85203e58cdb049877e7ae4c16663 (patch) | |
| tree | 5ef463525c9633bfbe7eadb4b3da5b1188bb5142 /include | |
| parent | 24d95c3f2cea168d1d314af29839d88cc16d3c7f (diff) | |
| download | uhd-b52880892d1a85203e58cdb049877e7ae4c16663.tar.gz uhd-b52880892d1a85203e58cdb049877e7ae4c16663.tar.bz2 uhd-b52880892d1a85203e58cdb049877e7ae4c16663.zip | |
Added strict compiler flags.
Made changes to meet compilation.
Added test to verify ip and mac addr code.
Diffstat (limited to 'include')
| -rw-r--r-- | include/usrp_uhd/device_addr.hpp | 4 | ||||
| -rw-r--r-- | include/usrp_uhd/usrp/dboard/interface.hpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/usrp_uhd/device_addr.hpp b/include/usrp_uhd/device_addr.hpp index f0be44c1f..c082d9f84 100644 --- a/include/usrp_uhd/device_addr.hpp +++ b/include/usrp_uhd/device_addr.hpp @@ -18,7 +18,7 @@ namespace usrp_uhd{ */ struct mac_addr_t{ struct ether_addr mac_addr; - mac_addr_t(const std::string &str = "00:00:00:00:00:00"); + mac_addr_t(const std::string &mac_addr_str = "00:00:00:00:00:00"); std::string to_string(void) const; }; @@ -28,7 +28,7 @@ namespace usrp_uhd{ */ struct ip_addr_t{ struct in_addr ip_addr; - ip_addr_t(const std::string &str = "0.0.0.0"); + ip_addr_t(const std::string &ip_addr_str = "0.0.0.0"); std::string to_string(void) const; }; diff --git a/include/usrp_uhd/usrp/dboard/interface.hpp b/include/usrp_uhd/usrp/dboard/interface.hpp index e6fdd9ad1..acbfc6d70 100644 --- a/include/usrp_uhd/usrp/dboard/interface.hpp +++ b/include/usrp_uhd/usrp/dboard/interface.hpp @@ -23,7 +23,7 @@ public: //tells the host which device to use enum spi_dev_t{ SPI_TX_DEV, - SPI_RX_DEV, + SPI_RX_DEV }; //args for writing spi data |