uhd: removed wax and props utils

6 files changed, 3 insertions, 198 deletions

diff --git a/host/lib/deprecated.cpp b/host/lib/deprecated.cpp
index b659d1be5..0fc751eeb 100644
--- a/host/lib/deprecated.cpp
+++ b/host/lib/deprecated.cpp
@@ -2,158 +2,6 @@
 //-- deprecated interfaces below, to be removed when the API is changed
 //----------------------------------------------------------------------
 
-//
-// Copyright 2010-2011 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/>.
-//
-
-#include <uhd/wax.hpp>
-#include <uhd/exception.hpp>
-#include <boost/format.hpp>
-#include <stdexcept>
-
-/*!
- * The link args for internal use within this cpp file:
- *
- * It contains a link (in this case a pointer) to a wax object.
- * Only the methods in this file may create or parse link args.
- * The get_link method is the creator of a link args object.
- * The [] operator will resolve the link and make the [] call.
- *
- * TODO: register the link args with the wax obj that it links to.
- * That way, if the obj destructs, the link can be invalidated.
- * The operator() will throw, rather than dereferencing bad memory.
- */
-class link_args_t{
-public:
-    link_args_t(const wax::obj *obj_ptr) : _obj_ptr(obj_ptr){
-        /* NOP */
-    }
-    wax::obj & operator()(void) const{
-        //recursively resolve link args to get at original pointer
-        if (_obj_ptr->type() == typeid(link_args_t)){
-            return _obj_ptr->as<link_args_t>()();
-        }
-        return *const_cast<wax::obj *>(_obj_ptr);
-    }
-private:
-    const wax::obj *_obj_ptr;
-};
-
-/*!
- * The proxy args for internal use within this cpp file:
- *
- * It contains a link and a key for setting/getting a property.
- * Only the methods in this file may create or parse proxy args.
- * Class methods have special handling for the case when the
- * wax obj contains an instance of the proxy args.
- */
-class proxy_args_t{
-public:
-    proxy_args_t(const wax::obj *obj_ptr, const wax::obj &key) : _key(key){
-        _obj_link = obj_ptr->get_link();
-    }
-    wax::obj & operator()(void) const{
-        return _obj_link.as<link_args_t>()();
-    }
-    const wax::obj & key(void) const{
-        return _key;
-    }
-private:
-    wax::obj _obj_link;
-    const wax::obj _key;
-};
-
-/***********************************************************************
- * Structors
- **********************************************************************/
-wax::obj::obj(void){
-    /* NOP */
-}
-
-wax::obj::obj(const obj &o){
-    _contents = o._contents;
-}
-
-wax::obj::~obj(void){
-    /* NOP */
-}
-
-/***********************************************************************
- * Special Operators
- **********************************************************************/
-wax::obj wax::obj::operator[](const obj &key){
-    if (_contents.type() == typeid(proxy_args_t)){
-        obj val = resolve();
-        //check if its a special link and call
-        if (val.type() == typeid(link_args_t)){
-            return val.as<link_args_t>()()[key];
-        }
-        //unknown obj
-        throw uhd::type_error("cannot use [] on non wax::obj link");
-    }
-    else{
-        return proxy_args_t(this, key);
-    }
-}
-
-wax::obj & wax::obj::operator=(const obj &val){
-    if (_contents.type() == typeid(proxy_args_t)){
-        proxy_args_t proxy_args = boost::any_cast<proxy_args_t>(_contents);
-        proxy_args().set(proxy_args.key(), val);
-    }
-    else{
-        _contents = val._contents;
-    }
-    return *this;
-}
-
-/***********************************************************************
- * Public Methods
- **********************************************************************/
-wax::obj wax::obj::get_link(void) const{
-    return link_args_t(this);
-}
-
-const std::type_info & wax::obj::type(void) const{
-    return resolve().type();
-}
-
-/***********************************************************************
- * Private Methods
- **********************************************************************/
-boost::any wax::obj::resolve(void) const{
-    if (_contents.type() == typeid(proxy_args_t)){
-        obj val;
-        proxy_args_t proxy_args = boost::any_cast<proxy_args_t>(_contents);
-        proxy_args().get(proxy_args.key(), val);
-        return val.resolve();
-    }
-    else{
-        return _contents;
-    }
-}
-
-void wax::obj::get(const obj &, obj &){
-    throw uhd::type_error("Cannot call get on wax obj base class");
-}
-
-void wax::obj::set(const obj &, const obj &){
-    throw uhd::type_error("Cannot call set on wax obj base class");
-}
-
 #include <uhd/types/otw_type.hpp>
 #include <uhd/types/io_type.hpp>
 #include <boost/cstdint.hpp>
diff --git a/host/lib/usrp/dboard/db_wbx_common.hpp b/host/lib/usrp/dboard/db_wbx_common.hpp
index 3e41e04b7..e7eb3f31a 100644
--- a/host/lib/usrp/dboard/db_wbx_common.hpp
+++ b/host/lib/usrp/dboard/db_wbx_common.hpp
@@ -69,7 +69,6 @@
 #include <uhd/types/ranges.hpp>
 #include <uhd/types/sensors.hpp>
 #include <uhd/utils/log.hpp>
-#include <uhd/utils/props.hpp>
 #include <uhd/utils/static.hpp>
 #include <uhd/usrp/dboard_base.hpp>
 #include <boost/assign/list_of.hpp>
diff --git a/host/lib/usrp/dboard/db_wbx_simple.cpp b/host/lib/usrp/dboard/db_wbx_simple.cpp
index 1ac2a1704..f46ea70d1 100644
--- a/host/lib/usrp/dboard/db_wbx_simple.cpp
+++ b/host/lib/usrp/dboard/db_wbx_simple.cpp
@@ -36,9 +36,9 @@ using namespace boost::assign;
 /***********************************************************************
  * The WBX Simple dboard constants
  **********************************************************************/
-static const prop_names_t wbx_tx_antennas = list_of("TX/RX");
+static const std::vector<std::string> wbx_tx_antennas = list_of("TX/RX");
 
-static const prop_names_t wbx_rx_antennas = list_of("TX/RX")("RX2");
+static const std::vector<std::string> wbx_rx_antennas = list_of("TX/RX")("RX2");
 
 /***********************************************************************
  * The WBX simple implementation
diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp
index c645d2948..45fa1f39e 100644
--- a/host/lib/usrp/gps_ctrl.cpp
+++ b/host/lib/usrp/gps_ctrl.cpp
@@ -17,7 +17,6 @@
 
 #include <uhd/usrp/gps_ctrl.hpp>
 #include <uhd/utils/msg.hpp>
-#include <uhd/utils/props.hpp>
 #include <uhd/exception.hpp>
 #include <uhd/types/sensors.hpp>
 #include <boost/algorithm/string.hpp>
@@ -121,7 +120,7 @@ public:
         return sensor_value_t("GPS lock status", locked(), "locked", "unlocked");
     }
     else {
-        UHD_THROW_PROP_GET_ERROR();
+        throw uhd::value_error("gps ctrl get_sensor unknown key: " + key);
     }
   }
 
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt
index fd3249099..19dde9a56 100644
--- a/host/lib/utils/CMakeLists.txt
+++ b/host/lib/utils/CMakeLists.txt
@@ -134,7 +134,6 @@ LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/msg.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/paths.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/props.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/static.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority.cpp
diff --git a/host/lib/utils/props.cpp b/host/lib/utils/props.cpp
deleted file mode 100644
index fc9f8e63f..000000000
--- a/host/lib/utils/props.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// 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/>.
-//
-
-#include <uhd/utils/props.hpp>
-
-using namespace uhd;
-
-named_prop_t::named_prop_t(
-    const wax::obj &key,
-    const std::string &name
-):
-    key(key),
-    name(name)
-{
-    /* NOP */
-}
-
-named_prop_t named_prop_t::extract(
-    const wax::obj &key,
-    const std::string &name
-){
-    if (key.type() == typeid(named_prop_t)){
-        return key.as<named_prop_t>();
-    }
-    return named_prop_t(key, name);
-}