summaryrefslogtreecommitdiffstats
path: root/host/lib
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib')
-rw-r--r--host/lib/usrp/usrp_e/codec_ctrl.cpp2
-rw-r--r--host/lib/usrp/usrp_e/dsp_impl.cpp59
-rw-r--r--host/lib/usrp/usrp_e/io_impl.cpp27
3 files changed, 28 insertions, 60 deletions
diff --git a/host/lib/usrp/usrp_e/codec_ctrl.cpp b/host/lib/usrp/usrp_e/codec_ctrl.cpp
index b19606020..ce3458827 100644
--- a/host/lib/usrp/usrp_e/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp_e/codec_ctrl.cpp
@@ -29,7 +29,7 @@
using namespace uhd;
-static const bool codec_debug = true;
+static const bool codec_debug = false;
/***********************************************************************
* Codec Control Implementation
diff --git a/host/lib/usrp/usrp_e/dsp_impl.cpp b/host/lib/usrp/usrp_e/dsp_impl.cpp
index 11d22d15f..a87a41ca6 100644
--- a/host/lib/usrp/usrp_e/dsp_impl.cpp
+++ b/host/lib/usrp/usrp_e/dsp_impl.cpp
@@ -17,10 +17,9 @@
#include "usrp_e_impl.hpp"
#include "usrp_e_regs.hpp"
+#include "../dsp_utils.hpp"
#include <uhd/usrp/dsp_props.hpp>
-#include <uhd/utils/assert.hpp>
#include <boost/bind.hpp>
-#include <boost/math/special_functions/round.hpp>
#define rint boost::math::iround
@@ -28,43 +27,6 @@ using namespace uhd;
using namespace uhd::usrp;
/***********************************************************************
- * Helper Functions
- **********************************************************************/
-static boost::uint32_t calculate_freq_word_and_update_actual_freq(double &freq, double clock_freq){
- UHD_ASSERT_THROW(std::abs(freq) < clock_freq/2.0);
- static const double scale_factor = std::pow(2.0, 32);
-
- //calculate the freq register word
- boost::uint32_t freq_word = rint((freq / clock_freq) * scale_factor);
-
- //update the actual frequency
- freq = (double(freq_word) / scale_factor) * clock_freq;
-
- return freq_word;
-}
-
-// Check if requested decim/interp rate is:
-// multiple of 4, enable two halfband filters
-// multiple of 2, enable one halfband filter
-// handle remainder in CIC
-static boost::uint32_t calculate_cic_word(size_t rate){
- int hb0 = 0, hb1 = 0;
- if (not (rate & 0x1)){
- hb0 = 1;
- rate /= 2;
- }
- if (not (rate & 0x1)){
- hb1 = 1;
- rate /= 2;
- }
- return (hb1 << 9) | (hb0 << 8) | (rate & 0xff);
-}
-
-static boost::uint32_t calculate_iq_scale_word(boost::int16_t i, boost::int16_t q){
- return (boost::uint16_t(i) << 16) | (boost::uint16_t(q) << 0);
-}
-
-/***********************************************************************
* RX DDC Initialization
**********************************************************************/
void usrp_e_impl::rx_ddc_init(void){
@@ -112,7 +74,7 @@ void usrp_e_impl::rx_ddc_set(const wax::obj &key, const wax::obj &val){
case DSP_PROP_FREQ_SHIFT:{
double new_freq = val.as<double>();
_iface->poke32(UE_REG_DSP_RX_FREQ,
- calculate_freq_word_and_update_actual_freq(new_freq, MASTER_CLOCK_RATE)
+ dsp_type1::calc_cordic_word_and_update(new_freq, MASTER_CLOCK_RATE)
);
_ddc_freq = new_freq; //shadow
}
@@ -121,12 +83,12 @@ void usrp_e_impl::rx_ddc_set(const wax::obj &key, const wax::obj &val){
case DSP_PROP_HOST_RATE:{
//set the decimation
_ddc_decim = rint(MASTER_CLOCK_RATE/val.as<double>());
- _iface->poke32(UE_REG_DSP_RX_DECIM_RATE, calculate_cic_word(_ddc_decim));
+ _iface->poke32(UE_REG_DSP_RX_DECIM_RATE, dsp_type1::calc_cic_filter_word(_ddc_decim));
//set the scaling
static const boost::int16_t default_rx_scale_iq = 1024;
_iface->poke32(UE_REG_DSP_RX_SCALE_IQ,
- calculate_iq_scale_word(default_rx_scale_iq, default_rx_scale_iq)
+ dsp_type1::calc_iq_scale_word(default_rx_scale_iq, default_rx_scale_iq)
);
}
return;
@@ -183,7 +145,7 @@ void usrp_e_impl::tx_duc_set(const wax::obj &key, const wax::obj &val){
case DSP_PROP_FREQ_SHIFT:{
double new_freq = val.as<double>();
_iface->poke32(UE_REG_DSP_TX_FREQ,
- calculate_freq_word_and_update_actual_freq(new_freq, MASTER_CLOCK_RATE)
+ dsp_type1::calc_cordic_word_and_update(new_freq, MASTER_CLOCK_RATE)
);
_duc_freq = new_freq; //shadow
}
@@ -192,18 +154,11 @@ void usrp_e_impl::tx_duc_set(const wax::obj &key, const wax::obj &val){
case DSP_PROP_HOST_RATE:{
_duc_interp = rint(MASTER_CLOCK_RATE/val.as<double>());
- // Calculate CIC interpolation (i.e., without halfband interpolators)
- size_t tmp_interp = calculate_cic_word(_duc_interp) & 0xff;
-
- // Calculate closest multiplier constant to reverse gain absent scale multipliers
- double interp_cubed = std::pow(double(tmp_interp), 3);
- boost::int16_t scale = rint((4096*std::pow(2, ceil(log2(interp_cubed))))/(1.65*interp_cubed));
-
//set the interpolation
- _iface->poke32(UE_REG_DSP_TX_INTERP_RATE, calculate_cic_word(_duc_interp));
+ _iface->poke32(UE_REG_DSP_TX_INTERP_RATE, dsp_type1::calc_cic_filter_word(_duc_interp));
//set the scaling
- _iface->poke32(UE_REG_DSP_TX_SCALE_IQ, calculate_iq_scale_word(scale, scale));
+ _iface->poke32(UE_REG_DSP_TX_SCALE_IQ, dsp_type1::calc_iq_scale_word(_duc_interp));
}
return;
diff --git a/host/lib/usrp/usrp_e/io_impl.cpp b/host/lib/usrp/usrp_e/io_impl.cpp
index 7c451a75f..d26f113f5 100644
--- a/host/lib/usrp/usrp_e/io_impl.cpp
+++ b/host/lib/usrp/usrp_e/io_impl.cpp
@@ -29,6 +29,8 @@ using namespace uhd;
static const size_t MAX_BUFF_SIZE = 2048;
+static const size_t vrt_header_offset_words32 = offsetof(usrp_transfer_frame, buf)/sizeof(boost::uint32_t);
+
/***********************************************************************
* Data Transport (phony zero-copy with read/write)
**********************************************************************/
@@ -70,17 +72,26 @@ private:
);
}
size_t recv(const boost::asio::mutable_buffer &buff){
- std::cout << boost::format(
- "calling read on fd %d, buff size is %d"
- ) % _fd % boost::asio::buffer_size(buff) << std::endl;
+ //std::cout << boost::format(
+ // "calling read on fd %d, buff size is %d"
+ //) % _fd % boost::asio::buffer_size(buff) << std::endl;
ssize_t ret = read(
_fd,
boost::asio::buffer_cast<void *>(buff),
boost::asio::buffer_size(buff)
);
if (ret < ssize_t(sizeof(usrp_transfer_frame))) return 0;
- std::cout << "len " << int(boost::asio::buffer_cast<usrp_transfer_frame *>(buff)->len) << std::endl;
- return boost::asio::buffer_cast<usrp_transfer_frame *>(buff)->len;
+ //overwrite the vrt header length with the transfer frame length
+ size_t frame_size = boost::asio::buffer_cast<usrp_transfer_frame *>(buff)->len;
+ boost::uint32_t *vrt_header = boost::asio::buffer_cast<boost::uint32_t *>(buff) + vrt_header_offset_words32;
+ vrt_header[0] = (vrt_header[0] & ~0xffff) | ((frame_size/sizeof(boost::uint32_t)) & 0xffff);
+
+ //std::cout << "len " << int(boost::asio::buffer_cast<usrp_transfer_frame *>(buff)->len) << std::endl;
+ //for (size_t i = 0; i < 7; i++){
+ // std::cout << boost::format(" 0x%08x") % boost::asio::buffer_cast<boost::uint32_t *>(buff)[i] << std::endl;
+ //}
+
+ return frame_size;
}
};
@@ -155,9 +166,10 @@ size_t usrp_e_impl::send(
io_type,
send_otw_type, //TODO
MASTER_CLOCK_RATE,
+ uhd::transport::vrt::pack_le,
boost::bind(&data_transport::get_send_buff, &_io_impl->transport),
(MAX_BUFF_SIZE - sizeof(usrp_transfer_frame))/send_otw_type.get_sample_size(),
- offsetof(usrp_transfer_frame, buf)
+ vrt_header_offset_words32
);
}
@@ -183,7 +195,8 @@ size_t usrp_e_impl::recv(
io_type,
recv_otw_type, //TODO
MASTER_CLOCK_RATE,
+ uhd::transport::vrt::unpack_le,
boost::bind(&data_transport::get_recv_buff, &_io_impl->transport),
- offsetof(usrp_transfer_frame, buf)
+ vrt_header_offset_words32
);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 16:27:44 +0000