diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-16 20:41:18 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-16 20:41:18 -0700 |
| commit | 9d30b8fc24dc7efa8973a4d305b240c245133fe6 (patch) | |
| tree | e5488d3d0d8e489cea4bc97f81375e5b9a88e771 /fpga/usrp2/gpmc/gpmc_to_fifo.v | |
| parent | bb2fbec27b2dc7d199119ca952ae2a431cbbbb15 (diff) | |
| parent | b6bb13bcbab932d54f0502f885a9db8ca906eb5f (diff) | |
| download | uhd-9d30b8fc24dc7efa8973a4d305b240c245133fe6.tar.gz uhd-9d30b8fc24dc7efa8973a4d305b240c245133fe6.tar.bz2 uhd-9d30b8fc24dc7efa8973a4d305b240c245133fe6.zip | |
Merge branch 'master' into next
Diffstat (limited to 'fpga/usrp2/gpmc/gpmc_to_fifo.v')
| -rw-r--r-- | fpga/usrp2/gpmc/gpmc_to_fifo.v | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpga/usrp2/gpmc/gpmc_to_fifo.v b/fpga/usrp2/gpmc/gpmc_to_fifo.v index 4aa55953a..cfc5aaa8b 100644 --- a/fpga/usrp2/gpmc/gpmc_to_fifo.v +++ b/fpga/usrp2/gpmc/gpmc_to_fifo.v @@ -70,9 +70,9 @@ module gpmc_to_fifo case(gpmc_state) GPMC_STATE_START: begin - if (EM_A == 0) begin + if (EM_A == 2) begin gpmc_state <= GPMC_STATE_FILL; - last_addr <= {EM_D[ADDR_WIDTH-2:0], 1'b0} - 1'b1; + last_addr <= {EM_D[ADDR_WIDTH-2:0], 1'b0} - 1'b1 + 2; next_gpmc_ptr <= gpmc_ptr + 1; end end @@ -116,14 +116,14 @@ module gpmc_to_fifo if (reset | clear) begin fifo_state <= FIFO_STATE_CLAIM; fifo_ptr <= 0; - counter <= 0; + counter <= 2; end else begin case(fifo_state) FIFO_STATE_CLAIM: begin if (bram_available_to_empty) fifo_state <= FIFO_STATE_EMPTY; - counter <= 0; + counter <= 2; end FIFO_STATE_EMPTY: begin |