[Commit-gnuradio] r8331 - usrp2/trunk/fpga/top/u2_core

[matt]

Author: matt
Date: 2008-05-08 19:46:26 -0600 (Thu, 08 May 2008)
New Revision: 8331

Modified:
   usrp2/trunk/fpga/top/u2_core/u2_core.v
Log:
rearranged atr and debug lines


Modified: usrp2/trunk/fpga/top/u2_core/u2_core.v
===================================================================
--- usrp2/trunk/fpga/top/u2_core/u2_core.v      2008-05-09 01:45:48 UTC (rev 
8330)
+++ usrp2/trunk/fpga/top/u2_core/u2_core.v      2008-05-09 01:46:26 UTC (rev 
8331)
@@ -342,8 +342,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),
-                //.debug_0(atr_lines),.debug_1(debug_gpio_1),
-                .debug_0(debug_gpio_0),.debug_1(debug_gpio_1),
+                .atr(atr_lines),.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,12 +618,11 @@
                                 { 1'b0, ser_rx_clk, ser_rkmsb, ser_rklsb, 
ser_enable, ser_prbsen, ser_loopen, ser_rx_en },
                                 { 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;
    
-   /*
    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]};
@@ -639,7 +637,7 @@
    assign      debug_clk[1] = dsp_clk; 
    
    assign      debug = debug_serdes0; //_common;
-   //assign      debug_gpio_0 = debug_serdes_sender;
-   assign      debug_gpio_1 = {uart_tx_o, debug_serdes1[30:0]};
+   assign      debug_gpio_0 = 32'b0;
+   assign      debug_gpio_1 = debug_serdes1[31:0];
    
 endmodule // u2_core