[Commit-gnuradio] r6763 - in gnuradio/branches/developers/jcorgan/t179/usrp/fpga: rbf/rev2 rbf/rev4 sdr_lib toplevel/usrp_std

[jcorgan]

Author: jcorgan
Date: 2007-10-31 19:22:18 -0600 (Wed, 31 Oct 2007)
New Revision: 6763

Modified:
   
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
   
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
   gnuradio/branches/developers/jcorgan/t179/usrp/fpga/sdr_lib/tx_buffer.v
   
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/toplevel/usrp_std/usrp_std.v
Log:
TX debug bus suitable for HP analyzer.  Synthesized with 7.1SP1

Modified: 
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/rbf/rev2/std_2rxhb_2tx.rbf
===================================================================
(Binary files differ)

Modified: 
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/rbf/rev4/std_2rxhb_2tx.rbf
===================================================================
(Binary files differ)

Modified: 
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/sdr_lib/tx_buffer.v
===================================================================
--- gnuradio/branches/developers/jcorgan/t179/usrp/fpga/sdr_lib/tx_buffer.v     
2007-10-31 22:27:47 UTC (rev 6762)
+++ gnuradio/branches/developers/jcorgan/t179/usrp/fpga/sdr_lib/tx_buffer.v     
2007-11-01 01:22:18 UTC (rev 6763)
@@ -139,23 +139,32 @@
      else if(clear_status_dsp)
        tx_underrun_dsp <= 1'b0;
 
-   // Debugging Aids
-   assign debugbus[0] = WR;
-   assign debugbus[1] = have_space;
-   assign debugbus[2] = tx_empty;
-   assign debugbus[3] = 0;
-   assign debugbus[4] = tx_underrun;
-   assign debugbus[5] = write_count[8];
-   assign debugbus[6] = txstrobe;
-   assign debugbus[7] = rdreq;
-   assign debugbus[11:8] = phase;
-   assign debugbus[12] = iq_f;
-   assign debugbus[13] = sop_f;
-   assign debugbus[14] = write_count[0];
-   assign debugbus[15] = sop;
-   assign debugbus[16] = txclk;
-   assign debugbus[17] = usbclk;
-   assign debugbus[31:18] = 0;
+   // TX debug bus
+   // 
+   // 15:0  txclk  domain => TXA [15:0]
+   // 31:16 usbclk domain => RXA [15:0]
+   
+   assign debugbus[0]     = reset;
+   assign debugbus[1]     = txstrobe;
+   assign debugbus[2]     = rdreq;
+   assign debugbus[6:3]   = phase;
+   assign debugbus[7]     = tx_empty;
+   assign debugbus[8]     = tx_underrun_dsp;
+   assign debugbus[9]     = iq_f;
+   assign debugbus[10]    = sop_f;
+   assign debugbus[14:11] = 0;
+   assign debugbus[15]    = txclk;
+         
+   assign debugbus[16]    = bus_reset;
+   assign debugbus[17]    = WR;
+   assign debugbus[18]    = wr_reg;
+   assign debugbus[19]    = have_space;
+   assign debugbus[20]    = write_count[8];
+   assign debugbus[21]    = write_count[0];
+   assign debugbus[22]    = sop;
+   assign debugbus[23]    = tx_underrun;
+   assign debugbus[30:24] = 0;
+   assign debugbus[31]    = usbclk;
           
 endmodule // tx_buffer
 

Modified: 
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/toplevel/usrp_std/usrp_std.v
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/toplevel/usrp_std/usrp_std.v
    2007-10-31 22:27:47 UTC (rev 6762)
+++ 
gnuradio/branches/developers/jcorgan/t179/usrp/fpga/toplevel/usrp_std/usrp_std.v
    2007-11-01 01:22:18 UTC (rev 6763)
@@ -317,7 +317,7 @@
        .rx_sample_strobe(rx_sample_strobe),.strobe_decim(strobe_decim),
        .tx_empty(tx_empty),
        //.debug_0(rx_a_a),.debug_1(ddc0_in_i),
-       .debug_0(tx_debugbus[31:16]),.debug_1(tx_debugbus[15:0]),
+       .debug_0(tx_debugbus[15:0]),.debug_1(tx_debugbus[31:16]),
        
.debug_2({rx_sample_strobe,strobe_decim,serial_strobe,serial_addr}),.debug_3({rx_dsp_reset,tx_dsp_reset,rx_bus_reset,tx_bus_reset,enable_rx,tx_underrun,rx_overrun,decim_rate}),
        .reg_0(reg_0),.reg_1(reg_1),.reg_2(reg_2),.reg_3(reg_3) );