From a568e1d58c05fcacc40398d658b2cefdf72403f9 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 5 Dec 2017 16:19:23 -0800 Subject: types: Change eeprom_map_to to uint8_t vectors mpmd_impl was already using this type, fixed conversion from std::string to std::vector there too. Reviewed-By: Brent Stapleton --- host/include/uhd/types/eeprom.hpp | 4 ++-- host/lib/usrp/mpmd/mpmd_impl.cpp | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp index 814d429c8..19729f396 100644 --- a/host/include/uhd/types/eeprom.hpp +++ b/host/include/uhd/types/eeprom.hpp @@ -9,11 +9,11 @@ #include #include +#include namespace uhd { - typedef std::map eeprom_map_t; - + typedef std::map> eeprom_map_t; } /* namespace uhd */ diff --git a/host/lib/usrp/mpmd/mpmd_impl.cpp b/host/lib/usrp/mpmd/mpmd_impl.cpp index f0498cf99..8deac2743 100644 --- a/host/lib/usrp/mpmd/mpmd_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_impl.cpp @@ -171,7 +171,10 @@ namespace { .add_coerced_subscriber([mb](const uhd::usrp::mboard_eeprom_t& mb_eeprom){ eeprom_map_t eeprom_map; for (const auto& key : mb_eeprom.keys()) { - eeprom_map[key] = mb_eeprom[key]; + eeprom_map[key] = std::vector( + mb_eeprom[key].cbegin(), + mb_eeprom[key].cend() + ); } mb->rpc->notify_with_token("set_mb_eeprom", eeprom_map); }) -- cgit v1.2.3