diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-05 13:53:39 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-05 13:53:39 -0700 |
| commit | 3ac3457184bc3b251ce7398eee56c931983abe65 (patch) | |
| tree | 7cfa1ba616788ad083236272a323c3a6e2964da3 /host/lib/usrp/mboard_eeprom.cpp | |
| parent | 144ebf29327981db8422049b451852744619678d (diff) | |
| parent | c473cc56fafcb47d6ba1f16e8c9fb89ff6c57bca (diff) | |
| download | uhd-3ac3457184bc3b251ce7398eee56c931983abe65.tar.gz uhd-3ac3457184bc3b251ce7398eee56c931983abe65.tar.bz2 uhd-3ac3457184bc3b251ce7398eee56c931983abe65.zip | |
Merge branch 'good_stuff' into mb_eeprom
Conflicts:
firmware/fx2/include
Diffstat (limited to 'host/lib/usrp/mboard_eeprom.cpp')
| -rw-r--r-- | host/lib/usrp/mboard_eeprom.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/host/lib/usrp/mboard_eeprom.cpp b/host/lib/usrp/mboard_eeprom.cpp index 89e83bd56..81dc6f194 100644 --- a/host/lib/usrp/mboard_eeprom.cpp +++ b/host/lib/usrp/mboard_eeprom.cpp @@ -132,20 +132,13 @@ static void store_nxxx(const mboard_eeprom_t &mb_eeprom, i2c_iface &iface){ * Implementation of BXXX load/store **********************************************************************/ static const boost::uint8_t BXXX_EEPROM_ADDR = 0x50; -static const size_t USB_SERIAL_LEN = 16; static const uhd::dict<std::string, boost::uint8_t> USRP_BXXX_OFFSETS = boost::assign::map_list_of - ("usb-serial", 0xf8) - ("serial", 0xf8 + USB_SERIAL_LEN) - ("name", 0xf8 + USB_SERIAL_LEN + SERIAL_LEN) + ("serial", 0xf8) + ("name", 0xf8 + SERIAL_LEN) ; static void load_bxxx(mboard_eeprom_t &mb_eeprom, i2c_iface &iface){ - //extract the usb serial - mb_eeprom["usb-serial"] = bytes_to_string(iface.read_eeprom( - BXXX_EEPROM_ADDR, USRP_BXXX_OFFSETS["usb-serial"], USB_SERIAL_LEN - )); - //extract the serial mb_eeprom["serial"] = bytes_to_string(iface.read_eeprom( BXXX_EEPROM_ADDR, USRP_BXXX_OFFSETS["serial"], SERIAL_LEN @@ -158,12 +151,6 @@ static void load_bxxx(mboard_eeprom_t &mb_eeprom, i2c_iface &iface){ } static void store_bxxx(const mboard_eeprom_t &mb_eeprom, i2c_iface &iface){ - //store the usb serial - iface.write_eeprom( - BXXX_EEPROM_ADDR, USRP_BXXX_OFFSETS["usb-serial"], - string_to_bytes(mb_eeprom["usb-serial"], USB_SERIAL_LEN) - ); - //store the serial iface.write_eeprom( BXXX_EEPROM_ADDR, USRP_BXXX_OFFSETS["serial"], |