From 1a85baadf20a7e1a7e2789fd1a8947d27eeea08e Mon Sep 17 00:00:00 2001 From: Matt Ettus Date: Fri, 16 Jul 2010 17:22:57 -0700 Subject: tx error packets now muxed into the ethernet stream back to the host --- usrp2/vrt/gen_context_pkt.v | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'usrp2/vrt/gen_context_pkt.v') diff --git a/usrp2/vrt/gen_context_pkt.v b/usrp2/vrt/gen_context_pkt.v index 9e3fcbca8..2fad43cc6 100644 --- a/usrp2/vrt/gen_context_pkt.v +++ b/usrp2/vrt/gen_context_pkt.v @@ -1,7 +1,7 @@ module gen_context_pkt - #(parameter PROT_ENG_FLAGS =1) + #(parameter PROT_ENG_FLAGS=1) (input clk, input reset, input clear, input trigger, output sent, input [31:0] streamid, @@ -23,6 +23,7 @@ module gen_context_pkt wire src_rdy_int, dst_rdy_int; wire [3:0] seqno = 0; reg [3:0] ctxt_state; + reg [63:0] err_time; always @(posedge clk) if(reset | clear) @@ -31,7 +32,10 @@ module gen_context_pkt case(ctxt_state) CTXT_IDLE : if(trigger) - ctxt_state <= CTXT_HEADER; + begin + ctxt_state <= CTXT_HEADER; + err_time <= vita_time; + end CTXT_DONE : if(~trigger) @@ -48,9 +52,9 @@ module gen_context_pkt case(ctxt_state) CTXT_HEADER : data_int <= { 2'b01, 12'b010100001101, seqno, 16'd6 }; CTXT_STREAMID : data_int <= { 2'b00, streamid }; - CTXT_SECS : data_int <= { 2'b00, vita_time[63:32] }; + CTXT_SECS : data_int <= { 2'b00, err_time[63:32] }; CTXT_TICS : data_int <= { 2'b00, 32'd0 }; - CTXT_TICS2 : data_int <= { 2'b00, vita_time[31:0] }; + CTXT_TICS2 : data_int <= { 2'b00, err_time[31:0] }; CTXT_MESSAGE : data_int <= { 2'b10, message }; default : {2'b00, 32'b00}; endcase // case (ctxt_state) -- cgit v1.2.3