[Commit-gnuradio] r7207 - in gnuradio/branches/developers/gnychis/inband/usrp: fpga/inband_lib fpga/toplevel/usrp_inband_usb host/lib/inband

[gnychis]

Author: gnychis
Date: 2007-12-16 18:35:41 -0700 (Sun, 16 Dec 2007)
New Revision: 7207

Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
   
gnuradio/branches/developers/gnychis/inband/usrp/fpga/toplevel/usrp_inband_usb/usrp_inband_usb.v
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
Log:
Work in progress on I/Q problem: still not working

re-enable RX debug bus which confirms store_next never takes a value other than
0.  By setting the default in the case(store_next) to ch_0, the output is I
again.

Need to fix store_next.


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
 2007-12-17 01:17:10 UTC (rev 7206)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
 2007-12-17 01:35:41 UTC (rev 7207)
@@ -150,14 +150,15 @@
        always @*
                case(store_next)
                        4'd1 : fifodata_16 = ch_0;
-                       4'd2 : fifodata_16 = ch_1;
-                       4'd3 : fifodata_16 = ch_2;
-                       4'd4 : fifodata_16 = ch_3;
-                       4'd5 : fifodata_16 = ch_4;
-                       4'd6 : fifodata_16 = ch_5;
-                       4'd7 : fifodata_16 = ch_6;
-                       4'd8 : fifodata_16 = ch_7;
-                       default: fifodata_16 = 16'hFFFF;
+                       4'd2 : fifodata_16 = ch_0;
+                       4'd3 : fifodata_16 = ch_0;
+                       4'd4 : fifodata_16 = ch_0;
+//                     4'd5 : fifodata_16 = ch_4;
+//                     4'd6 : fifodata_16 = ch_5;
+//                     4'd7 : fifodata_16 = ch_6;
+//                     4'd8 : fifodata_16 = ch_7;
+//                     default: fifodata_16 = 16'hFFFF;
+                       default: fifodata_16 = ch_0;
                endcase
 
        wire [15:0] dataout [0:NUM_CHAN];

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/toplevel/usrp_inband_usb/usrp_inband_usb.v
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/toplevel/usrp_inband_usb/usrp_inband_usb.v
    2007-12-17 01:17:10 UTC (rev 7206)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/toplevel/usrp_inband_usb/usrp_inband_usb.v
    2007-12-17 01:35:41 UTC (rev 7207)
@@ -267,7 +267,7 @@
           .rx_databus(rx_databus),
           .rx_WR_done(rx_WR_done),
           .rx_WR_enabled(rx_WR_enabled),
-          .debugbus(),
+          .debugbus(rx_debugbus),
           .rssi_0(rssi_0), .rssi_1(rssi_1), .rssi_2(rssi_2), .rssi_3(rssi_3),
           .tx_underrun(tx_underrun));
    `else

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
      2007-12-17 01:17:10 UTC (rev 7206)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_usb_interface.cc
      2007-12-17 01:35:41 UTC (rev 7207)
@@ -353,11 +353,11 @@
   if (verbose)
     std::cout << "[USRP_USB_INTERFACE] Setup RX channel\n";
     
-//  d_utx->_write_fpga_reg(FR_DEBUG_EN,0xf);
-//  d_utx->_write_oe(0, 0xffff, 0xffff);
-//  d_urx->_write_oe(0, 0xffff, 0xffff);
-//  d_utx->_write_oe(1, 0xffff, 0xffff);
-//  d_urx->_write_oe(1, 0xffff, 0xffff);
+  d_utx->_write_fpga_reg(FR_DEBUG_EN,0xf);
+  d_utx->_write_oe(0, 0xffff, 0xffff);
+  d_urx->_write_oe(0, 0xffff, 0xffff);
+  d_utx->_write_oe(1, 0xffff, 0xffff);
+  d_urx->_write_oe(1, 0xffff, 0xffff);
 
   d_cs->send(s_response_usrp_open, pmt_list2(invocation_handle, PMT_T));
 }