diff options
| author | Josh Blum <josh@joshknows.com> | 2012-07-19 21:06:07 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-07-19 21:06:07 -0700 |
| commit | 73c2c25c11069e32918eb592209539bb563e55c2 (patch) | |
| tree | 14d8134a93987c5353108494e68d2cde8ec29412 /fpga/usrp2/gpmc | |
| parent | b4f3b83acbe8d3b69767d7c23b4bc798095c8214 (diff) | |
| parent | a8a02f97a89597aac8310dd1adff6909e62cb7b4 (diff) | |
| download | uhd-73c2c25c11069e32918eb592209539bb563e55c2.tar.gz uhd-73c2c25c11069e32918eb592209539bb563e55c2.tar.bz2 uhd-73c2c25c11069e32918eb592209539bb563e55c2.zip | |
Merge branch 'fpga_next' into next
Diffstat (limited to 'fpga/usrp2/gpmc')
| -rw-r--r-- | fpga/usrp2/gpmc/fifo_to_gpmc.v | 2 | ||||
| -rw-r--r-- | fpga/usrp2/gpmc/gpmc_to_fifo.v | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fpga/usrp2/gpmc/fifo_to_gpmc.v b/fpga/usrp2/gpmc/fifo_to_gpmc.v index 27252b970..26443a702 100644 --- a/fpga/usrp2/gpmc/fifo_to_gpmc.v +++ b/fpga/usrp2/gpmc/fifo_to_gpmc.v @@ -82,7 +82,7 @@ module fifo_to_gpmc end GPMC_STATE_EMPTY: begin - if (EM_A == LAST_ADDR) begin + if (addr == LAST_ADDR) begin gpmc_state <= GPMC_STATE_START; gpmc_ptr <= next_gpmc_ptr; addr <= 0; diff --git a/fpga/usrp2/gpmc/gpmc_to_fifo.v b/fpga/usrp2/gpmc/gpmc_to_fifo.v index 680095620..3932b81ac 100644 --- a/fpga/usrp2/gpmc/gpmc_to_fifo.v +++ b/fpga/usrp2/gpmc/gpmc_to_fifo.v @@ -75,7 +75,7 @@ module gpmc_to_fifo case(gpmc_state) GPMC_STATE_START: begin - if (EM_A == XFER_OFFSET) begin + if (data_i[16]) begin gpmc_state <= GPMC_STATE_FILL; vita_len <= EM_D; next_gpmc_ptr <= gpmc_ptr + 1; |