converted timespec to use nanoseconds for fractional part

6 files changed, 65 insertions, 64 deletions

diff --git a/host/lib/transport/gen_vrt.py b/host/lib/transport/gen_vrt.py
index 918de3ad7..bc6635d78 100755
--- a/host/lib/transport/gen_vrt.py
+++ b/host/lib/transport/gen_vrt.py
@@ -54,7 +54,8 @@ void vrt::pack(
     size_t &num_header_words32,    //output
     size_t num_payload_words32,    //input
     size_t &num_packet_words32,    //output
-    size_t packet_count            //input
+    size_t packet_count,           //input
+    double tick_rate               //input
 ){
     boost::uint32_t vrt_hdr_flags;
 
@@ -91,7 +92,7 @@ void vrt::pack(
         #if $pred & $tsf_p
             header_buff[$num_header_words] = htonl(0);
             #set $num_header_words += 1
-            header_buff[$num_header_words] = htonl(metadata.time_spec.ticks);
+            header_buff[$num_header_words] = htonl(metadata.time_spec.get_ticks(tick_rate));
             #set $num_header_words += 1
             #set $flags |= (0x1 << 20);
         #end if
@@ -127,7 +128,8 @@ void vrt::unpack(
     size_t &num_header_words32,         //output
     size_t &num_payload_words32,        //output
     size_t num_packet_words32,          //input
-    size_t &packet_count                //output
+    size_t &packet_count,               //output
+    double tick_rate                    //input
 ){
     //clear the metadata
     metadata = rx_metadata_t();
@@ -180,7 +182,7 @@ void vrt::unpack(
                 #set $set_has_time_spec = True
             #end if
             #set $num_header_words += 1
-            metadata.time_spec.ticks = ntohl(header_buff[$num_header_words]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[$num_header_words]), tick_rate);
             #set $num_header_words += 1
         #end if
         ########## Trailer ##########
diff --git a/host/lib/transport/vrt.cpp b/host/lib/transport/vrt.cpp
index bebca5db9..78c3cf2cb 100644
--- a/host/lib/transport/vrt.cpp
+++ b/host/lib/transport/vrt.cpp
@@ -2,7 +2,7 @@
 
 
 /***********************************************************************
- * This file was generated by ./gen_vrt.py on Fri Mar 26 15:33:00 2010
+ * This file was generated by gen_vrt.py on 04/08/10 10:55:26
  **********************************************************************/
 
 #include <uhd/transport/vrt.hpp>
@@ -18,7 +18,8 @@ void vrt::pack(
     size_t &num_header_words32,    //output
     size_t num_payload_words32,    //input
     size_t &num_packet_words32,    //output
-    size_t packet_count            //input
+    size_t packet_count,           //input
+    double tick_rate               //input
 ){
     boost::uint32_t vrt_hdr_flags;
 
@@ -85,7 +86,7 @@ void vrt::pack(
         break;
     case 8:
             header_buff[1] = htonl(0);
-            header_buff[2] = htonl(metadata.time_spec.ticks);
+            header_buff[2] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 3;
             num_packet_words32 = 3 + num_payload_words32;
             vrt_hdr_flags = 0x100000;
@@ -93,7 +94,7 @@ void vrt::pack(
     case 9:
             header_buff[1] = htonl(metadata.stream_id);
             header_buff[2] = htonl(0);
-            header_buff[3] = htonl(metadata.time_spec.ticks);
+            header_buff[3] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 4;
             num_packet_words32 = 4 + num_payload_words32;
             vrt_hdr_flags = 0x10100000;
@@ -102,7 +103,7 @@ void vrt::pack(
             header_buff[1] = htonl(0);
             header_buff[2] = htonl(0);
             header_buff[3] = htonl(0);
-            header_buff[4] = htonl(metadata.time_spec.ticks);
+            header_buff[4] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 5;
             num_packet_words32 = 5 + num_payload_words32;
             vrt_hdr_flags = 0x8100000;
@@ -112,7 +113,7 @@ void vrt::pack(
             header_buff[2] = htonl(0);
             header_buff[3] = htonl(0);
             header_buff[4] = htonl(0);
-            header_buff[5] = htonl(metadata.time_spec.ticks);
+            header_buff[5] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 6;
             num_packet_words32 = 6 + num_payload_words32;
             vrt_hdr_flags = 0x18100000;
@@ -120,7 +121,7 @@ void vrt::pack(
     case 12:
             header_buff[1] = htonl(metadata.time_spec.secs);
             header_buff[2] = htonl(0);
-            header_buff[3] = htonl(metadata.time_spec.ticks);
+            header_buff[3] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 4;
             num_packet_words32 = 4 + num_payload_words32;
             vrt_hdr_flags = 0xd00000;
@@ -129,7 +130,7 @@ void vrt::pack(
             header_buff[1] = htonl(metadata.stream_id);
             header_buff[2] = htonl(metadata.time_spec.secs);
             header_buff[3] = htonl(0);
-            header_buff[4] = htonl(metadata.time_spec.ticks);
+            header_buff[4] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 5;
             num_packet_words32 = 5 + num_payload_words32;
             vrt_hdr_flags = 0x10d00000;
@@ -139,7 +140,7 @@ void vrt::pack(
             header_buff[2] = htonl(0);
             header_buff[3] = htonl(metadata.time_spec.secs);
             header_buff[4] = htonl(0);
-            header_buff[5] = htonl(metadata.time_spec.ticks);
+            header_buff[5] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 6;
             num_packet_words32 = 6 + num_payload_words32;
             vrt_hdr_flags = 0x8d00000;
@@ -150,7 +151,7 @@ void vrt::pack(
             header_buff[3] = htonl(0);
             header_buff[4] = htonl(metadata.time_spec.secs);
             header_buff[5] = htonl(0);
-            header_buff[6] = htonl(metadata.time_spec.ticks);
+            header_buff[6] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 7;
             num_packet_words32 = 7 + num_payload_words32;
             vrt_hdr_flags = 0x18d00000;
@@ -213,7 +214,7 @@ void vrt::pack(
         break;
     case 24:
             header_buff[1] = htonl(0);
-            header_buff[2] = htonl(metadata.time_spec.ticks);
+            header_buff[2] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 3;
             num_packet_words32 = 4 + num_payload_words32;
             vrt_hdr_flags = 0x4100000;
@@ -221,7 +222,7 @@ void vrt::pack(
     case 25:
             header_buff[1] = htonl(metadata.stream_id);
             header_buff[2] = htonl(0);
-            header_buff[3] = htonl(metadata.time_spec.ticks);
+            header_buff[3] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 4;
             num_packet_words32 = 5 + num_payload_words32;
             vrt_hdr_flags = 0x14100000;
@@ -230,7 +231,7 @@ void vrt::pack(
             header_buff[1] = htonl(0);
             header_buff[2] = htonl(0);
             header_buff[3] = htonl(0);
-            header_buff[4] = htonl(metadata.time_spec.ticks);
+            header_buff[4] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 5;
             num_packet_words32 = 6 + num_payload_words32;
             vrt_hdr_flags = 0xc100000;
@@ -240,7 +241,7 @@ void vrt::pack(
             header_buff[2] = htonl(0);
             header_buff[3] = htonl(0);
             header_buff[4] = htonl(0);
-            header_buff[5] = htonl(metadata.time_spec.ticks);
+            header_buff[5] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 6;
             num_packet_words32 = 7 + num_payload_words32;
             vrt_hdr_flags = 0x1c100000;
@@ -248,7 +249,7 @@ void vrt::pack(
     case 28:
             header_buff[1] = htonl(metadata.time_spec.secs);
             header_buff[2] = htonl(0);
-            header_buff[3] = htonl(metadata.time_spec.ticks);
+            header_buff[3] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 4;
             num_packet_words32 = 5 + num_payload_words32;
             vrt_hdr_flags = 0x4d00000;
@@ -257,7 +258,7 @@ void vrt::pack(
             header_buff[1] = htonl(metadata.stream_id);
             header_buff[2] = htonl(metadata.time_spec.secs);
             header_buff[3] = htonl(0);
-            header_buff[4] = htonl(metadata.time_spec.ticks);
+            header_buff[4] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 5;
             num_packet_words32 = 6 + num_payload_words32;
             vrt_hdr_flags = 0x14d00000;
@@ -267,7 +268,7 @@ void vrt::pack(
             header_buff[2] = htonl(0);
             header_buff[3] = htonl(metadata.time_spec.secs);
             header_buff[4] = htonl(0);
-            header_buff[5] = htonl(metadata.time_spec.ticks);
+            header_buff[5] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 6;
             num_packet_words32 = 7 + num_payload_words32;
             vrt_hdr_flags = 0xcd00000;
@@ -278,7 +279,7 @@ void vrt::pack(
             header_buff[3] = htonl(0);
             header_buff[4] = htonl(metadata.time_spec.secs);
             header_buff[5] = htonl(0);
-            header_buff[6] = htonl(metadata.time_spec.ticks);
+            header_buff[6] = htonl(metadata.time_spec.get_ticks(tick_rate));
             num_header_words32 = 7;
             num_packet_words32 = 8 + num_payload_words32;
             vrt_hdr_flags = 0x1cd00000;
@@ -302,7 +303,8 @@ void vrt::unpack(
     size_t &num_header_words32,         //output
     size_t &num_payload_words32,        //output
     size_t num_packet_words32,          //input
-    size_t &packet_count                //output
+    size_t &packet_count,               //output
+    double tick_rate                    //input
 ){
     //clear the metadata
     metadata = rx_metadata_t();
@@ -376,7 +378,7 @@ void vrt::unpack(
         break;
     case 8:
             metadata.has_time_spec = true;
-            metadata.time_spec.ticks = ntohl(header_buff[2]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[2]), tick_rate);
             num_header_words32 = 3;
             num_payload_words32 = packet_words32 - 3;
         break;
@@ -384,13 +386,13 @@ void vrt::unpack(
             metadata.has_stream_id = true;
             metadata.stream_id = ntohl(header_buff[1]);
             metadata.has_time_spec = true;
-            metadata.time_spec.ticks = ntohl(header_buff[3]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[3]), tick_rate);
             num_header_words32 = 4;
             num_payload_words32 = packet_words32 - 4;
         break;
     case 10:
             metadata.has_time_spec = true;
-            metadata.time_spec.ticks = ntohl(header_buff[4]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[4]), tick_rate);
             num_header_words32 = 5;
             num_payload_words32 = packet_words32 - 5;
         break;
@@ -398,14 +400,14 @@ void vrt::unpack(
             metadata.has_stream_id = true;
             metadata.stream_id = ntohl(header_buff[1]);
             metadata.has_time_spec = true;
-            metadata.time_spec.ticks = ntohl(header_buff[5]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[5]), tick_rate);
             num_header_words32 = 6;
             num_payload_words32 = packet_words32 - 6;
         break;
     case 12:
             metadata.has_time_spec = true;
             metadata.time_spec.secs = ntohl(header_buff[1]);
-            metadata.time_spec.ticks = ntohl(header_buff[3]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[3]), tick_rate);
             num_header_words32 = 4;
             num_payload_words32 = packet_words32 - 4;
         break;
@@ -414,14 +416,14 @@ void vrt::unpack(
             metadata.stream_id = ntohl(header_buff[1]);
             metadata.has_time_spec = true;
             metadata.time_spec.secs = ntohl(header_buff[2]);
-            metadata.time_spec.ticks = ntohl(header_buff[4]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[4]), tick_rate);
             num_header_words32 = 5;
             num_payload_words32 = packet_words32 - 5;
         break;
     case 14:
             metadata.has_time_spec = true;
             metadata.time_spec.secs = ntohl(header_buff[3]);
-            metadata.time_spec.ticks = ntohl(header_buff[5]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[5]), tick_rate);
             num_header_words32 = 6;
             num_payload_words32 = packet_words32 - 6;
         break;
@@ -430,7 +432,7 @@ void vrt::unpack(
             metadata.stream_id = ntohl(header_buff[1]);
             metadata.has_time_spec = true;
             metadata.time_spec.secs = ntohl(header_buff[4]);
-            metadata.time_spec.ticks = ntohl(header_buff[6]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[6]), tick_rate);
             num_header_words32 = 7;
             num_payload_words32 = packet_words32 - 7;
         break;
@@ -484,7 +486,7 @@ void vrt::unpack(
         break;
     case 24:
             metadata.has_time_spec = true;
-            metadata.time_spec.ticks = ntohl(header_buff[2]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[2]), tick_rate);
             num_header_words32 = 3;
             num_payload_words32 = packet_words32 - 4;
         break;
@@ -492,13 +494,13 @@ void vrt::unpack(
             metadata.has_stream_id = true;
             metadata.stream_id = ntohl(header_buff[1]);
             metadata.has_time_spec = true;
-            metadata.time_spec.ticks = ntohl(header_buff[3]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[3]), tick_rate);
             num_header_words32 = 4;
             num_payload_words32 = packet_words32 - 5;
         break;
     case 26:
             metadata.has_time_spec = true;
-            metadata.time_spec.ticks = ntohl(header_buff[4]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[4]), tick_rate);
             num_header_words32 = 5;
             num_payload_words32 = packet_words32 - 6;
         break;
@@ -506,14 +508,14 @@ void vrt::unpack(
             metadata.has_stream_id = true;
             metadata.stream_id = ntohl(header_buff[1]);
             metadata.has_time_spec = true;
-            metadata.time_spec.ticks = ntohl(header_buff[5]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[5]), tick_rate);
             num_header_words32 = 6;
             num_payload_words32 = packet_words32 - 7;
         break;
     case 28:
             metadata.has_time_spec = true;
             metadata.time_spec.secs = ntohl(header_buff[1]);
-            metadata.time_spec.ticks = ntohl(header_buff[3]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[3]), tick_rate);
             num_header_words32 = 4;
             num_payload_words32 = packet_words32 - 5;
         break;
@@ -522,14 +524,14 @@ void vrt::unpack(
             metadata.stream_id = ntohl(header_buff[1]);
             metadata.has_time_spec = true;
             metadata.time_spec.secs = ntohl(header_buff[2]);
-            metadata.time_spec.ticks = ntohl(header_buff[4]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[4]), tick_rate);
             num_header_words32 = 5;
             num_payload_words32 = packet_words32 - 6;
         break;
     case 30:
             metadata.has_time_spec = true;
             metadata.time_spec.secs = ntohl(header_buff[3]);
-            metadata.time_spec.ticks = ntohl(header_buff[5]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[5]), tick_rate);
             num_header_words32 = 6;
             num_payload_words32 = packet_words32 - 7;
         break;
@@ -538,7 +540,7 @@ void vrt::unpack(
             metadata.stream_id = ntohl(header_buff[1]);
             metadata.has_time_spec = true;
             metadata.time_spec.secs = ntohl(header_buff[4]);
-            metadata.time_spec.ticks = ntohl(header_buff[6]);
+            metadata.time_spec.set_ticks(ntohl(header_buff[6]), tick_rate);
             num_header_words32 = 7;
             num_payload_words32 = packet_words32 - 8;
         break;
diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index 61a63b710..cd688e73d 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -26,6 +26,7 @@
 #include <uhd/types/otw_type.hpp>
 #include <uhd/types/io_type.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/math/special_functions/round.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <boost/cstdint.hpp>
@@ -101,29 +102,26 @@ tx_metadata_t::tx_metadata_t(void){
 /***********************************************************************
  * time spec
  **********************************************************************/
-time_spec_t::time_spec_t(boost::uint32_t new_secs, boost::uint32_t new_ticks){
+time_spec_t::time_spec_t(boost::uint32_t new_secs, double new_nsecs){
     secs = new_secs;
-    ticks = new_ticks;
+    nsecs = new_nsecs;
 }
 
-static const boost::posix_time::ptime epoch(boost::gregorian::date(1970,1,1));
-static double time_tick_rate = double(boost::posix_time::time_duration::ticks_per_second());
+boost::uint32_t time_spec_t::get_ticks(double tick_rate) const{
+    return boost::math::iround(nsecs*tick_rate*1e-9);
+}
 
-time_spec_t::time_spec_t(boost::posix_time::ptime time, double tick_rate){
-    boost::posix_time::time_duration td = time - epoch;
-    secs = boost::uint32_t(td.total_seconds());
-    double time_ticks_per_device_ticks = time_tick_rate/tick_rate;
-    ticks = boost::uint32_t(td.fractional_seconds()/time_ticks_per_device_ticks);
+void time_spec_t::set_ticks(boost::uint32_t ticks, double tick_rate){
+    nsecs = double(ticks)*1e9/tick_rate;
 }
 
 /***********************************************************************
  * device addr
  **********************************************************************/
 std::string device_addr_t::to_string(void) const{
-    const device_addr_t &device_addr = *this;
     std::stringstream ss;
-    BOOST_FOREACH(std::string key, device_addr.keys()){
-        ss << boost::format("%s: %s") % key % device_addr[key] << std::endl;
+    BOOST_FOREACH(std::string key, this->keys()){
+        ss << boost::format("%s: %s") % key % (*this)[key] << std::endl;
     }
     return ss.str();
 }
@@ -137,9 +135,8 @@ static std::string trim(const std::string &in){
 
 std::string device_addr_t::to_args_str(void) const{
     std::string args_str;
-    const device_addr_t &device_addr = *this;
-    BOOST_FOREACH(const std::string &key, device_addr.keys()){
-        args_str += key + pair_delim + device_addr[key] + arg_delim;
+    BOOST_FOREACH(const std::string &key, this->keys()){
+        args_str += key + pair_delim + (*this)[key] + arg_delim;
     }
     return args_str;
 }
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index d1515f2d5..3ac805421 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -22,6 +22,7 @@
 #include <uhd/usrp/dboard_props.hpp>
 #include <uhd/utils/assert.hpp>
 #include <boost/format.hpp>
+#include <iostream>
 
 using namespace uhd;
 using namespace uhd::usrp;
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index a58e32619..eb6b5f7b9 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -15,9 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <complex>
-#include <boost/format.hpp>
 #include "usrp2_impl.hpp"
+#include <boost/format.hpp>
+#include <complex>
+#include <iostream>
 
 using namespace uhd;
 using namespace uhd::usrp;
@@ -144,7 +145,8 @@ void usrp2_impl::recv_raw(rx_metadata_t &metadata){
             num_header_words32_out,  //output
             num_payload_words32_out, //output
             num_packet_words32,      //input
-            packet_count_out         //output
+            packet_count_out,        //output
+            get_master_clock_freq()
         );
     }catch(const std::exception &e){
         std::cerr << "bad vrt header: " << e.what() << std::endl;
@@ -196,7 +198,8 @@ size_t usrp2_impl::send(
         num_header_words32,  //output
         num_samps,           //input
         num_packet_words32,  //output
-        packet_count         //input
+        packet_count,        //input
+        get_master_clock_freq()
     );
 
     boost::uint32_t *items = tx_mem + num_header_words32; //offset for data
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index 94ab88a6b..2fa2e5211 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -33,10 +33,6 @@ void usrp2_impl::mboard_init(void){
         boost::bind(&usrp2_impl::mboard_get, this, _1, _2),
         boost::bind(&usrp2_impl::mboard_set, this, _1, _2)
     );
-
-    //set the time on the usrp2 as close as possible to the system utc time
-    boost::posix_time::ptime now(boost::posix_time::microsec_clock::universal_time());
-    set_time_spec(time_spec_t(now, get_master_clock_freq()), true);
 }
 
 void usrp2_impl::init_clock_config(void){
@@ -75,7 +71,7 @@ void usrp2_impl::update_clock_config(void){
 void usrp2_impl::set_time_spec(const time_spec_t &time_spec, bool now){
     //set ticks and seconds
     this->poke32(FR_TIME64_SECS, time_spec.secs);
-    this->poke32(FR_TIME64_TICKS, time_spec.ticks);
+    this->poke32(FR_TIME64_TICKS, time_spec.get_ticks(get_master_clock_freq()));
 
     //set the register to latch it all in
     boost::uint32_t imm_flags = (now)? FRF_TIME64_LATCH_NOW : FRF_TIME64_LATCH_NEXT_PPS;
@@ -88,7 +84,7 @@ void usrp2_impl::issue_ddc_stream_cmd(const stream_cmd_t &stream_cmd){
     out_data.id = htonl(USRP2_CTRL_ID_SEND_STREAM_COMMAND_FOR_ME_BRO);
     out_data.data.stream_cmd.now = (stream_cmd.stream_now)? 1 : 0;
     out_data.data.stream_cmd.secs = htonl(stream_cmd.time_spec.secs);
-    out_data.data.stream_cmd.ticks = htonl(stream_cmd.time_spec.ticks);
+    out_data.data.stream_cmd.ticks = htonl(stream_cmd.time_spec.get_ticks(get_master_clock_freq()));
 
     //set these to defaults, then change in the switch statement
     out_data.data.stream_cmd.continuous = 0;