diff options
| author | matt <matt@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-12-04 06:12:51 +0000 |
|---|---|---|
| committer | matt <matt@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-12-04 06:12:51 +0000 |
| commit | 4ffdba1a3f74aaf98b89047f1834055652586359 (patch) | |
| tree | 9e62694db005bed1582af7f7e398b2646ce97d2b /usrp2/fpga/control_lib/shortfifo.v | |
| parent | b2a284bf2640b26639a81266d8e5e926e91e303d (diff) | |
speed up the diagnostic signals, they were causing timing problems
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10101 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/fpga/control_lib/shortfifo.v')
| -rw-r--r-- | usrp2/fpga/control_lib/shortfifo.v | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/usrp2/fpga/control_lib/shortfifo.v b/usrp2/fpga/control_lib/shortfifo.v index 83d2c1980a..d8ce1428ef 100644 --- a/usrp2/fpga/control_lib/shortfifo.v +++ b/usrp2/fpga/control_lib/shortfifo.v @@ -9,8 +9,8 @@ module shortfifo input clear, output reg full, output reg empty, - output [4:0] space, - output [4:0] occupied); + output reg [4:0] space, + output reg [4:0] occupied); reg [3:0] a; genvar i; @@ -57,7 +57,31 @@ module shortfifo // NOTE will fail if you write into a full fifo or read from an empty one - assign space = full ? 0 : empty ? 16 : 15-a; - assign occupied = empty ? 0 : full ? 16 : a+1; + ////////////////////////////////////////////////////////////// + // space and occupied are used for diagnostics, not + // guaranteed correct + //assign space = full ? 0 : empty ? 16 : 15-a; + //assign occupied = empty ? 0 : full ? 16 : a+1; + + always @(posedge clk) + if(rst) + space <= 16; + else if(clear) + space <= 16; + else if(read & ~write) + space <= space + 1; + else if(write & ~read) + space <= space - 1; + + always @(posedge clk) + if(rst) + occupied <= 0; + else if(clear) + occupied <= 0; + else if(read & ~write) + occupied <= occupied - 1; + else if(write & ~read) + occupied <= occupied + 1; + endmodule // shortfifo |