[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5673 - in gnuradio/branches/developers/thottelt/inban
From: |
thottelt |
Subject: |
[Commit-gnuradio] r5673 - in gnuradio/branches/developers/thottelt/inband/usrp/fpga: inband_lib toplevel/usrp_inband_usb |
Date: |
Mon, 4 Jun 2007 19:55:20 -0600 (MDT) |
Author: thottelt
Date: 2007-06-04 19:55:20 -0600 (Mon, 04 Jun 2007)
New Revision: 5673
Modified:
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/data_packet_fifo.v
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/tx_buffer_inband.v
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/usb_fifo_reader.v
gnuradio/branches/developers/thottelt/inband/usrp/fpga/toplevel/usrp_inband_usb/usrp_inband_usb.v
Log:
debug testing
Modified:
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/data_packet_fifo.v
===================================================================
---
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/data_packet_fifo.v
2007-06-04 22:07:27 UTC (rev 5672)
+++
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/data_packet_fifo.v
2007-06-05 01:55:20 UTC (rev 5673)
@@ -6,6 +6,9 @@
output reg have_space,
output reg [31:0]ram_data_out,
output reg pkt_waiting,
+ output reg isfull,
+ output reg [1:0]usb_ram_packet_out,
+ output reg [1:0]usb_ram_packet_in,
input read_enable,
input pkt_complete,
input skip_packet) ;
@@ -20,13 +23,13 @@
/* Create the address signals */
reg [6:0] usb_ram_offset_out ;
- reg [1:0] usb_ram_packet_out ;
+ //reg [1:0] usb_ram_packet_out ;
reg [6:0] usb_ram_offset_in ;
- reg [1:0] usb_ram_packet_in ;
+ //reg [1:0] usb_ram_packet_in ;
wire [6-2+NUM_PACKETS:0] usb_ram_aout ;
wire [6-2+NUM_PACKETS:0] usb_ram_ain ;
- reg isfull;
+ //reg isfull;
assign usb_ram_aout = {usb_ram_packet_out, usb_ram_offset_out} ;
assign usb_ram_ain = {usb_ram_packet_in, usb_ram_offset_in} ;
@@ -37,7 +40,7 @@
if (usb_ram_ain == usb_ram_aout)
pkt_waiting <= isfull ;
else if (usb_ram_ain > usb_ram_aout)
- pkt_waiting <= usb_ram_ain - usb_ram_aout >= PKT_DEPTH;
+ pkt_waiting <= (usb_ram_ain - usb_ram_aout) >= PKT_DEPTH;
else
pkt_waiting <= (usb_ram_ain + 10'b1000000000 - usb_ram_aout) >=
PKT_DEPTH;
end
Modified:
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/tx_buffer_inband.v
===================================================================
---
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/tx_buffer_inband.v
2007-06-04 22:07:27 UTC (rev 5672)
+++
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/tx_buffer_inband.v
2007-06-05 01:55:20 UTC (rev 5673)
@@ -99,10 +99,12 @@
tdpf_have_space[1], bus_reset, reset, txempty_chan[0],
txempty_chan[1]} ;*/
- assign debugbus = {3'b0, txclk, have_space, tupf_pkt_waiting,
tdpf_pkt_waiting[0],
- tdpf_pkt_waiting[1], tx_empty, WR, tdpf_have_space[0],
- tdpf_have_space[1], bus_reset, reset, txempty_chan[0],
- txempty_chan[1]} ;
+ wire [1:0]isfull;
+ wire [1:0]a_in[1:0];
+ wire [1:0]a_out[1:0];
+
+ assign debugbus = {2'b0, a_in[0], a_out[0], isfull[0], 1'b0,
have_space, tupf_pkt_waiting, tdpf_pkt_waiting[0],
+ WR, 1'b0,tdpf_have_space[0], reset, done_chan[0]} ;
usb_fifo_writer tx_usb_packet_writer
( .reset (bus_reset),
@@ -152,6 +154,9 @@
.read_enable (tdpf_rdreq[i]),
.pkt_complete (done_chan[i]),
.skip_packet (tdpf_skip[i]),
+ .isfull(isfull[i]),
+ .usb_ram_packet_out(a_out[i]),
+ .usb_ram_packet_in(a_in[i]),
.have_space (tdpf_have_space[i])
);
Modified:
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/usb_fifo_reader.v
===================================================================
---
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/usb_fifo_reader.v
2007-06-04 22:07:27 UTC (rev 5672)
+++
gnuradio/branches/developers/thottelt/inband/usrp/fpga/inband_lib/usb_fifo_reader.v
2007-06-05 01:55:20 UTC (rev 5673)
@@ -43,8 +43,8 @@
begin
reader_state <= `IDLE ;
rdreq <= 0 ;
- WR_chan <= {NUM_CHAN+1{1'b0}} ;
- done_chan <= {NUM_CHAN+1{1'b0}} ;
+ WR_chan <= {(NUM_CHAN+1){1'b0}} ;
+ done_chan <= {(NUM_CHAN+1){1'b0}} ;
end
else
begin
@@ -53,7 +53,7 @@
`IDLE:
begin
reader_state <= pkt_waiting ? `WAIT : `IDLE
;
- done_chan <= {NUM_CHAN+1{1'b0}} ;
+ done_chan <= {(NUM_CHAN+1){1'b0}} ;
rdreq <= pkt_waiting ;
end
@@ -88,7 +88,7 @@
reader_state <= rdreq ? `SKIP_REST : `IDLE ;
/* Data pushing done */
- WR_chan <= {NUM_CHAN+1{1'b0}} ;
+ WR_chan <= {(NUM_CHAN+1){1'b0}} ;
/* Notify next block */
done_chan[channel] <= 1 ;
@@ -107,7 +107,7 @@
`SKIP_REST:
begin
read_length <= read_length + 10'd4;
- done_chan <= {NUM_CHAN+1{1'b0}} ;
+ done_chan <= {(NUM_CHAN+1){1'b0}} ;
if (read_length == PKT_SIZE - 4)
reader_state <= `IDLE ;
Modified:
gnuradio/branches/developers/thottelt/inband/usrp/fpga/toplevel/usrp_inband_usb/usrp_inband_usb.v
===================================================================
---
gnuradio/branches/developers/thottelt/inband/usrp/fpga/toplevel/usrp_inband_usb/usrp_inband_usb.v
2007-06-04 22:07:27 UTC (rev 5672)
+++
gnuradio/branches/developers/thottelt/inband/usrp/fpga/toplevel/usrp_inband_usb/usrp_inband_usb.v
2007-06-05 01:55:20 UTC (rev 5673)
@@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Boston, MA 02110-1301 USA
//
-//`define IN_BAND
+`define IN_BAND
`include "config.vh"
`include "../../../firmware/include/fpga_regs_common.v"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5673 - in gnuradio/branches/developers/thottelt/inband/usrp/fpga: inband_lib toplevel/usrp_inband_usb,
thottelt <=