diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-22 15:46:46 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-22 15:46:46 -0800 |
| commit | 57b779c5103d25a94c90fd6ac465c6f7f8add9b1 (patch) | |
| tree | 816f1f8a95b325f0ff529df4d1006573a3cad905 /fpga/usrp2/fifo/dsp_framer36.v | |
| parent | 5b5606529035d139b5a0a07487fc7ad9dab4da65 (diff) | |
| parent | 71c0e14cb75ff1387c18ff65bca06c04b110f8c5 (diff) | |
| download | uhd-57b779c5103d25a94c90fd6ac465c6f7f8add9b1.tar.gz uhd-57b779c5103d25a94c90fd6ac465c6f7f8add9b1.tar.bz2 uhd-57b779c5103d25a94c90fd6ac465c6f7f8add9b1.zip | |
Merge branch 'packet_router_2nd_dsp' into usrp2_dual_dsp
Diffstat (limited to 'fpga/usrp2/fifo/dsp_framer36.v')
| -rw-r--r-- | fpga/usrp2/fifo/dsp_framer36.v | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fpga/usrp2/fifo/dsp_framer36.v b/fpga/usrp2/fifo/dsp_framer36.v index 34a05d91e..f7d7fb68e 100644 --- a/fpga/usrp2/fifo/dsp_framer36.v +++ b/fpga/usrp2/fifo/dsp_framer36.v @@ -2,7 +2,7 @@ // Frame DSP packets with a header line to be handled by the protocol machine module dsp_framer36 - #(parameter BUF_SIZE = 9) + #(parameter BUF_SIZE = 9, parameter PORT_SEL = 0) ( input clk, input rst, input clr, input [35:0] inp_data, input inp_valid, output inp_ready, @@ -29,8 +29,9 @@ module dsp_framer36 //The header is generated here from the count. wire [31:0] dsp_frm_data_bram; wire [15:0] dsp_frm_bytes = {dsp_frm_count, 2'b00}; + wire [1:0] port_sel_bits = PORT_SEL; assign out_data = - (dsp_frm_state == DSP_FRM_STATE_WRITE_HDR)? {4'b0001, 16'b1, dsp_frm_bytes} : ( + (dsp_frm_state == DSP_FRM_STATE_WRITE_HDR)? {4'b0001, 13'b0, port_sel_bits, 1'b1, dsp_frm_bytes} : ( (dsp_frm_addr == dsp_frm_count) ? {4'b0010, dsp_frm_data_bram} : ( {4'b0000, dsp_frm_data_bram})); assign out_valid = ( |