[Commit-gnuradio] r7676 - gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib

[zhuochen]

Author: zhuochen
Date: 2008-02-14 10:16:39 -0700 (Thu, 14 Feb 2008)
New Revision: 7676

Modified:
   
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/register_io.v
   
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
Log:
fixing lack of space


Modified: 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/register_io.v
===================================================================
--- 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/register_io.v 
    2008-02-14 05:55:28 UTC (rev 7675)
+++ 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/register_io.v 
    2008-02-14 17:16:39 UTC (rev 7676)
@@ -98,7 +98,7 @@
    assign bundle[43] = {24'd0, rxb_refclk};  
 
        reg strobe;
-       wire [31:0] out[7:0];
+       wire [31:0] out[2:1];
        assign debugbus = {clk, enable, addr[2:0], datain[4:0], dataout[4:0]};
        assign threshhold = out[1];
        assign rssi_wait = out[2];
@@ -117,7 +117,7 @@
                     //read
                                if (addr <= 7'd43)
                                        dataout <= bundle[addr];
-                               else if (addr <= 7'd57 && addr >= 7'd50)
+                               else if (addr <= 7'd52 && addr > 7'd50)
                                        dataout <= out[addr-7'd50];
                                else
                                        dataout <= 32'hFFFFFFFF;        
@@ -134,13 +134,13 @@
           end
 
 //register declarations
-    setting_reg #(50) setting_reg0(.clock(clk),.reset(reset),
-    .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[0]));
+    /*setting_reg #(50) setting_reg0(.clock(clk),.reset(reset),
+    .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[0]));*/
     setting_reg #(51) setting_reg1(.clock(clk),.reset(reset),
     .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[1]));
     setting_reg #(52) setting_reg2(.clock(clk),.reset(reset),
     .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[2]));
-    setting_reg #(53) setting_reg3(.clock(clk),.reset(reset),
+    /*setting_reg #(53) setting_reg3(.clock(clk),.reset(reset),
     .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[3]));
     setting_reg #(54) setting_reg4(.clock(clk),.reset(reset),
     .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[4]));
@@ -149,5 +149,6 @@
     setting_reg #(56) setting_reg6(.clock(clk),.reset(reset),
     .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[6]));
     setting_reg #(57) setting_reg7(.clock(clk),.reset(reset),
-    .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[7]));
+    .strobe(strobe_wr),.addr(addr_wr),.in(data_wr),.out(out[7]));*/
+
 endmodule      

Modified: 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
===================================================================
--- 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
        2008-02-14 05:55:28 UTC (rev 7675)
+++ 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
        2008-02-14 17:16:39 UTC (rev 7676)
@@ -37,7 +37,7 @@
     input wire [1:0] tx_underrun
     );
     
-    parameter NUM_CHAN = 1;
+    parameter NUM_CHAN = 2;
     genvar i ;
     
     // FX2 Bug Fix