diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-08 12:17:54 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-08 12:17:54 -0700 |
| commit | 17fabccfe4be79f3a5a0a3d7ab14ea72a791ecd9 (patch) | |
| tree | e2d0d39d6b44b72c759b8be1380b2024de50bdf6 /fpga/usrp2/gpmc/fifo_watcher.v | |
| parent | 60933a242cce0b1ec45e9f948e3da9ab72b2fd90 (diff) | |
| parent | 4ea6f7431e09d9f27ecaa1c1b187d2c2f613e8f4 (diff) | |
| download | uhd-17fabccfe4be79f3a5a0a3d7ab14ea72a791ecd9.tar.gz uhd-17fabccfe4be79f3a5a0a3d7ab14ea72a791ecd9.tar.bz2 uhd-17fabccfe4be79f3a5a0a3d7ab14ea72a791ecd9.zip | |
Merge branch 'fpga_next' into next
Diffstat (limited to 'fpga/usrp2/gpmc/fifo_watcher.v')
| -rw-r--r-- | fpga/usrp2/gpmc/fifo_watcher.v | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fpga/usrp2/gpmc/fifo_watcher.v b/fpga/usrp2/gpmc/fifo_watcher.v index b139f5143..3971e3c54 100644 --- a/fpga/usrp2/gpmc/fifo_watcher.v +++ b/fpga/usrp2/gpmc/fifo_watcher.v @@ -30,10 +30,11 @@ module fifo_watcher reg [15:0] counter; wire [4:0] pkt_count; assign debug = pkt_count; + wire space; fifo_short #(.WIDTH(16)) frame_lengths (.clk(clk), .reset(reset), .clear(clear), - .datain(counter), .src_rdy_i(write), .dst_rdy_o(), + .datain(counter), .src_rdy_i(write), .dst_rdy_o(space), .dataout(length), .src_rdy_o(have_packet_int), .dst_rdy_i(read), .occupied(pkt_count), .space()); @@ -53,7 +54,9 @@ module fifo_watcher bus_error <= 1; else if(read & ~have_packet_int) bus_error <= 1; - + else if(write & ~space) + bus_error <= 1; + reg in_packet; always @(posedge clk) if(reset | clear) |