Merge branch 'next'

Conflicts:
	host/lib/usrp/usrp2/codec_impl.cpp

1 files changed, 0 insertions, 350 deletions

diff --git a/host/lib/types.cpp b/host/lib/types.cpp
deleted file mode 100644
index bea20a4aa..000000000
--- a/host/lib/types.cpp
+++ /dev/null
@@ -1,350 +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/assert.hpp>
-#include <uhd/types/tune_request.hpp>
-#include <uhd/types/tune_result.hpp>
-#include <uhd/types/clock_config.hpp>
-#include <uhd/types/stream_cmd.hpp>
-#include <uhd/types/metadata.hpp>
-#include <uhd/types/ranges.hpp>
-#include <uhd/types/time_spec.hpp>
-#include <uhd/types/device_addr.hpp>
-#include <uhd/types/mac_addr.hpp>
-#include <uhd/types/otw_type.hpp>
-#include <uhd/types/io_type.hpp>
-#include <uhd/types/serial.hpp>
-#include <boost/math/special_functions/round.hpp>
-#include <boost/foreach.hpp>
-#include <boost/format.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/assign/list_of.hpp>
-#include <boost/thread.hpp>
-#include <stdexcept>
-#include <complex>
-#include <sstream>
-
-using namespace uhd;
-
-/***********************************************************************
- * ranges template instantiation
- **********************************************************************/
-template struct uhd::meta_range_t<float>;
-template struct uhd::meta_range_t<double>;
-
-/***********************************************************************
- * tune request
- **********************************************************************/
-tune_request_t::tune_request_t(double target_freq):
-    target_freq(target_freq),
-    inter_freq_policy(POLICY_AUTO),
-    dsp_freq_policy(POLICY_AUTO)
-{
-    /* NOP */
-}
-
-tune_request_t::tune_request_t(double target_freq, double lo_off):
-    target_freq(target_freq),
-    inter_freq_policy(POLICY_MANUAL),
-    inter_freq(target_freq + lo_off),
-    dsp_freq_policy(POLICY_AUTO)
-{
-    /* NOP */
-}
-
-/***********************************************************************
- * tune result
- **********************************************************************/
-std::string tune_result_t::to_pp_string(void) const{
-    return str(boost::format(
-        "Tune Result:\n"
-        "    Target Intermediate Freq: %f (MHz)\n"
-        "    Actual Intermediate Freq: %f (MHz)\n"
-        "    Target DSP Freq Shift:    %f (MHz)\n"
-        "    Actual DSP Freq Shift:    %f (MHz)\n"
-    )
-        % (target_inter_freq/1e6) % (actual_inter_freq/1e6)
-        % (target_dsp_freq/1e6)   % (actual_dsp_freq/1e6)
-    );
-}
-
-/***********************************************************************
- * clock config
- **********************************************************************/
-clock_config_t::clock_config_t(void):
-    ref_source(REF_INT),
-    pps_source(PPS_INT),
-    pps_polarity(PPS_NEG)
-{
-    /* NOP */
-}
-
-/***********************************************************************
- * stream command
- **********************************************************************/
-stream_cmd_t::stream_cmd_t(const stream_mode_t &stream_mode):
-    stream_mode(stream_mode),
-    num_samps(0),
-    stream_now(true)
-{
-    /* NOP */
-}
-
-/***********************************************************************
- * metadata
- **********************************************************************/
-tx_metadata_t::tx_metadata_t(void):
-    has_time_spec(false),
-    time_spec(time_spec_t()),
-    start_of_burst(false),
-    end_of_burst(false)
-{
-    /* NOP */
-}
-
-/***********************************************************************
- * time spec
- **********************************************************************/
-time_spec_t::time_spec_t(double secs):
-    _full_secs(0),
-    _frac_secs(secs)
-{
-    /* NOP */
-}
-
-time_spec_t::time_spec_t(time_t full_secs, double frac_secs):
-    _full_secs(full_secs),
-    _frac_secs(frac_secs)
-{
-    /* NOP */
-}
-
-time_spec_t::time_spec_t(time_t full_secs, long tick_count, double tick_rate):
-    _full_secs(full_secs),
-    _frac_secs(double(tick_count)/tick_rate)
-{
-    /* NOP */
-}
-
-long time_spec_t::get_tick_count(double tick_rate) const{
-    return boost::math::iround(this->get_frac_secs()*tick_rate);
-}
-
-double time_spec_t::get_real_secs(void) const{
-    return this->_full_secs + this->_frac_secs;
-}
-
-time_t time_spec_t::get_full_secs(void) const{
-    double intpart;
-    std::modf(this->_frac_secs, &intpart);
-    return this->_full_secs + time_t(intpart);
-}
-
-double time_spec_t::get_frac_secs(void) const{
-    return std::fmod(this->_frac_secs, 1.0);
-}
-
-time_spec_t &time_spec_t::operator+=(const time_spec_t &rhs){
-    this->_full_secs += rhs.get_full_secs();
-    this->_frac_secs += rhs.get_frac_secs();
-    return *this;
-}
-
-time_spec_t &time_spec_t::operator-=(const time_spec_t &rhs){
-    this->_full_secs -= rhs.get_full_secs();
-    this->_frac_secs -= rhs.get_frac_secs();
-    return *this;
-}
-
-bool uhd::operator==(const time_spec_t &lhs, const time_spec_t &rhs){
-    return
-        lhs.get_full_secs() == rhs.get_full_secs() and
-        lhs.get_frac_secs() == rhs.get_frac_secs()
-    ;
-}
-
-bool uhd::operator<(const time_spec_t &lhs, const time_spec_t &rhs){
-    return (
-        (lhs.get_full_secs() < rhs.get_full_secs()) or (
-        (lhs.get_full_secs() == rhs.get_full_secs()) and
-        (lhs.get_frac_secs() < rhs.get_frac_secs())
-    ));
-}
-
-/***********************************************************************
- * device addr
- **********************************************************************/
-static const std::string arg_delim = ",";
-static const std::string pair_delim = "=";
-
-static std::string trim(const std::string &in){
-    return boost::algorithm::trim_copy(in);
-}
-
-device_addr_t::device_addr_t(const std::string &args){
-    BOOST_FOREACH(const std::string &pair, std::split_string(args, arg_delim)){
-        if (trim(pair) == "") continue;
-
-        std::vector<std::string> key_val = std::split_string(pair, pair_delim);
-        if (key_val.size() != 2) throw std::runtime_error("invalid args string: "+args);
-        (*this)[trim(key_val.front())] = trim(key_val.back());
-    }
-}
-
-std::string device_addr_t::to_pp_string(void) const{
-    if (this->size() == 0) return "Empty Device Address";
-
-    std::stringstream ss;
-    ss << "Device Address:" << std::endl;
-    BOOST_FOREACH(std::string key, this->keys()){
-        ss << boost::format("    %s: %s") % key % (*this)[key] << std::endl;
-    }
-    return ss.str();
-}
-
-std::string device_addr_t::to_string(void) const{
-    std::string args_str;
-    size_t count = 0;
-    BOOST_FOREACH(const std::string &key, this->keys()){
-        args_str += ((count++)? arg_delim : "") + key + pair_delim + (*this)[key];
-    }
-    return args_str;
-}
-
-/***********************************************************************
- * mac addr
- **********************************************************************/
-mac_addr_t::mac_addr_t(const byte_vector_t &bytes) : _bytes(bytes){
-    UHD_ASSERT_THROW(_bytes.size() == 6);
-}
-
-mac_addr_t mac_addr_t::from_bytes(const byte_vector_t &bytes){
-    return mac_addr_t(bytes);
-}
-
-mac_addr_t mac_addr_t::from_string(const std::string &mac_addr_str){
-
-    byte_vector_t bytes;
-
-    try{
-        if (mac_addr_str.size() != 17){
-            throw std::runtime_error("expected exactly 17 characters");
-        }
-
-        //split the mac addr hex string at the colons
-        BOOST_FOREACH(const std::string &hex_str, std::split_string(mac_addr_str, ":")){
-            int hex_num;
-            std::istringstream iss(hex_str);
-            iss >> std::hex >> hex_num;
-            bytes.push_back(boost::uint8_t(hex_num));
-        }
-
-    }
-    catch(std::exception const& e){
-        throw std::runtime_error(str(
-            boost::format("Invalid mac address: %s\n\t%s") % mac_addr_str % e.what()
-        ));
-    }
-
-    return mac_addr_t::from_bytes(bytes);
-}
-
-byte_vector_t mac_addr_t::to_bytes(void) const{
-    return _bytes;
-}
-
-std::string mac_addr_t::to_string(void) const{
-    std::string addr = "";
-    BOOST_FOREACH(boost::uint8_t byte, this->to_bytes()){
-        addr += str(boost::format("%s%02x") % ((addr == "")?"":":") % int(byte));
-    }
-    return addr;
-}
-
-/***********************************************************************
- * otw type
- **********************************************************************/
-size_t otw_type_t::get_sample_size(void) const{
-    return (this->width * 2) / 8;
-}
-
-otw_type_t::otw_type_t(void):
-    width(0),
-    shift(0),
-    byteorder(BO_NATIVE)
-{
-    /* NOP */
-}
-
-/***********************************************************************
- * io type
- **********************************************************************/
-static size_t tid_to_size(io_type_t::tid_t tid){
-    switch(tid){
-    case io_type_t::COMPLEX_FLOAT32: return sizeof(std::complex<float>);
-    case io_type_t::COMPLEX_INT16:   return sizeof(std::complex<boost::int16_t>);
-    case io_type_t::COMPLEX_INT8:    return sizeof(std::complex<boost::int8_t>);
-    default: throw std::runtime_error("unknown io type tid");
-    }
-}
-
-io_type_t::io_type_t(tid_t tid)
-: size(tid_to_size(tid)), tid(tid){
-    /* NOP */
-}
-
-io_type_t::io_type_t(size_t size)
-: size(size), tid(CUSTOM_TYPE){
-    /* NOP */
-}
-
-/***********************************************************************
- * serial
- **********************************************************************/
-spi_config_t::spi_config_t(edge_t edge):
-    mosi_edge(edge),
-    miso_edge(edge)
-{
-    /* NOP */
-}
-
-void i2c_iface::write_eeprom(
-    boost::uint8_t addr,
-    boost::uint8_t offset,
-    const byte_vector_t &bytes
-){
-    for (size_t i = 0; i < bytes.size(); i++){
-        //write a byte at a time, its easy that way
-        byte_vector_t cmd = boost::assign::list_of(offset+i)(bytes[i]);
-        this->write_i2c(addr, cmd);
-        boost::this_thread::sleep(boost::posix_time::milliseconds(10)); //worst case write
-    }
-}
-
-byte_vector_t i2c_iface::read_eeprom(
-    boost::uint8_t addr,
-    boost::uint8_t offset,
-    size_t num_bytes
-){
-    byte_vector_t bytes;
-    for (size_t i = 0; i < num_bytes; i++){
-        //do a zero byte write to start read cycle
-        this->write_i2c(addr, byte_vector_t(1, offset+i));
-        bytes.push_back(this->read_i2c(addr, 1).at(0));
-    }
-    return bytes;
-}