[Commit-gnuradio] r6774 - gnuradio/branches/developers/matt/u2f/top/u2_basic

[matt]

Author: matt
Date: 2007-11-01 14:17:12 -0600 (Thu, 01 Nov 2007)
New Revision: 6774

Modified:
   gnuradio/branches/developers/matt/u2f/top/u2_basic/u2_basic.v
Log:
better debug pins


Modified: gnuradio/branches/developers/matt/u2f/top/u2_basic/u2_basic.v
===================================================================
--- gnuradio/branches/developers/matt/u2f/top/u2_basic/u2_basic.v       
2007-11-01 16:40:05 UTC (rev 6773)
+++ gnuradio/branches/developers/matt/u2f/top/u2_basic/u2_basic.v       
2007-11-01 20:17:12 UTC (rev 6774)
@@ -236,7 +236,8 @@
      ID_ram (.wb_clk_i(wb_clk),.wb_rst_i(wb_rst),
             
             .iwb_adr_i(ram_loader_done ? iram_rd_adr : 
iram_wr_adr),.iwb_dat_i(iram_wr_dat),.iwb_dat_o(iram_rd_dat),
-            
.iwb_we_i(iram_wr_we),.iwb_ack_o(iram_ack),.iwb_stb_i(ram_loader_done ? 
iram_rd_stb : iram_wr_stb),
+            .iwb_we_i(ram_loader_done ? 1'b0 : 
iram_wr_we),.iwb_ack_o(iram_ack),
+            .iwb_stb_i(ram_loader_done ? iram_rd_stb : iram_wr_stb),
             .iwb_sel_i(ram_loader_done ? 4'b1111 : iram_wr_sel),
             
             .dwb_adr_i(s0_adr[13:0]),.dwb_dat_i(s0_dat_o),.dwb_dat_o(s0_dat_i),
@@ -318,7 +319,7 @@
    nsgpio nsgpio(.clk_i(wb_clk),.rst_i(wb_rst),
                 .cyc_i(s4_cyc),.stb_i(s4_stb),.adr_i(s4_adr[3:0]),.we_i(s4_we),
                 .dat_i(s4_dat_o),.dat_o(s4_dat_i),.ack_o(s4_ack),
-                .internal_sig(),.debug(),.gpio({io_tx,io_rx}) );
+                .internal_sig(),.debug(),.gpio( /* {io_tx,io_rx} */ ) );
    assign       s4_err = 1'b0;
    assign       s4_rty = 1'b0;
 
@@ -500,18 +501,24 @@
   
    // 
/////////////////////////////////////////////////////////////////////////////////////////
    // Debug Pins
-   wire [31:0] 
debug1={{1'b0,ram_loader_done,clock_ready,dsp_clk,wb_clk,ram_loader_rst,wb_rst,dsp_rst},
-                      
{1'b0,cpld_start,cpld_mode,cpld_done,1'b0,cpld_din,cpld_clk,cpld_detached},
-                      {8'hAF},
-                      {2'b0, clk_status, sen_dac, sen_clk, sclk, mosi, miso}};
+
    
-   wire [31:0] 
debug_wb={{iram_wr_we,ram_loader_done,clock_ready,iram_wr_ack,iram_wr_stb,ram_loader_rst,wb_rst,dsp_rst},
-                        {iram_rd_adr[15:8]},
-                        {iram_rd_adr[7:0]},
-                        {serdes_outs}};
+   wire [31:0] debug_cpld = 
{{iram_wr_we,ram_loader_done,clock_ready,iram_wr_ack,iram_wr_stb,ram_loader_rst,wb_rst,dsp_rst},
+                            {ram_loader_done ? {iram_rd_adr[15:0]} : 
iram_wr_adr[15:0]},
+                            
{proc_int,timer_int,cpld_start,cpld_mode,cpld_done,cpld_din,cpld_clk,cpld_detached}
 };
    
-   assign      debug = debug_wb;
+   wire [31:0] debug_new = {{ram_loader_done ? {iram_rd_adr[15:0]} : 
iram_wr_adr[15:0]},
+                           {3'b0,ram_loader_done,clock_ready, wb_rst, 
proc_int,timer_int},
+                           {8'b0} };
    
+   wire [31:0] debug_iram_dat = ram_loader_done ? iram_rd_dat : iram_wr_dat;
+
+   wire [31:0] debug_wb = {m0_adr[15:0], m0_sel[3:0], m0_ack, m0_we, m0_stb, 
m0_err};
+   
+   assign      debug = debug_new;
+   assign      io_rx = debug_wb[31:16];
+   assign      io_tx = debug_wb[15:0];
+   
    assign      debug_clk[0] = wb_clk;
    assign      debug_clk[1] = dsp_clk;