[Commit-gnuradio] r7237 - in usrp2/trunk/fpga: . control_lib timing

[matt]

Author: matt
Date: 2007-12-22 15:13:54 -0700 (Sat, 22 Dec 2007)
New Revision: 7237

Added:
   usrp2/trunk/fpga/timing/
   usrp2/trunk/fpga/timing/timer.v
Removed:
   usrp2/trunk/fpga/control_lib/timer.v
Log:
move timer, make place for more sync stuff


Deleted: usrp2/trunk/fpga/control_lib/timer.v

Copied: usrp2/trunk/fpga/timing/timer.v (from rev 7231, 
usrp2/trunk/fpga/control_lib/timer.v)
===================================================================
--- usrp2/trunk/fpga/timing/timer.v                             (rev 0)
+++ usrp2/trunk/fpga/timing/timer.v     2007-12-22 22:13:54 UTC (rev 7237)
@@ -0,0 +1,49 @@
+
+
+module timer
+  (input wb_clk_i, input rst_i,
+   input cyc_i, input stb_i, input [2:0] adr_i,
+   input we_i, input [31:0] dat_i, output [31:0] dat_o, output ack_o,
+   input sys_clk_i, output [31:0] master_time_o,
+   output int_o );
+   
+
+   reg [31:0] master_time;
+   always @(posedge sys_clk_i)
+     if(rst_i)
+       master_time <= 0;
+     else
+       master_time <= master_time + 1;
+   assign     master_time_o = master_time;
+
+   reg [31:0] time_wb;
+   always @(posedge wb_clk_i)
+     time_wb <= master_time;
+
+   assign     ack_o = stb_i;
+
+   reg [31:0] int_time;
+   reg               int_reg;
+   
+   always @(posedge sys_clk_i)
+     if(rst_i)
+       begin
+         int_time <= 0;
+         int_reg <= 0;
+       end
+     else if(|int_time && (master_time == int_time))
+       begin
+         int_time <= 0;
+         int_reg <= 1;
+       end
+     else if(stb_i & we_i)
+       begin
+         int_time <= dat_i;
+         int_reg <= 0;
+       end
+
+   assign dat_o = time_wb;
+   assign int_o = int_reg;
+   
+endmodule // timer
+