[Commit-gnuradio] r8020 - usrp2/trunk/fpga/top/u2_basic

[matt]

Author: matt
Date: 2008-03-14 11:49:42 -0600 (Fri, 14 Mar 2008)
New Revision: 8020

Modified:
   usrp2/trunk/fpga/top/u2_basic/u2_basic.v
Log:
debug lines changed


Modified: usrp2/trunk/fpga/top/u2_basic/u2_basic.v
===================================================================
--- usrp2/trunk/fpga/top/u2_basic/u2_basic.v    2008-03-14 03:44:13 UTC (rev 
8019)
+++ usrp2/trunk/fpga/top/u2_basic/u2_basic.v    2008-03-14 17:49:42 UTC (rev 
8020)
@@ -342,7 +342,8 @@
    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),
-                .debug_0(atr_lines),.debug_1(debug_gpio_1),
+                //.debug_0(atr_lines),.debug_1(debug_gpio_1),
+                .debug_0(debug_gpio_0),.debug_1(debug_gpio_1),
                 .gpio( {io_tx,io_rx} ) );
    assign       s4_err = 1'b0;
    assign       s4_rty = 1'b0;
@@ -619,22 +620,26 @@
                                 { ser_r[15:8] },
                                 { ser_r[7:0] } };
 
+   wire [31:0] debug_serdes_receiver = {uart_tx_o,debug_serdes2[30:0]};
+   wire [31:0] debug_serdes_sender = { uart_tx_o, debug_serdes0[30:0]};
+   wire [31:0] debug_serdes_common = debug_serdes1;
    
-   // Choose actual debug buses
-   assign      debug = debug_serdes0;
-   assign      debug_clk[0] = wb_clk;
-   assign      debug_clk[1] = dsp_clk; 
-   assign      debug_gpio_0 = 32'd0;  // Not used b/c of ATR
-
    /*
    assign      debug_gpio_1 = {uart_tx_o,7'd0,
                               3'd0,rd1_sop,rd1_eop,rd1_read,rd1_done,rd1_error,
                               debug_txc[15:0]};
    assign      debug_gpio_1 = debug_rx;
+   assign      debug_gpio_1 = debug_serdes1;
+   assign      debug_gpio_1 = debug_eth;
+      
     */
+      
+   // Choose actual debug buses
+   assign      debug_clk[0] = wb_clk;
+   assign      debug_clk[1] = dsp_clk; 
    
-   assign      debug_gpio_1 = debug_serdes1;
-
- //assign      debug_gpio_1 = debug_eth;
-      
+   assign      debug = debug_serdes_common;
+   assign      debug_gpio_0 = debug_serdes_sender;
+   assign      debug_gpio_1 = debug_serdes_receiver;
+   
 endmodule // u2_basic