diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-04 21:25:25 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-04 21:25:25 -0700 |
| commit | 9dff7952f618360943470711636db64fe2376b40 (patch) | |
| tree | ccc41cd091e67160483d70acc81dd192fc78f3b9 /host/lib/usrp | |
| parent | fcf9f6ba329df2538286aabe20dd26628fc4ab43 (diff) | |
| download | uhd-9dff7952f618360943470711636db64fe2376b40.tar.gz uhd-9dff7952f618360943470711636db64fe2376b40.tar.bz2 uhd-9dff7952f618360943470711636db64fe2376b40.zip | |
usrp: print eeprom key/value pairs in the probe app, fixed mac addr size
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/mboard_eeprom.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/mboard_eeprom.cpp b/host/lib/usrp/mboard_eeprom.cpp index a19210206..2f5d41c95 100644 --- a/host/lib/usrp/mboard_eeprom.cpp +++ b/host/lib/usrp/mboard_eeprom.cpp @@ -65,7 +65,7 @@ static const boost::uint8_t NXXX_EEPROM_ADDR = 0x50; static const uhd::dict<std::string, boost::uint8_t> USRP_NXXX_OFFSETS = boost::assign::map_list_of ("rev-lsb-msb", 0x00) ("mac-addr", 0x02) - ("ip-addr", 0x02 + sizeof(mac_addr_t)) + ("ip-addr", 0x08) //leave space here for other addresses (perhaps) ("serial", 0x18) ("name", 0x18 + SERIAL_LEN) @@ -74,12 +74,12 @@ static const uhd::dict<std::string, boost::uint8_t> USRP_NXXX_OFFSETS = boost::a static void load_nxxx(mboard_eeprom_t &mb_eeprom, i2c_iface &iface){ //extract the revision number byte_vector_t rev_lsb_msb = iface.read_eeprom(NXXX_EEPROM_ADDR, USRP_NXXX_OFFSETS["rev-lsb-msb"], 2); - boost::uint16_t rev = (boost::uint16_t(rev_lsb_msb[0]) << 0) | (boost::uint16_t(rev_lsb_msb[1]) << 8); + boost::uint16_t rev = (boost::uint16_t(rev_lsb_msb.at(0)) << 0) | (boost::uint16_t(rev_lsb_msb.at(1)) << 8); mb_eeprom["rev"] = boost::lexical_cast<std::string>(rev); //extract the addresses mb_eeprom["mac-addr"] = mac_addr_t::from_bytes(iface.read_eeprom( - NXXX_EEPROM_ADDR, USRP_NXXX_OFFSETS["mac-addr"], sizeof(mac_addr_t) + NXXX_EEPROM_ADDR, USRP_NXXX_OFFSETS["mac-addr"], 6 )).to_string(); boost::asio::ip::address_v4::bytes_type ip_addr_bytes; |