From 8e0be0bc8257940dd517b403790dbd0d4d898e52 Mon Sep 17 00:00:00 2001 From: David Steele Date: Wed, 25 Jan 2023 17:25:53 +0000 Subject: [PATCH] CORE-876. Whitespace tidy up and change rd_en to wait until fifo read --- .../0/src/pei_debug_serial_port_0.v | 1029 +++++++++-------- 1 file changed, 536 insertions(+), 493 deletions(-) diff --git a/generic_ip/pei_shared/0/src/pei_debug_serial_port_0.v b/generic_ip/pei_shared/0/src/pei_debug_serial_port_0.v index 189aa15..e279cbe 100644 --- a/generic_ip/pei_shared/0/src/pei_debug_serial_port_0.v +++ b/generic_ip/pei_shared/0/src/pei_debug_serial_port_0.v @@ -271,545 +271,588 @@ assign src_id_out = 6'd0; // This is used to identify returns from always @(posedge clk) begin case (state) - RESET : begin - if (rx_dv_in) state <= IDLE; // Change implemented by DR to FSM away from idle for simulation - else begin - tx_dv <= tx_rdy_in; - tx_data <= welcome_char; - rx_fifo_rd_ack <= 1'b0; - - if (tx_rdy_in) - begin - if (idx == WELCOME_LAST_CHAR) idx <= 8'd0; - else idx <= idx + 8'd1; - - if (idx == WELCOME_LAST_CHAR) state <= PROMPT; - end - end - end - - ERROR : begin - tx_dv <= tx_rdy_in; - tx_data <= err_char; - rx_fifo_rd_ack <= 1'b0; - - if (tx_rdy_in) - begin - if (idx == ERR_LAST_CHAR) idx <= 8'd0; - else idx <= idx + 8'd1; - - if (idx == ERR_LAST_CHAR) state <= PROMPT; - end - end - - PROMPT : begin - tx_dv <= tx_rdy_in; - tx_data <= Append; - rx_fifo_rd_ack <= 1'b0; - - if (tx_rdy_in) - begin - if (idx == PROMPT_LAST_CHAR) idx <= 8'd0; - else idx <= idx + 8'd1; - - if (idx == PROMPT_LAST_CHAR) state <= IDLE; - end - end - - - - IDLE : begin - tx_dv <= 1'b0; - wr_en <= 1'b0; - // Set idx to send shortened string for Read and Writes - if ( (rx_data_byte == ASCII_R) | (rx_data_byte == ASCII_r) - | (rx_data_byte == ASCII_W) | (rx_data_byte == ASCII_w)) idx <= 8'd0; // updated by DR it was set to idx <= 2 - else idx <= 8'd0; - - // Select next state and mode - - state <= IDLE; //modified by DR - // mode_rnw <= ~((rx_data_byte == ASCII_W) | (rx_data_byte == ASCII_w)); - - // Require data before changing state - rx_fifo_rd_ack <= ~rx_fifo_empty; - if (~rx_fifo_empty) - begin - address <= 32'd0; // reset address and data - data <=32'd0; - if (( (rx_data_byte == ASCII_W) | (rx_data_byte == ASCII_w)) |( (rx_data_byte == ASCII_R) | (rx_data_byte == ASCII_r) )) //state <= PRE_DATA; modified by DR - begin - mode_rnw <= ((rx_data_byte == ASCII_R) | (rx_data_byte == ASCII_r)); - state <= GET_ADD; - end - else state <= ERROR; - - end - - end - - PRE_DATA : begin + RESET : + begin + if (rx_dv_in) state <= IDLE; // Change implemented by DR to move FSM away from idle for simulation + else + begin tx_dv <= tx_rdy_in; - tx_data <= pre_data_char; + tx_data <= welcome_char; rx_fifo_rd_ack <= 1'b0; - state <= next_state; // moified by DR - - /* if (tx_rdy_in) + if (tx_rdy_in) begin - if (idx == PRE_DATA_LAST_CHAR) idx <= 8'd0; + if (idx == WELCOME_LAST_CHAR) idx <= 8'd0; else idx <= idx + 8'd1; - if (idx == PRE_DATA_LAST_CHAR) state <= next_state; - end */ - end - - GET_ADD_7 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) address[31:28] <= hex_A_F[3:0]; - else if (char_a_f) address[31:28] <= hex_a_f[3:0]; - else address[31:28] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_ADD_6; - else state <= ERROR; - end + if (idx == WELCOME_LAST_CHAR) state <= PROMPT; end + end + end + + ERROR : + begin + tx_dv <= tx_rdy_in; + tx_data <= err_char; + rx_fifo_rd_ack <= 1'b0; + + if (tx_rdy_in) + begin + if (idx == ERR_LAST_CHAR) idx <= 8'd0; + else idx <= idx + 8'd1; + + if (idx == ERR_LAST_CHAR) state <= PROMPT; + end + end + + PROMPT : + begin + tx_dv <= tx_rdy_in; + tx_data <= Append; + rx_fifo_rd_ack <= 1'b0; + + if (tx_rdy_in) + begin + if (idx == PROMPT_LAST_CHAR) idx <= 8'd0; + else idx <= idx + 8'd1; + + if (idx == PROMPT_LAST_CHAR) state <= IDLE; + end + end + + + + IDLE : + begin + tx_dv <= 1'b0; + wr_en <= 1'b0; + + // Set idx to send shortened string for Read and Writes + if ( (rx_data_byte == ASCII_R) | (rx_data_byte == ASCII_r) + | (rx_data_byte == ASCII_W) | (rx_data_byte == ASCII_w)) idx <= 8'd0; // updated by DR it was set to idx <= 2 + else idx <= 8'd0; + + // Select next state and mode + + state <= IDLE; //modified by DR + // mode_rnw <= ~((rx_data_byte == ASCII_W) | (rx_data_byte == ASCII_w)); + + // Requires data before changing state + rx_fifo_rd_ack <= ~rx_fifo_empty; + if (~rx_fifo_empty) + begin + address <= 32'd0; // reset address and data + data <=32'd0; + if (((rx_data_byte == ASCII_W) | (rx_data_byte == ASCII_w)) |( (rx_data_byte == ASCII_R) | (rx_data_byte == ASCII_r) )) //state <= PRE_DATA; modified by DR + begin + mode_rnw <= ((rx_data_byte == ASCII_R) | (rx_data_byte == ASCII_r)); + state <= GET_ADD; + end + else state <= ERROR; + + end + + end + + PRE_DATA : + begin + tx_dv <= tx_rdy_in; + tx_data <= pre_data_char; + rx_fifo_rd_ack <= 1'b0; + + state <= next_state; // moified by DR + + /* if (tx_rdy_in) + begin + if (idx == PRE_DATA_LAST_CHAR) idx <= 8'd0; + else idx <= idx + 8'd1; + + if (idx == PRE_DATA_LAST_CHAR) state <= next_state; + end */ + end + + GET_ADD_7 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) address[31:28] <= hex_A_F[3:0]; + else if (char_a_f) address[31:28] <= hex_a_f[3:0]; + else address[31:28] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_ADD_6; + else state <= ERROR; + end + end + + GET_ADD_6 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) address[27:24] <= hex_A_F[3:0]; + else if (char_a_f) address[27:24] <= hex_a_f[3:0]; + else address[27:24] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_ADD_5; + else state <= ERROR; + end + end + + GET_ADD_5 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) address[23:20] <= hex_A_F[3:0]; + else if (char_a_f) address[23:20] <= hex_a_f[3:0]; + else address[23:20] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_ADD_4; + else state <= ERROR; + end + end + + GET_ADD_4 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) address[19:16] <= hex_A_F[3:0]; + else if (char_a_f) address[19:16] <= hex_a_f[3:0]; + else address[19:16] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_ADD_3; + else state <= ERROR; + end + end + + GET_ADD_3 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) address[15:12] <= hex_A_F[3:0]; + else if (char_a_f) address[15:12] <= hex_a_f[3:0]; + else address[15:12] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_ADD_2; + else state <= ERROR; + end + end + + GET_ADD_2 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) address[11:8] <= hex_A_F[3:0]; + else if (char_a_f) address[11:8] <= hex_a_f[3:0]; + else address[11:8] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_ADD_1; + else state <= ERROR; + end + end + + GET_ADD_1 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) address[7:4] <= hex_A_F[3:0]; + else if (char_a_f) address[7:4] <= hex_a_f[3:0]; + else address[7:4] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_ADD_0; + else state <= ERROR; + end + end + + GET_ADD_0 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) address[3:0] <= hex_A_F[3:0]; + else if (char_a_f) address[3:0] <= hex_a_f[3:0]; + else address[3:0] <= hex_0_9[3:0]; + + + + + + if (mode_rnw) state <= READ; + else if (char_hex) state <= GET_DATA; //state <= PRE_DATA; modified by DR + else state <= ERROR; + + if (char_hex & ~mode_rnw) idx <= 8'd0; // Don't print extra tabs unless in read mode + else idx <= 8'd0; + end + end + + GET_DATA_7 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) data[31:28] <= hex_A_F[3:0]; + else if (char_a_f) data[31:28] <= hex_a_f[3:0]; + else data[31:28] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_DATA_6; + else state <= ERROR; + end + end + + GET_DATA_6 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) data[27:24] <= hex_A_F[3:0]; + else if (char_a_f) data[27:24] <= hex_a_f[3:0]; + else data[27:24] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_DATA_5; + else state <= ERROR; + end + end + + GET_DATA_5 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) data[23:20] <= hex_A_F[3:0]; + else if (char_a_f) data[23:20] <= hex_a_f[3:0]; + else data[23:20] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_DATA_4; + else state <= ERROR; + end + end + + GET_DATA_4 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) data[19:16] <= hex_A_F[3:0]; + else if (char_a_f) data[19:16] <= hex_a_f[3:0]; + else data[19:16] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_DATA_3; + else state <= ERROR; + end + end + + GET_DATA_3 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) data[15:12] <= hex_A_F[3:0]; + else if (char_a_f) data[15:12] <= hex_a_f[3:0]; + else data[15:12] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_DATA_2; + else state <= ERROR; + end + end + + GET_DATA_2 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) data[11:8] <= hex_A_F[3:0]; + else if (char_a_f) data[11:8] <= hex_a_f[3:0]; + else data[11:8] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_DATA_1; + else state <= ERROR; + end + end + + GET_DATA_1 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) data[7:4] <= hex_A_F[3:0]; + else if (char_a_f) data[7:4] <= hex_a_f[3:0]; + else data[7:4] <= hex_0_9[3:0]; + + if (char_hex) state <= GET_DATA_0; + else state <= ERROR; + end + end + + GET_DATA_0 : + begin + tx_dv <= 1'b0; + rx_fifo_rd_ack <= ~rx_fifo_empty; + + if (~rx_fifo_empty) + begin + if (char_A_F) data[3:0] <= hex_A_F[3:0]; + else if (char_a_f) data[3:0] <= hex_a_f[3:0]; + else data[3:0] <= hex_0_9[3:0]; + + if (char_hex) + begin + state <= WRITE; //state <= PRE_DATA; Modified by DR + //data_new <= data; + end + else state <= ERROR; + + next_state <= WRITE; + + if (char_hex) idx <= 8'd0; // Don't print extra tabs from here + else idx <= 8'd0; + end + end + + WRITE : + begin + rx_fifo_rd_ack <= 1'b0; + tx_dv <= 1'b0; + wr_en <= 1'b1; + state <= WRITE_1; + data_new <= data; + end + + WRITE_1 : + begin + wr_en <= 1'b1; + //state <= READ; // Go to read to readback the write value + state <= IDLE; // data ready + end + + READ : + begin + rx_fifo_rd_ack <= 1'b0; + tx_dv <= 1'b0; + rd_en <= 1'b1; + state <= READ_1; + end + + READ_1 : + begin + if (rd_dv_in) + begin + rd_en <= 1'b0; + data <= rd_data_in; + if (rd_32b_in) + state <= SEND_DATA_7; + else + state <= SEND_DATA_3; + end + end + + SEND_ADD_7 : + begin + tx_dv <= tx_rdy_in; + + if (address[31:28] > 4'd9) tx_data <= {4'd0,address[31:28]} + 8'h37; + else tx_data <= {4'd0,address[31:28]} + ASCII_0; + + if (tx_rdy_in) state <= SEND_ADD_6; + end + + SEND_ADD_6 : + begin + tx_dv <= tx_rdy_in; + + if (address[27:24] > 4'd9) tx_data <= {4'd0,address[27:24]} + 8'h37; + else tx_data <= {4'd0,address[27:24]} + ASCII_0; + + if (tx_rdy_in) state <= SEND_ADD_5; + end + + SEND_ADD_5 : + begin + tx_dv <= tx_rdy_in; + + if (address[23:20] > 4'd9) tx_data <= {4'd0,address[23:20]} + 8'h37; + else tx_data <= {4'd0,address[23:20]} + ASCII_0; - GET_ADD_6 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) address[27:24] <= hex_A_F[3:0]; - else if (char_a_f) address[27:24] <= hex_a_f[3:0]; - else address[27:24] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_ADD_5; - else state <= ERROR; - end - end - - GET_ADD_5 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) address[23:20] <= hex_A_F[3:0]; - else if (char_a_f) address[23:20] <= hex_a_f[3:0]; - else address[23:20] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_ADD_4; - else state <= ERROR; - end - end - - GET_ADD_4 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) address[19:16] <= hex_A_F[3:0]; - else if (char_a_f) address[19:16] <= hex_a_f[3:0]; - else address[19:16] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_ADD_3; - else state <= ERROR; - end - end - - GET_ADD_3 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) address[15:12] <= hex_A_F[3:0]; - else if (char_a_f) address[15:12] <= hex_a_f[3:0]; - else address[15:12] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_ADD_2; - else state <= ERROR; - end - end - - GET_ADD_2 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) address[11:8] <= hex_A_F[3:0]; - else if (char_a_f) address[11:8] <= hex_a_f[3:0]; - else address[11:8] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_ADD_1; - else state <= ERROR; - end - end - - GET_ADD_1 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) address[7:4] <= hex_A_F[3:0]; - else if (char_a_f) address[7:4] <= hex_a_f[3:0]; - else address[7:4] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_ADD_0; - else state <= ERROR; - end - end - - GET_ADD_0 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) address[3:0] <= hex_A_F[3:0]; - else if (char_a_f) address[3:0] <= hex_a_f[3:0]; - else address[3:0] <= hex_0_9[3:0]; - - - - - - if (mode_rnw) state <= READ; - else if (char_hex) state <= GET_DATA; //state <= PRE_DATA; modified by DR - else state <= ERROR; - - if (char_hex & ~mode_rnw) idx <= 8'd0; // Don't print extra tabs unless in read mode - else idx <= 8'd0; - end - end - - GET_DATA_7 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) data[31:28] <= hex_A_F[3:0]; - else if (char_a_f) data[31:28] <= hex_a_f[3:0]; - else data[31:28] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_DATA_6; - else state <= ERROR; - end - end - - GET_DATA_6 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) data[27:24] <= hex_A_F[3:0]; - else if (char_a_f) data[27:24] <= hex_a_f[3:0]; - else data[27:24] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_DATA_5; - else state <= ERROR; - end - end - - GET_DATA_5 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) data[23:20] <= hex_A_F[3:0]; - else if (char_a_f) data[23:20] <= hex_a_f[3:0]; - else data[23:20] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_DATA_4; - else state <= ERROR; - end - end - - GET_DATA_4 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) data[19:16] <= hex_A_F[3:0]; - else if (char_a_f) data[19:16] <= hex_a_f[3:0]; - else data[19:16] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_DATA_3; - else state <= ERROR; - end - end - - GET_DATA_3 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) data[15:12] <= hex_A_F[3:0]; - else if (char_a_f) data[15:12] <= hex_a_f[3:0]; - else data[15:12] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_DATA_2; - else state <= ERROR; - end - end - - GET_DATA_2 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) data[11:8] <= hex_A_F[3:0]; - else if (char_a_f) data[11:8] <= hex_a_f[3:0]; - else data[11:8] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_DATA_1; - else state <= ERROR; - end - end - - GET_DATA_1 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) data[7:4] <= hex_A_F[3:0]; - else if (char_a_f) data[7:4] <= hex_a_f[3:0]; - else data[7:4] <= hex_0_9[3:0]; - - if (char_hex) state <= GET_DATA_0; - else state <= ERROR; - end - end - - GET_DATA_0 : begin - tx_dv <= 1'b0; - rx_fifo_rd_ack <= ~rx_fifo_empty; - - if (~rx_fifo_empty) - begin - if (char_A_F) data[3:0] <= hex_A_F[3:0]; - else if (char_a_f) data[3:0] <= hex_a_f[3:0]; - else data[3:0] <= hex_0_9[3:0]; - - if (char_hex) - - begin - state <= WRITE; //state <= PRE_DATA; Modified by DR - //data_new <= data; - end - else state <= ERROR; - - next_state <= WRITE; - - if (char_hex) idx <= 8'd0; // Don't print extra tabs from here - else idx <= 8'd0; - end - end - - WRITE : begin - rx_fifo_rd_ack <= 1'b0; - tx_dv <= 1'b0; - wr_en <= 1'b1; - state <= WRITE_1; - data_new <= data; - end - - WRITE_1 : begin - wr_en <= 1'b1; - //state <= READ; // Go to read to readback the write value - state <= IDLE; // data ready - end + if (tx_rdy_in) state <= SEND_ADD_4; + end - READ : begin - rx_fifo_rd_ack <= 1'b0; - tx_dv <= 1'b0; - rd_en <= 1'b1; - state <= READ_1; - end + SEND_ADD_4 : + begin + tx_dv <= tx_rdy_in; - READ_1 : begin - rd_en <= 1'b0; - if (rd_dv_in) - begin - data <= rd_data_in; - if (rd_32b_in) - state <= SEND_DATA_7; - else - state <= SEND_DATA_3; - end - end + if (address[19:16] > 4'd9) tx_data <= {4'd0,address[19:16]} + 8'h37; + else tx_data <= {4'd0,address[19:16]} + ASCII_0; - SEND_ADD_7 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_ADD_3; + end - if (address[31:28] > 4'd9) tx_data <= {4'd0,address[31:28]} + 8'h37; - else tx_data <= {4'd0,address[31:28]} + ASCII_0; + SEND_ADD_3 : + begin + tx_dv <= tx_rdy_in; - if (tx_rdy_in) state <= SEND_ADD_6; - end + if (address[15:12] > 4'd9) tx_data <= {4'd0,address[15:12]} + 8'h37; + else tx_data <= {4'd0,address[15:12]} + ASCII_0; - SEND_ADD_6 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_ADD_2; + end - if (address[27:24] > 4'd9) tx_data <= {4'd0,address[27:24]} + 8'h37; - else tx_data <= {4'd0,address[27:24]} + ASCII_0; + SEND_ADD_2 : + begin + tx_dv <= tx_rdy_in; - if (tx_rdy_in) state <= SEND_ADD_5; - end + if (address[11:8] > 4'd9) tx_data <= {4'd0,address[11:8]} + 8'h37; + else tx_data <= {4'd0,address[11:8]} + ASCII_0; - SEND_ADD_5 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_ADD_1; + end - if (address[23:20] > 4'd9) tx_data <= {4'd0,address[23:20]} + 8'h37; - else tx_data <= {4'd0,address[23:20]} + ASCII_0; + SEND_ADD_1 : + begin + tx_dv <= tx_rdy_in; - if (tx_rdy_in) state <= SEND_ADD_4; - end + if (address[7:4] > 4'd9) tx_data <= {4'd0,address[7:4]} + 8'h37; + else tx_data <= {4'd0,address[7:4]} + ASCII_0; - SEND_ADD_4 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_ADD_0; + end - if (address[19:16] > 4'd9) tx_data <= {4'd0,address[19:16]} + 8'h37; - else tx_data <= {4'd0,address[19:16]} + ASCII_0; + SEND_ADD_0 : + begin + tx_dv <= tx_rdy_in; - if (tx_rdy_in) state <= SEND_ADD_3; - end + if (address[3:0] > 4'd9) tx_data <= {4'd0,address[3:0]} + 8'h37; + else tx_data <= {4'd0,address[3:0]} + ASCII_0; - SEND_ADD_3 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_DATA; - if (address[15:12] > 4'd9) tx_data <= {4'd0,address[15:12]} + 8'h37; - else tx_data <= {4'd0,address[15:12]} + ASCII_0; + //next_state <= SEND_DATA; I am not using a next state for branching + idx <= 0; // Don't print extra tabs + end - if (tx_rdy_in) state <= SEND_ADD_2; - end + SEND_DATA_7 : + begin + tx_dv <= tx_rdy_in; - SEND_ADD_2 : begin - tx_dv <= tx_rdy_in; + if (data[31:28] > 4'd9) tx_data <= {4'd0,data[31:28]} + 8'h37; + else tx_data <= {4'd0,data[31:28]} + ASCII_0; - if (address[11:8] > 4'd9) tx_data <= {4'd0,address[11:8]} + 8'h37; - else tx_data <= {4'd0,address[11:8]} + ASCII_0; + if (tx_rdy_in) state <= SEND_DATA_6; + end - if (tx_rdy_in) state <= SEND_ADD_1; - end + SEND_DATA_6 : + begin + tx_dv <= tx_rdy_in; - SEND_ADD_1 : begin - tx_dv <= tx_rdy_in; + if (data[27:24] > 4'd9) tx_data <= {4'd0,data[27:24]} + 8'h37; + else tx_data <= {4'd0,data[27:24]} + ASCII_0; - if (address[7:4] > 4'd9) tx_data <= {4'd0,address[7:4]} + 8'h37; - else tx_data <= {4'd0,address[7:4]} + ASCII_0; + if (tx_rdy_in) state <= SEND_DATA_5; + end - if (tx_rdy_in) state <= SEND_ADD_0; - end + SEND_DATA_5 : + begin + tx_dv <= tx_rdy_in; - SEND_ADD_0 : begin - tx_dv <= tx_rdy_in; + if (data[23:20] > 4'd9) tx_data <= {4'd0,data[23:20]} + 8'h37; + else tx_data <= {4'd0,data[23:20]} + ASCII_0; - if (address[3:0] > 4'd9) tx_data <= {4'd0,address[3:0]} + 8'h37; - else tx_data <= {4'd0,address[3:0]} + ASCII_0; + if (tx_rdy_in) state <= SEND_DATA_4; + end - if (tx_rdy_in) state <= SEND_DATA; + SEND_DATA_4 : + begin + tx_dv <= tx_rdy_in; - //next_state <= SEND_DATA; I am not using a next state for branching - idx <= 0; // Don't print extra tabs - end + if (data[19:16] > 4'd9) tx_data <= {4'd0,data[19:16]} + 8'h37; + else tx_data <= {4'd0,data[19:16]} + ASCII_0; - SEND_DATA_7 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_DATA_3; + end - if (data[31:28] > 4'd9) tx_data <= {4'd0,data[31:28]} + 8'h37; - else tx_data <= {4'd0,data[31:28]} + ASCII_0; + SEND_DATA_3 : + begin + tx_dv <= tx_rdy_in; - if (tx_rdy_in) state <= SEND_DATA_6; - end + if (data[15:12] > 4'd9) tx_data <= {4'd0,data[15:12]} + 8'h37; + else tx_data <= {4'd0,data[15:12]} + ASCII_0; - SEND_DATA_6 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_DATA_2; + end - if (data[27:24] > 4'd9) tx_data <= {4'd0,data[27:24]} + 8'h37; - else tx_data <= {4'd0,data[27:24]} + ASCII_0; + SEND_DATA_2 : + begin + tx_dv <= tx_rdy_in; - if (tx_rdy_in) state <= SEND_DATA_5; - end + if (data[11:8] > 4'd9) tx_data <= {4'd0,data[11:8]} + 8'h37; + else tx_data <= {4'd0,data[11:8]} + ASCII_0; - SEND_DATA_5 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_DATA_1; + end - if (data[23:20] > 4'd9) tx_data <= {4'd0,data[23:20]} + 8'h37; - else tx_data <= {4'd0,data[23:20]} + ASCII_0; + SEND_DATA_1 : + begin + tx_dv <= tx_rdy_in; - if (tx_rdy_in) state <= SEND_DATA_4; - end + if (data[7:4] > 4'd9) tx_data <= {4'd0,data[7:4]} + 8'h37; + else tx_data <= {4'd0,data[7:4]} + ASCII_0; - SEND_DATA_4 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= SEND_DATA_0; + end - if (data[19:16] > 4'd9) tx_data <= {4'd0,data[19:16]} + 8'h37; - else tx_data <= {4'd0,data[19:16]} + ASCII_0; + SEND_DATA_0 : + begin + tx_dv <= tx_rdy_in; - if (tx_rdy_in) state <= SEND_DATA_3; - end + if (data[3:0] > 4'd9) tx_data <= {4'd0,data[3:0]} + 8'h37; + else tx_data <= {4'd0,data[3:0]} + ASCII_0; - SEND_DATA_3 : begin - tx_dv <= tx_rdy_in; + if (tx_rdy_in) state <= PROMPT; + end - if (data[15:12] > 4'd9) tx_data <= {4'd0,data[15:12]} + 8'h37; - else tx_data <= {4'd0,data[15:12]} + ASCII_0; - - if (tx_rdy_in) state <= SEND_DATA_2; - end - - SEND_DATA_2 : begin - tx_dv <= tx_rdy_in; - - if (data[11:8] > 4'd9) tx_data <= {4'd0,data[11:8]} + 8'h37; - else tx_data <= {4'd0,data[11:8]} + ASCII_0; - - if (tx_rdy_in) state <= SEND_DATA_1; - end - - SEND_DATA_1 : begin - tx_dv <= tx_rdy_in; - - if (data[7:4] > 4'd9) tx_data <= {4'd0,data[7:4]} + 8'h37; - else tx_data <= {4'd0,data[7:4]} + ASCII_0; - - if (tx_rdy_in) state <= SEND_DATA_0; - end - - SEND_DATA_0 : begin - tx_dv <= tx_rdy_in; - - if (data[3:0] > 4'd9) tx_data <= {4'd0,data[3:0]} + 8'h37; - else tx_data <= {4'd0,data[3:0]} + ASCII_0; - - if (tx_rdy_in) state <= PROMPT; - end - - default : begin - rx_fifo_rd_ack <= 1'b0; - tx_dv <= 1'b0; - wr_en <= 1'b0; - rd_en <= 1'b0; - idx <= 8'd0; - state <= RESET; - end + default : + begin + rx_fifo_rd_ack <= 1'b0; + tx_dv <= 1'b0; + wr_en <= 1'b0; + rd_en <= 1'b0; + idx <= 8'd0; + state <= RESET; + end endcase end @@ -887,15 +930,15 @@ end // Generate always @(*) begin case (idx) - 8'd0 : Append = ASCII_TAB; - default : Append = ASCII_CR; + 8'd0 : Append = ASCII_CR; + default : Append = ASCII_LF; endcase end // Instantiate FIFO to buffer RX data from UART. assign rx_fifo_data = {rx_err_in, rx_data_in}; -assign rx_data_byte = rx_fifo_q[7:0]; +assign rx_data_byte = rx_fifo_q[7:0]; assign rx_fifo_empty = (rx_fifo_empty_int | rx_fifo_rd_ack); // Gate with rd_ack to prevent double reads