[Commit-gnuradio] r6903 - gnuradio/branches/developers/matt/u2f/control_lib

[matt]

Author: matt
Date: 2007-11-14 15:57:18 -0700 (Wed, 14 Nov 2007)
New Revision: 6903

Modified:
   gnuradio/branches/developers/matt/u2f/control_lib/wb_readback_mux.v
Log:
I was on crack


Modified: gnuradio/branches/developers/matt/u2f/control_lib/wb_readback_mux.v
===================================================================
--- gnuradio/branches/developers/matt/u2f/control_lib/wb_readback_mux.v 
2007-11-14 21:32:24 UTC (rev 6902)
+++ gnuradio/branches/developers/matt/u2f/control_lib/wb_readback_mux.v 
2007-11-14 22:57:18 UTC (rev 6903)
@@ -9,7 +9,7 @@
    input wb_stb_i,
    input [15:0] wb_adr_i,
    output reg [31:0] wb_dat_o,
-   output wb_ack_o,
+   output reg wb_ack_o,
    
    input [31:0] word00,
    input [31:0] word01,
@@ -29,30 +29,14 @@
    input [31:0] word15
    );
 
-   reg [15:0]   addr_reg;
-   reg [31:0]   dat_reg;
-   reg                  stb_reg, stb_reg1, stb_reg2;
-   
    always @(posedge wb_clk_i)
      if(wb_rst_i)
-       begin
-         addr_reg <= 0;
-         stb_reg <= 0;
-         stb_reg1 <= 0;
-         stb_reg2 <= 0;
-       end
+       wb_ack_o <= 0;
      else
-       begin
-         addr_reg <= wb_adr_i;
-         stb_reg <= wb_stb_i;
-         stb_reg1 <= stb_reg;
-         stb_reg2 <= stb_reg1;
-       end
+       wb_ack_o <= wb_stb_i & ~wb_ack_o;
    
-   assign wb_ack_o = stb_reg1 & ~stb_reg2;
-
    always @(posedge wb_clk_i)
-     case(addr_reg[5:2])
+     case(wb_adr_i[5:2])
        0 : wb_dat_o <= word00;
        1 : wb_dat_o <= word01;
        2 : wb_dat_o <= word02;