[Commit-gnuradio] r7199 - in gnuradio/branches/developers/gnychis/inband/usrp: fpga/inband_lib host/apps-inband host/lib/inband

[gnychis]

Author: gnychis
Date: 2007-12-15 16:28:39 -0700 (Sat, 15 Dec 2007)
New Revision: 7199

Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
   
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
   gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
Log:
Still work in progress on fixing I/Q


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-15 23:00:46 UTC (rev 7198)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
 2007-12-15 23:28:39 UTC (rev 7199)
@@ -142,27 +142,24 @@
                        store_next <= #1 4'd0;
                else if(rxstrobe & (store_next == 0))
                        store_next <= #1 4'd1;
-               else if(~rx_full & (store_next == (NUM_CHAN + NUM_CHAN)))
+               else if(~rx_full & (store_next == channels))
                        store_next <= #1 4'd0;
                else if(~rx_full & (store_next != 0))
                        store_next <= #1 store_next + 4'd1;
 
        always @*
-               fifodata_16 = ch_0;             
+               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;
+               endcase
 
-//     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;
-//             endcase
-
        wire [15:0] dataout [0:NUM_CHAN];
        wire [9:0]  usedw       [0:NUM_CHAN];
        wire empty[0:NUM_CHAN];

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
    2007-12-15 23:00:46 UTC (rev 7198)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/apps-inband/test_usrp_inband_rx.cc
    2007-12-15 23:28:39 UTC (rev 7199)
@@ -108,7 +108,7 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("std_inband.rbf"));
+               pmt_intern("local_build.rbf"));
 
   pmt_dict_set(usrp_dict,
                pmt_intern("decim-rx"),

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc 
2007-12-15 23:00:46 UTC (rev 7198)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_rx.cc 
2007-12-15 23:28:39 UTC (rev 7199)
@@ -44,8 +44,8 @@
 
 usrp_rx::usrp_rx(mb_runtime *rt, const std::string &instance_name, pmt_t 
user_arg)
   : mb_mblock(rt, instance_name, user_arg),
-    d_disk_write(false),
-    d_disk_write_pkt(true)   // if true, writes full packet, else just the 
payload
+    d_disk_write(true),
+    d_disk_write_pkt(false)   // if true, writes full packet, else just the 
payload
 {
   d_cs = define_port("cs", "usrp-rx-cs", true, mb_port::EXTERNAL);