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

[zhuochen]

Author: zhuochen
Date: 2007-12-07 13:16:10 -0700 (Fri, 07 Dec 2007)
New Revision: 7086

Modified:
   
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/packet_builder.v
   
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
Log:
Performance problem fixed. After all tests, this is the lastest known working 
version.


Modified: 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/packet_builder.v
===================================================================
--- 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/packet_builder.v
  2007-12-07 05:17:48 UTC (rev 7085)
+++ 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/packet_builder.v
  2007-12-07 20:16:10 UTC (rev 7086)
@@ -46,19 +46,19 @@
     reg tstamp_complete;
     reg [3:0] check_next;
        
-    wire [8:0] chan_used;
     wire [31:0] true_rssi;
     wire [4:0] true_channel;
     wire ready_to_send;
 
-    assign debugbus = {state, chan_empty[0], underrun[0], check_next[0],
-                                               have_space, rd_select[0]};
-    assign chan_used = chan_usedw[8:0];
+    assign debugbus = {chan_empty[0], rd_select[0], have_space, 
+                       (chan_usedw >= 10'd504), (chan_usedw ==0),  
+                       ready_to_send, state[1:0]};
+
     assign true_rssi = (rd_select[1]) ? ((rd_select[0]) ? rssi_3:rssi_2) :
                                                        ((rd_select[0]) ? 
rssi_1:rssi_0);
     assign true_channel = (check_next == 4'd0 ? 5'h1f : {1'd0, check_next - 
4'd1});
-    assign ready_to_send = (chan_used == 9'd504) || 
-                           ((rd_select == NUM_CHAN)&&(chan_used > 0));
+    assign ready_to_send = (chan_usedw >= 10'd504) || (chan_usedw == 0) || 
+                           ((rd_select == NUM_CHAN)&&(chan_usedw > 0));
                
     always @(posedge rxclk)
     begin

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
        2007-12-07 05:17:48 UTC (rev 7085)
+++ 
gnuradio/branches/developers/zhuochen/inband/usrp/fpga/inband_lib/rx_buffer_inband.v
        2007-12-07 20:16:10 UTC (rev 7086)
@@ -147,12 +147,12 @@
                 .clock ( rxclk ),
                 .data ( ch[i] ),
                 .rdreq ( rdreq ),
-                 .wrreq ( ~rx_full[i] & rxstrobe),
+             .wrreq ( ~rx_full[i] & rxstrobe),
                 .empty (empty[i]),
                 .full (rx_full[i]),
                 .q ( dataout[i]),
-                 .usedw ( usedw[i]),
-                 .almost_empty(chan_empty[i])
+             .usedw ( usedw[i]),
+             .almost_empty(chan_empty[i])
        );
        end
      endgenerate
@@ -164,15 +164,17 @@
                 .clock ( rxclk ),
                 .data ( rx_databus ),
                 .rdreq ( (rd_select == NUM_CHAN) & chan_rdreq ),
-                 .wrreq ( rx_WR & rx_WR_enabled),
+             .wrreq ( rx_WR & rx_WR_enabled),
                 .empty ( cmd_empty),
                 .full ( rx_full[NUM_CHAN] ),
                 .q ( dataout[NUM_CHAN]),
-                 .usedw ( usedw[NUM_CHAN] )
+             .usedw ( usedw[NUM_CHAN] )
        );
        
        assign chan_empty[NUM_CHAN] = cmd_empty | rx_WR_enabled;
        assign chan_fifodata = dataout[rd_select];
        assign chan_usedw = usedw[rd_select];
+       assign debugbus = {4'd0, rxclk, debug, chan_usedw==0, rx_full[0], 
chan_empty[0]};
+                            
 
 endmodule