[Commit-gnuradio] r7322 - usrp2/trunk/fpga/timing

[matt]

Author: matt
Date: 2008-01-01 18:39:28 -0700 (Tue, 01 Jan 2008)
New Revision: 7322

Modified:
   usrp2/trunk/fpga/timing/time_sync.v
Log:
programmable offset to account for time to send and receive.


Modified: usrp2/trunk/fpga/timing/time_sync.v
===================================================================
--- usrp2/trunk/fpga/timing/time_sync.v 2008-01-02 01:03:51 UTC (rev 7321)
+++ usrp2/trunk/fpga/timing/time_sync.v 2008-01-02 01:39:28 UTC (rev 7322)
@@ -10,6 +10,8 @@
    
    wire [31:0] master_time_rcvd;
    reg [31:0]  master_time;
+   reg [31:0]  delta_time;
+   
    wire        sync_rcvd, internal_tick, pps_ext;
    reg [31:0]  tick_time, tick_time_wb;
    wire        tick_free_run;
@@ -21,7 +23,7 @@
      if(rst_i)
        master_time <= 0;
      else if(external_sync & sync_rcvd)
-       master_time <= master_time_rcvd;
+       master_time <= master_time_rcvd + delta_time;
      else
        master_time <= master_time + 1;
    assign      master_time_o = master_time;
@@ -47,9 +49,12 @@
          tick_int_enable <= 0;
          external_sync <= 0;
          tick_interval <= 100000-1;  // default to 1K times per second
+         delta_time <= 0;
        end
      else if(stb_i & we_i)
-       if(adr_i[2])
+       if(adr_i[2:0] == 2)
+        delta_time <= dat_i;
+       else if(adr_i[2:0] == 1)
         tick_interval <= dat_i;
        else
         begin