diff options
author | Josh Blum <josh@joshknows.com> | 2010-05-11 16:35:01 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-05-11 16:35:01 -0700 |
commit | 81f211c94f761c92baaf1a2997a7f9b9b7718182 (patch) | |
tree | 193c188cd52ef7e14be63f69adc04fe81315025f /host/lib/usrp/usrp2/usrp2_impl.cpp | |
parent | 7c7b0d0a0dc8dd0cb4f0229fbc55978d6f2e253c (diff) | |
download | uhd-81f211c94f761c92baaf1a2997a7f9b9b7718182.tar.gz uhd-81f211c94f761c92baaf1a2997a7f9b9b7718182.tar.bz2 uhd-81f211c94f761c92baaf1a2997a7f9b9b7718182.zip |
Moved usrp2 eeprom addr read/write to host control over i2c/eeprom interface calls.
No longer part of the dude/bro protocol.
Simplified the mac and ip addr read write code in mboard impl.
Modified the mac addr type to take byte_vector_t from serial.hpp types.
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 5c1d7f9e3..2b7bdeea2 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -72,7 +72,7 @@ uhd::device_addrs_t usrp2::find(const device_addr_t &hint){ //send a hello control packet usrp2_ctrl_data_t ctrl_data_out; ctrl_data_out.proto_ver = htonl(USRP2_PROTO_VERSION); - ctrl_data_out.id = htonl(USRP2_CTRL_ID_GIVE_ME_YOUR_IP_ADDR_BRO); + ctrl_data_out.id = htonl(USRP2_CTRL_ID_WAZZUP_BRO); udp_transport->send(boost::asio::buffer(&ctrl_data_out, sizeof(ctrl_data_out))); //loop and recieve until the timeout @@ -83,7 +83,7 @@ uhd::device_addrs_t usrp2::find(const device_addr_t &hint){ if (len >= sizeof(usrp2_ctrl_data_t)){ //handle the received data switch(ntohl(ctrl_data_in.id)){ - case USRP2_CTRL_ID_THIS_IS_MY_IP_ADDR_DUDE: + case USRP2_CTRL_ID_WAZZUP_DUDE: //make a boost asio ipv4 with the raw addr in host byte order boost::asio::ip::address_v4 ip_addr(ntohl(ctrl_data_in.data.ip_addr)); device_addr_t new_addr; |