diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-12 17:54:04 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-12 17:54:04 -0800 |
| commit | ab9edbfbcb065b3ec380992b3b5836833ce92b4b (patch) | |
| tree | dc8be06a67a75e8d9b713c62841104e1f619964b /usrp2/fifo/dsp_framer36.v | |
| parent | b6b5b7b65dca848322941c2df73d1b9f5b6ac907 (diff) | |
| parent | 6c1d4ebdbd2229654976dd672a5433c300dc0d17 (diff) | |
| download | uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.tar.gz uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.tar.bz2 uhd-ab9edbfbcb065b3ec380992b3b5836833ce92b4b.zip | |
Merge branch 'packet_router' into zpu
Conflicts:
usrp2/top/u2_rev3/u2_core.v
Diffstat (limited to 'usrp2/fifo/dsp_framer36.v')
| -rw-r--r-- | usrp2/fifo/dsp_framer36.v | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usrp2/fifo/dsp_framer36.v b/usrp2/fifo/dsp_framer36.v index fbdc9fbd7..34a05d91e 100644 --- a/usrp2/fifo/dsp_framer36.v +++ b/usrp2/fifo/dsp_framer36.v @@ -20,10 +20,10 @@ module dsp_framer36 wire [BUF_SIZE-1:0] dsp_frm_addr_next = dsp_frm_addr + 1'b1; //DSP input stream ready in the following states - assign inp_ready = - (dsp_frm_state == DSP_FRM_STATE_WAIT_SOF)? 1'b1 : ( - (dsp_frm_state == DSP_FRM_STATE_WAIT_EOF)? 1'b1 : ( - 1'b0)); + assign inp_ready = ( + dsp_frm_state == DSP_FRM_STATE_WAIT_SOF || + dsp_frm_state == DSP_FRM_STATE_WAIT_EOF + )? 1'b1 : 1'b0; //DSP framer output data mux (header or BRAM): //The header is generated here from the count. @@ -41,7 +41,7 @@ module dsp_framer36 RAMB16_S36_S36 dsp_frm_buff( //port A = DSP input interface (writes to BRAM) .DOA(),.ADDRA(dsp_frm_addr),.CLKA(clk),.DIA(inp_data[31:0]),.DIPA(4'h0), - .ENA(inp_ready),.SSRA(0),.WEA(inp_ready), + .ENA(inp_ready & inp_valid),.SSRA(0),.WEA(inp_ready & inp_valid), //port B = DSP framer interface (reads from BRAM) .DOB(dsp_frm_data_bram),.ADDRB(dsp_frm_addr),.CLKB(clk),.DIB(36'b0),.DIPB(4'h0), .ENB(out_ready & out_valid),.SSRB(0),.WEB(1'b0) |