aboutsummaryrefslogtreecommitdiffstats
path: root/usrp2/gpmc/fifo_to_gpmc.v
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2013-03-14 17:49:57 -0700
committerJosh Blum <josh@joshknows.com>2013-03-14 17:49:57 -0700
commita370cb47bbec9a237dfd50b5247d621cd8ab5f4e (patch)
tree3bd27bfb1f263a221f055218cddda90c15553e02 /usrp2/gpmc/fifo_to_gpmc.v
parent8d91709d43f8df717abc8e05967e63c60887cd87 (diff)
downloaduhd-a370cb47bbec9a237dfd50b5247d621cd8ab5f4e.tar.gz
uhd-a370cb47bbec9a237dfd50b5247d621cd8ab5f4e.tar.bz2
uhd-a370cb47bbec9a237dfd50b5247d621cd8ab5f4e.zip
e100: switch to fixed length xfers
Diffstat (limited to 'usrp2/gpmc/fifo_to_gpmc.v')
-rw-r--r--usrp2/gpmc/fifo_to_gpmc.v10
1 files changed, 3 insertions, 7 deletions
diff --git a/usrp2/gpmc/fifo_to_gpmc.v b/usrp2/gpmc/fifo_to_gpmc.v
index 26443a702..93341975d 100644
--- a/usrp2/gpmc/fifo_to_gpmc.v
+++ b/usrp2/gpmc/fifo_to_gpmc.v
@@ -46,7 +46,6 @@ module fifo_to_gpmc
output reg data_available);
//states for the GPMC side of things
- wire [17:0] data_o;
reg gpmc_state;
reg [ADDR_WIDTH:1] addr;
reg [PTR_WIDTH:0] gpmc_ptr, next_gpmc_ptr;
@@ -147,14 +146,11 @@ module fifo_to_gpmc
assign dst_rdy_o = fifo_state == FIFO_STATE_FILL;
- //assign data from bram output
- assign EM_D = data_o[15:0];
-
//instantiate dual ported bram for async read + write
- ram_2port #(.DWIDTH(18),.AWIDTH(PTR_WIDTH + ADDR_WIDTH)) async_fifo_bram
+ ram_2port #(.DWIDTH(16),.AWIDTH(PTR_WIDTH + ADDR_WIDTH)) async_fifo_bram
(.clka(clk),.ena(1'b1),.wea(src_rdy_i && dst_rdy_o),
- .addra({fifo_ptr[PTR_WIDTH-1:0], counter}),.dia(data_i),.doa(),
+ .addra({fifo_ptr[PTR_WIDTH-1:0], counter}),.dia(data_i[15:0]),.doa(),
.clkb(EM_CLK),.enb(1'b1),.web(1'b0),
- .addrb({gpmc_ptr[PTR_WIDTH-1:0], addr}),.dib(18'h3ffff),.dob(data_o));
+ .addrb({gpmc_ptr[PTR_WIDTH-1:0], addr}),.dib(18'h3ffff),.dob(EM_D));
endmodule // fifo_to_gpmc