diff options
author | Josh Blum <josh@joshknows.com> | 2012-07-16 20:31:57 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-07-16 20:31:57 -0700 |
commit | c587f0204a68be1ca963bed565606d51f22fa94b (patch) | |
tree | d39b33f1f04317755b432b36ae853c4e9e878ed0 /usrp2/gpmc/gpmc_to_fifo.v | |
parent | 295c7e7b98df98989f3fb4505e44f0be52813d81 (diff) | |
parent | 1b31a8780d44e5e466afe4b23fd98c74e534c7a3 (diff) | |
download | uhd-c587f0204a68be1ca963bed565606d51f22fa94b.tar.gz uhd-c587f0204a68be1ca963bed565606d51f22fa94b.tar.bz2 uhd-c587f0204a68be1ca963bed565606d51f22fa94b.zip |
Merge branch 'master' into next
Diffstat (limited to 'usrp2/gpmc/gpmc_to_fifo.v')
-rw-r--r-- | usrp2/gpmc/gpmc_to_fifo.v | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usrp2/gpmc/gpmc_to_fifo.v b/usrp2/gpmc/gpmc_to_fifo.v index 4aa55953a..cfc5aaa8b 100644 --- a/usrp2/gpmc/gpmc_to_fifo.v +++ b/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 |