Made the usrp2 impl into a device.

Removed the usrp device wrapper and usrp2 cpp file outside of the usrp2 lib dir.
Also removed the mboard base files since we wont be needing them.

1 files changed, 0 insertions, 94 deletions

diff --git a/host/lib/usrp/usrp.cpp b/host/lib/usrp/usrp.cpp
deleted file mode 100644
index d4bae1694..000000000
--- a/host/lib/usrp/usrp.cpp
+++ /dev/null
@@ -1,94 +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/usrp/usrp.hpp>
-#include <uhd/usrp/usrp2.hpp>
-#include <boost/format.hpp>
-#include <boost/bind.hpp>
-#include <stdexcept>
-
-using namespace uhd::usrp;
-
-/***********************************************************************
- * default callbacks for the send and recv
- * these should be replaced with callbacks from the mboard object
- **********************************************************************/
-static void send_raw_default(const std::vector<boost::asio::const_buffer> &){
-    throw std::runtime_error("No callback registered for send raw");
-}
-
-static uhd::shared_iovec recv_raw_default(void){
-    throw std::runtime_error("No callback registered for recv raw");
-}
-
-/***********************************************************************
- * the usrp device wrapper
- **********************************************************************/
-usrp::usrp(const device_addr_t &device_addr){
-    //set the default callbacks, the code below should replace them
-    _send_raw_cb = boost::bind(&send_raw_default, _1);
-    _recv_raw_cb = boost::bind(&recv_raw_default);
-
-    //create mboard based on the device addr
-    if (not device_addr.has_key("type")){
-        //TODO nothing
-    }
-    else if (device_addr["type"] == "udp"){
-        _mboards[""] = mboard_base::sptr(new usrp2(device_addr));
-    }
-}
-
-usrp::~usrp(void){
-    /* NOP */
-}
-
-void usrp::get(const wax::obj &key_, wax::obj &val){
-    wax::obj key; std::string name;
-    boost::tie(key, name) = extract_named_prop(key_);
-
-    //handle the get request conditioned on the key
-    switch(wax::cast<device_prop_t>(key)){
-    case DEVICE_PROP_NAME:
-        val = std::string("usrp device");
-        return;
-
-    case DEVICE_PROP_MBOARD:
-        if (not _mboards.has_key(name)) throw std::invalid_argument(
-            str(boost::format("Unknown mboard name %s") % name)
-        );
-        //turn the mboard sptr object into a wax::obj::sptr
-        //this allows the properties access through the wax::proxy
-        val = _mboards[name]->get_link();
-        return;
-
-    case DEVICE_PROP_MBOARD_NAMES:
-        val = prop_names_t(_mboards.get_keys());
-        return;
-    }
-}
-
-void usrp::set(const wax::obj &, const wax::obj &){
-    throw std::runtime_error("Cannot set in usrp device");
-}
-
-void usrp::send_raw(const std::vector<boost::asio::const_buffer> &buffs){
-    return _send_raw_cb(buffs);
-}
-
-uhd::shared_iovec usrp::recv_raw(void){
-    return _recv_raw_cb();
-}