diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-17 13:22:05 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-17 13:22:05 -0800 |
| commit | 96f2b770d9e46dbf64b7173225c04b789483b707 (patch) | |
| tree | be30b026982070bd815710eab3f417082bb0f714 /usrp2/fifo | |
| parent | 4d785384dae8c6c0bd458ce720ac2906920b1804 (diff) | |
| download | uhd-96f2b770d9e46dbf64b7173225c04b789483b707.tar.gz uhd-96f2b770d9e46dbf64b7173225c04b789483b707.tar.bz2 uhd-96f2b770d9e46dbf64b7173225c04b789483b707.zip | |
added port_sel param to dsp framer
Diffstat (limited to 'usrp2/fifo')
| -rw-r--r-- | usrp2/fifo/dsp_framer36.v | 5 | ||||
| -rw-r--r-- | usrp2/fifo/packet_router.v | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usrp2/fifo/dsp_framer36.v b/usrp2/fifo/dsp_framer36.v index 34a05d91e..f7d7fb68e 100644 --- a/usrp2/fifo/dsp_framer36.v +++ b/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 = ( diff --git a/usrp2/fifo/packet_router.v b/usrp2/fifo/packet_router.v index 282677d16..4667ab220 100644 --- a/usrp2/fifo/packet_router.v +++ b/usrp2/fifo/packet_router.v @@ -449,13 +449,13 @@ module packet_router //////////////////////////////////////////////////////////////////// // DSP input framer //////////////////////////////////////////////////////////////////// - dsp_framer36 #(.BUF_SIZE(BUF_SIZE)) dsp0_framer36( + dsp_framer36 #(.BUF_SIZE(BUF_SIZE), .PORT_SEL(0)) dsp0_framer36( .clk(stream_clk), .rst(stream_rst), .clr(stream_clr), .inp_data(dsp0_inp_data), .inp_valid(dsp0_inp_valid), .inp_ready(dsp0_inp_ready), .out_data(dsp0_frm_data), .out_valid(dsp0_frm_valid), .out_ready(dsp0_frm_ready) ); - dsp_framer36 #(.BUF_SIZE(BUF_SIZE)) dsp1_framer36( + dsp_framer36 #(.BUF_SIZE(BUF_SIZE), .PORT_SEL(2)) dsp1_framer36( .clk(stream_clk), .rst(stream_rst), .clr(stream_clr), .inp_data(dsp1_inp_data), .inp_valid(dsp1_inp_valid), .inp_ready(dsp1_inp_ready), .out_data(dsp1_frm_data), .out_valid(dsp1_frm_valid), .out_ready(dsp1_frm_ready) |