diff options
author | Josh Blum <josh@joshknows.com> | 2011-01-19 17:45:08 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-01-19 17:45:08 -0800 |
commit | 72daf0902c8b8e404774a4e2d2657edf95be5e87 (patch) | |
tree | 0fa7de137a969b838f235dff9a30d8c64a67fdcc /fpga/usrp2/timing/time_64bit.v | |
parent | 8e0fbbe47b3c0b2805d2a638da7f363bee2240fd (diff) | |
parent | 1254656ef914482cc111ffa3aca48be5c1e8caaf (diff) | |
download | uhd-72daf0902c8b8e404774a4e2d2657edf95be5e87.tar.gz uhd-72daf0902c8b8e404774a4e2d2657edf95be5e87.tar.bz2 uhd-72daf0902c8b8e404774a4e2d2657edf95be5e87.zip |
Merge branch 'fpga_next' into uhd_with_fpga_next
Diffstat (limited to 'fpga/usrp2/timing/time_64bit.v')
-rw-r--r-- | fpga/usrp2/timing/time_64bit.v | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fpga/usrp2/timing/time_64bit.v b/fpga/usrp2/timing/time_64bit.v index 33eb2b25a..8122cc6ea 100644 --- a/fpga/usrp2/timing/time_64bit.v +++ b/fpga/usrp2/timing/time_64bit.v @@ -6,7 +6,9 @@ module time_64bit (input clk, input rst, input set_stb, input [7:0] set_addr, input [31:0] set_data, input pps, - output [63:0] vita_time, output pps_int, + output [63:0] vita_time, + output reg [63:0] vita_time_pps, + output pps_int, input exp_time_in, output exp_time_out, output [31:0] debug ); @@ -74,6 +76,10 @@ module time_64bit pps_del <= {pps_del[0],pps_reg}; assign pps_edge = pps_del[0] & ~pps_del[1]; + + always @(posedge clk) + if(pps_edge) + vita_time_pps <= vita_time; always @(posedge clk) if(rst) |