Merge branch 'master' into flow_ctrl

Conflicts:
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_impl.hpp

5 files changed, 84 insertions, 2 deletions

diff --git a/host/include/uhd/types/dict.hpp b/host/include/uhd/types/dict.hpp
index b14fc5425..6166140a0 100644
--- a/host/include/uhd/types/dict.hpp
+++ b/host/include/uhd/types/dict.hpp
@@ -71,6 +71,14 @@ namespace uhd{
         bool has_key(const Key &key) const;
 
         /*!
+         * Get a value in the dict or default.
+         * \param key the key to look for
+         * \param def use if key not found
+         * \return the value or default
+         */
+        const Val &get(const Key &key, const Val &def) const;
+
+        /*!
          * Get a value for the given key if it exists.
          * If the key is not found throw an error.
          * \param key the key to look for
diff --git a/host/include/uhd/types/dict.ipp b/host/include/uhd/types/dict.ipp
index 85071e6fd..ba05d5272 100644
--- a/host/include/uhd/types/dict.ipp
+++ b/host/include/uhd/types/dict.ipp
@@ -28,7 +28,7 @@ namespace uhd{
 
     namespace /*anon*/{
         template<typename Key, typename Val>
-        struct UHD_API key_not_found: std::out_of_range{
+        struct key_not_found: std::out_of_range{
             key_not_found(const Key &key): std::out_of_range(
                 str(boost::format(
                     "key \"%s\" not found in dict(%s, %s)"
@@ -86,6 +86,14 @@ namespace uhd{
     }
 
     template <typename Key, typename Val>
+    const Val &dict<Key, Val>::get(const Key &key, const Val &def) const{
+        BOOST_FOREACH(const pair_t &p, _map){
+            if (p.first == key) return p.second;
+        }
+        return def;
+    }
+
+    template <typename Key, typename Val>
     const Val &dict<Key, Val>::operator[](const Key &key) const{
         BOOST_FOREACH(const pair_t &p, _map){
             if (p.first == key) return p.second;
diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt
index abddf3951..cdf31df87 100644
--- a/host/include/uhd/usrp/CMakeLists.txt
+++ b/host/include/uhd/usrp/CMakeLists.txt
@@ -34,6 +34,7 @@ INSTALL(FILES
 
     ### utilities ###
     dsp_utils.hpp
+    mboard_eeprom.hpp
     misc_utils.hpp
     subdev_spec.hpp
     tune_helper.hpp
diff --git a/host/include/uhd/usrp/mboard_eeprom.hpp b/host/include/uhd/usrp/mboard_eeprom.hpp
new file mode 100644
index 000000000..f44275aad
--- /dev/null
+++ b/host/include/uhd/usrp/mboard_eeprom.hpp
@@ -0,0 +1,64 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_USRP_MBOARD_EEPROM_HPP
+#define INCLUDED_UHD_USRP_MBOARD_EEPROM_HPP
+
+#include <uhd/config.hpp>
+#include <uhd/types/dict.hpp>
+#include <uhd/types/serial.hpp>
+#include <string>
+
+namespace uhd{ namespace usrp{
+
+    /*!
+     * The motherboard EEPROM object:
+     * Knows how to read and write the EEPROM for various USRPs.
+     * The class inherits from a string, string dictionary.
+     * Use the dictionary interface to get and set values.
+     * Commit to the EEPROM to save changed settings.
+     */
+    struct UHD_API mboard_eeprom_t : uhd::dict<std::string, std::string>{
+
+        //! Possible EEPROM maps types
+        enum map_type{
+            MAP_NXXX,
+            MAP_B1XX
+        };
+
+        //! Make a new empty mboard eeprom
+        mboard_eeprom_t(void);
+
+        /*!
+         * Make a new mboard EEPROM handler.
+         * \param iface the interface to i2c
+         * \param map the map type enum
+         */
+        mboard_eeprom_t(i2c_iface &iface, map_type map);
+
+        /*!
+         * Write the contents of this object to the EEPROM.
+         * \param iface the interface to i2c
+         * \param map the map type enum
+         */
+        void commit(i2c_iface &iface, map_type map);
+
+    };
+
+}} //namespace
+
+#endif /* INCLUDED_UHD_USRP_MBOARD_EEPROM_HPP */
diff --git a/host/include/uhd/usrp/mboard_props.hpp b/host/include/uhd/usrp/mboard_props.hpp
index 0f250f439..df94d1678 100644
--- a/host/include/uhd/usrp/mboard_props.hpp
+++ b/host/include/uhd/usrp/mboard_props.hpp
@@ -44,7 +44,8 @@ namespace uhd{ namespace usrp{
         MBOARD_PROP_CLOCK_CONFIG    = 'C', //rw, clock_config_t
         MBOARD_PROP_TIME_NOW        = 't', //rw, time_spec_t
         MBOARD_PROP_TIME_NEXT_PPS   = 'T', //wo, time_spec_t
-        MBOARD_PROP_STREAM_CMD      = 's'  //wo, stream_cmd_t
+        MBOARD_PROP_STREAM_CMD      = 's', //wo, stream_cmd_t
+        MBOARD_PROP_EEPROM_MAP      = 'M'  //wr, mboard_eeprom_t::sptr
     };
 
 }} //namespace