diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-17 12:33:40 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-17 12:33:40 -0700 |
| commit | 1b677b1cc46718ed9473700e2bb88666b70808f3 (patch) | |
| tree | 9aa45721cb5f7b92f56243527cd2fc912ed3f976 /fpga/usrp2/gpmc/fifo_to_gpmc.v | |
| parent | f3e7f66907bf2d77258ae38a6117927a46fe41a6 (diff) | |
| parent | 9ecbfeb8ee52b6a59b8757cb259b325cebd05199 (diff) | |
| download | uhd-1b677b1cc46718ed9473700e2bb88666b70808f3.tar.gz uhd-1b677b1cc46718ed9473700e2bb88666b70808f3.tar.bz2 uhd-1b677b1cc46718ed9473700e2bb88666b70808f3.zip | |
Merge branch 'fpga_next' into next
Diffstat (limited to 'fpga/usrp2/gpmc/fifo_to_gpmc.v')
| -rw-r--r-- | fpga/usrp2/gpmc/fifo_to_gpmc.v | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fpga/usrp2/gpmc/fifo_to_gpmc.v b/fpga/usrp2/gpmc/fifo_to_gpmc.v index 42c71d2d6..27252b970 100644 --- a/fpga/usrp2/gpmc/fifo_to_gpmc.v +++ b/fpga/usrp2/gpmc/fifo_to_gpmc.v @@ -1,5 +1,5 @@ // -// Copyright 2011 Ettus Research LLC +// Copyright 2011-2012 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ //////////////////////////////////////////////////////////////////////// module fifo_to_gpmc - #(parameter PTR_WIDTH = 2, parameter ADDR_WIDTH = 10) + #(parameter PTR_WIDTH = 2, parameter ADDR_WIDTH = 10, parameter LAST_ADDR = 10'h3ff) (input clk, input reset, input clear, input arst, input [17:0] data_i, input src_rdy_i, output dst_rdy_o, output [15:0] EM_D, input [ADDR_WIDTH:1] EM_A, input EM_CLK, input EM_OE, @@ -82,14 +82,15 @@ module fifo_to_gpmc end GPMC_STATE_EMPTY: begin - if (EM_A == 10'h3ff) begin + if (EM_A == LAST_ADDR) begin gpmc_state <= GPMC_STATE_START; gpmc_ptr <= next_gpmc_ptr; + addr <= 0; end end endcase //gpmc_state - end //EM_WE + end //EM_OE end //always //------------------------------------------------------------------ |