usrp: added software scale factor adjustment

2 files changed, 16 insertions, 2 deletions

diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp
index d79e0b2c0..15bd78242 100644
--- a/host/lib/transport/super_recv_packet_handler.hpp
+++ b/host/lib/transport/super_recv_packet_handler.hpp
@@ -74,6 +74,7 @@ public:
     {
         this->resize(size);
         set_alignment_failure_threshold(1000);
+        this->set_scale_factor(1/32767.);
     }
 
     //! Resize the number of transport channels
@@ -153,6 +154,11 @@ public:
         return boost::mutex::scoped_lock(_mutex);
     }
 
+    //! Set the scale factor used in float conversion
+    void set_scale_factor(const double scale_factor){
+        _scale_factor = scale_factor;
+    }
+
     /*******************************************************************
      * Receive:
      * The entry point for the fast-path receive calls.
@@ -238,6 +244,7 @@ private:
     std::vector<void *> _io_buffs; //used in conversion
     size_t _bytes_per_item; //used in conversion
     std::vector<uhd::convert::function_type> _converters; //used in conversion
+    double _scale_factor;
 
     //! information stored for a received buffer
     struct per_buffer_info_type{
@@ -558,7 +565,7 @@ private:
             }
 
             //copy-convert the samples from the recv buffer
-            _converters[io_type.tid](buff_info.copy_buff, _io_buffs, nsamps_to_copy_per_io_buff, 1/32767.);
+            _converters[io_type.tid](buff_info.copy_buff, _io_buffs, nsamps_to_copy_per_io_buff, _scale_factor);
 
             //update the rx copy buffer to reflect the bytes copied
             buff_info.copy_buff += bytes_to_copy;
diff --git a/host/lib/transport/super_send_packet_handler.hpp b/host/lib/transport/super_send_packet_handler.hpp
index 05557250f..d5d9e6fe3 100644
--- a/host/lib/transport/super_send_packet_handler.hpp
+++ b/host/lib/transport/super_send_packet_handler.hpp
@@ -58,6 +58,7 @@ public:
         _next_packet_seq(0)
     {
         this->resize(size);
+        this->set_scale_factor(32767.);
     }
 
     //! Resize the number of transport channels
@@ -132,6 +133,11 @@ public:
         return boost::mutex::scoped_lock(_mutex);
     }
 
+    //! Set the scale factor used in float conversion
+    void set_scale_factor(const double scale_factor){
+        _scale_factor = scale_factor;
+    }
+
     /*******************************************************************
      * Send:
      * The entry point for the fast-path send calls.
@@ -238,6 +244,7 @@ private:
     size_t _max_samples_per_packet;
     std::vector<const void *> _zero_buffs;
     size_t _next_packet_seq;
+    double _scale_factor;
 
     /*******************************************************************
      * Send a single packet:
@@ -270,7 +277,7 @@ private:
             otw_mem += if_packet_info.num_header_words32;
 
             //copy-convert the samples into the send buffer
-            _converters[io_type.tid](_io_buffs, otw_mem, nsamps_per_buff, 32767.);
+            _converters[io_type.tid](_io_buffs, otw_mem, nsamps_per_buff, _scale_factor);
 
             //commit the samples to the zero-copy interface
             size_t num_bytes_total = (_header_offset_words32+if_packet_info.num_packet_words32)*sizeof(boost::uint32_t);