Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e

Conflicts:
	host/include/uhd/usrp/dboard_id.hpp
	host/lib/usrp/usrp2/usrp2_impl.cpp

4 files changed, 0 insertions, 232 deletions

diff --git a/host/apps/CMakeLists.txt b/host/apps/CMakeLists.txt
deleted file mode 100644
index 58f73fcd6..000000000
--- a/host/apps/CMakeLists.txt
+++ /dev/null
@@ -1,26 +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/>.
-#
-
-ADD_EXECUTABLE(discover_usrps discover_usrps.cpp)
-TARGET_LINK_LIBRARIES(discover_usrps uhd)
-INSTALL(TARGETS discover_usrps RUNTIME DESTINATION ${RUNTIME_DIR})
-
-ADD_EXECUTABLE(usrp1e_load_fpga usrp1e_load_fpga.cpp)
-TARGET_LINK_LIBRARIES(usrp1e_load_fpga uhd)
-
-ADD_EXECUTABLE(usrp2_burner usrp2_burner.cpp)
-TARGET_LINK_LIBRARIES(usrp2_burner uhd)
diff --git a/host/apps/discover_usrps.cpp b/host/apps/discover_usrps.cpp
deleted file mode 100644
index d670d1651..000000000
--- a/host/apps/discover_usrps.cpp
+++ /dev/null
@@ -1,70 +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/device.hpp>
-#include <uhd/props.hpp>
-#include <boost/program_options.hpp>
-#include <boost/format.hpp>
-#include <iostream>
-
-namespace po = boost::program_options;
-
-int main(int argc, char *argv[]){
-    po::options_description desc("Allowed options");
-    desc.add_options()
-        ("help", "help message")
-        ("addr", po::value<std::string>(), "resolvable network address")
-        ("node", po::value<std::string>(), "path to linux device node")
-    ;
-
-    po::variables_map vm;
-    po::store(po::parse_command_line(argc, argv, desc), vm);
-    po::notify(vm); 
-
-    //print the help message
-    if (vm.count("help")){
-        std::cout << boost::format("Discover USRPs %s") % desc << std::endl;
-        return ~0;
-    }
-
-    //load the options into the address
-    uhd::device_addr_t device_addr;
-    if (vm.count("addr")){
-        device_addr["addr"] = vm["addr"].as<std::string>();
-    }
-    if (vm.count("node")){
-        device_addr["node"] = vm["node"].as<std::string>();
-    }
-
-    //discover the usrps and print the results
-    uhd::device_addrs_t device_addrs = uhd::device::discover(device_addr);
-
-    if (device_addrs.size() == 0){
-        std::cerr << "No USRP Devices Found" << std::endl;
-        return ~0;
-    }
-
-    for (size_t i = 0; i < device_addrs.size(); i++){
-        std::cout << "--------------------------------------------------" << std::endl;
-        std::cout << "-- USRP Device " << i << std::endl;
-        std::cout << "--------------------------------------------------" << std::endl;
-        std::cout << device_addrs[i] << std::endl << std::endl;
-        uhd::device::make(device_addrs[i]); //test make
-    }
-
-    return 0;
-}
diff --git a/host/apps/usrp2_burner.cpp b/host/apps/usrp2_burner.cpp
deleted file mode 100644
index 941e71d0c..000000000
--- a/host/apps/usrp2_burner.cpp
+++ /dev/null
@@ -1,84 +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/usrp2.hpp>
-#include <uhd/props.hpp>
-#include <boost/program_options.hpp>
-#include <boost/format.hpp>
-#include <iostream>
-
-namespace po = boost::program_options;
-
-int main(int argc, char *argv[]){
-    po::options_description desc("Allowed options");
-    desc.add_options()
-        ("help", "help message")
-        ("addr", po::value<std::string>(), "resolvable network address")
-        ("new-ip", po::value<std::string>(), "new ip address (optional)")
-        ("new-mac", po::value<std::string>(), "new mac address (optional)")
-    ;
-
-    po::variables_map vm;
-    po::store(po::parse_command_line(argc, argv, desc), vm);
-    po::notify(vm); 
-
-    //print the help message
-    if (vm.count("help")){
-        std::cout << boost::format("USRP2 Burner %s") % desc << std::endl;
-        return ~0;
-    }
-
-    //load the options into the address
-    uhd::device_addr_t device_addr;
-    if (vm.count("addr")){
-        device_addr["addr"] = vm["addr"].as<std::string>();
-    }
-    else{
-        std::cerr << "Error: missing addr option" << std::endl;
-        return ~0;
-    }
-
-    //create a usrp2 device
-    uhd::device::sptr u2_dev = uhd::usrp::usrp2::make(device_addr);
-    //FIXME usees the default mboard for now (until the mimo link is supported)
-    wax::obj u2_mb = (*u2_dev)[uhd::DEVICE_PROP_MBOARD];
-
-    //try to set the new ip (if provided)
-    if (vm.count("new-ip")){
-        std::cout << "Burning a new ip address into the usrp2 eeprom:" << std::endl;
-        std::string old_ip = u2_mb[std::string("ip-addr")].as<std::string>();
-        std::cout << boost::format("  Old IP Address: %s") % old_ip << std::endl;
-        std::string new_ip = vm["new-ip"].as<std::string>();
-        std::cout << boost::format("  New IP Address: %s") % new_ip << std::endl;
-        u2_mb[std::string("ip-addr")] = new_ip;
-        std::cout << "  Done" << std::endl;
-    }
-
-    //try to set the new mac (if provided)
-    if (vm.count("new-mac")){
-        std::cout << "Burning a new mac address into the usrp2 eeprom:" << std::endl;
-        std::string old_mac = u2_mb[std::string("mac-addr")].as<std::string>();
-        std::cout << boost::format("  Old MAC Address: %s") % old_mac << std::endl;
-        std::string new_mac = vm["new-mac"].as<std::string>();
-        std::cout << boost::format("  New MAC Address: %s") % new_mac << std::endl;
-        u2_mb[std::string("mac-addr")] = new_mac;
-        std::cout << "  Done" << std::endl;
-    }
-
-    std::cout << "Power-cycle the usrp2 for the changes to take effect." << std::endl;
-    return 0;
-}
diff --git a/host/apps/usrp2_recovery.py b/host/apps/usrp2_recovery.py
deleted file mode 100755
index 48c1121cb..000000000
--- a/host/apps/usrp2_recovery.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-
-"""
-The usrp2 recovery app:
-
-When the usrp2 has an unknown or bad ip address in its eeprom,
-it may not be possible to communicate with the usrp2 over ip/udp.
-
-This app will send a raw ethernet packet to bypass the ip layer.
-The packet will contain a known ip address to burn into eeprom.
-Because the recovery packet is sent with a broadcast mac address,
-only one usrp2 should be present on the interface upon execution.
-
-This app requires super-user privileges and only works on linux. 
-"""
-
-import socket
-import struct
-import optparse
-
-BCAST_MAC_ADDR = 'ff:ff:ff:ff:ff:ff'
-RECOVERY_ETHERTYPE = 0xbeee
-IP_RECOVERY_CODE = 'addr'
-
-def mac_addr_repr_to_binary_string(mac_addr):
-    return ''.join(map(lambda x: chr(int(x, 16)), mac_addr.split(':')))
-
-if __name__ == '__main__':
-    parser = optparse.OptionParser(usage='usage: %prog [options]\n'+__doc__)
-    parser.add_option('--ifc', type='string', help='ethernet interface name [default=%default]', default='eth0')
-    parser.add_option('--new-ip', type='string', help='ip address to set [default=%default]', default='192.168.10.2')
-    (options, args) = parser.parse_args()
-
-    #create the raw socket
-    print "Opening raw socket on interface:", options.ifc
-    soc = socket.socket(socket.PF_PACKET, socket.SOCK_RAW)
-    soc.bind((options.ifc, RECOVERY_ETHERTYPE))
-
-    #create the recovery packet
-    print "Loading packet with ip address:", options.new_ip
-    packet = struct.pack(
-        '!6s6sH4s4s',
-        mac_addr_repr_to_binary_string(BCAST_MAC_ADDR),
-        mac_addr_repr_to_binary_string(BCAST_MAC_ADDR),
-        RECOVERY_ETHERTYPE,
-        IP_RECOVERY_CODE,
-        socket.inet_aton(options.new_ip),
-    )
-
-    print "Sending packet (%d bytes)"%len(packet)
-    soc.send(packet)
-    print "Done"