gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-08-30 14:52:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve command parser to work with other than serial buffer

Browse Source
This commit is contained in:
logicog
2025-08-21 16:11:22 +02:00
parent 8fc4354ec4
commit 52f8366d03
3 changed files with 226 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd_parser.c
+84 -82
View File
@@ -3,10 +3,11 @@
*/ */
// #define DEBUG // #define DEBUG
// #define REGDBG 1
#define REGDBG 1 #define CONFIG_START 0x1fd000
#define CONFIG_LEN 0x1000
#include <stdint.h>
#include "rtl837x_common.h" #include "rtl837x_common.h"
#include "rtl837x_port.h" #include "rtl837x_port.h"
#include "rtl837x_flash.h" #include "rtl837x_flash.h"
@@ -19,10 +20,9 @@ extern __xdata uint8_t minPort;
extern __xdata uint8_t maxPort; extern __xdata uint8_t maxPort;
extern __xdata uint8_t nSFPPorts; extern __xdata uint8_t nSFPPorts;
extern __xdata uint8_t isRTL8373; extern __xdata uint8_t isRTL8373;
extern __xdata uint16_t mpos;
extern volatile __xdata uint32_t ticks; extern volatile __xdata uint32_t ticks;
extern volatile __xdata uint8_t sbuf_ptr;
extern __xdata uint8_t sbuf[SBUF_SIZE];
extern __code uint8_t * __code greeting; extern __code uint8_t * __code greeting;
extern __code uint8_t * __code hex; extern __code uint8_t * __code hex;
@@ -30,15 +30,13 @@ extern __code uint8_t * __code hex;
extern __xdata uint8_t flash_buf[256]; extern __xdata uint8_t flash_buf[256];
// Buffer for writing to flash 0x1fd000, copy to 0x1fe000 // Buffer for writing to flash 0x1fd000, copy to 0x1fe000
#define CMD_BUFFER_SIZE 1024 __xdata uint8_t cmd_buffer[SBUF_SIZE];
__xdata uint8_t cmd_buffer[CMD_BUFFER_SIZE];
__xdata uint16_t cmdptr;
__xdata uint8_t l; __xdata uint8_t l;
__xdata uint8_t line_ptr; __xdata uint8_t line_ptr;
__xdata char is_white; __xdata char is_white;
#define N_WORDS 16 #define N_WORDS SBUF_SIZE
__xdata signed char cmd_words_b[N_WORDS]; __xdata signed char cmd_words_b[N_WORDS];
// Maps the physical port (starting from 0) to the logical port // Maps the physical port (starting from 0) to the logical port
@@ -51,17 +49,17 @@ uint8_t cmd_compare(uint8_t start, uint8_t * __code cmd)
signed char i; signed char i;
signed char j = 0; signed char j = 0;
for (i = cmd_words_b[start]; i != cmd_words_b[start + 1] && sbuf[i] != ' '; i++) { for (i = cmd_words_b[start]; i != cmd_words_b[start + 1] && cmd_buffer[i] != ' '; i++) {
i &= SBUF_SIZE - 1; i &= SBUF_SIZE - 1;
// print_short(i); write_char(':'); print_short(j); write_char('#'); print_string("\n"); // print_short(i); write_char(':'); print_short(j); write_char('#'); print_string("\n");
// write_char('>'); write_char(cmd[j]); write_char('-'); write_char(sbuf[i]); print_string("\n"); // write_char('>'); write_char(cmd[j]); write_char('-'); write_char(cmd_buffer[i]); print_string("\n");
if (!cmd[j]) if (!cmd[j])
return 1; return 1;
if (sbuf[i] != cmd[j++]) if (cmd_buffer[i] != cmd[j++])
break; break;
} }
// write_char('.'); print_short(i); write_char(':'); print_short(i); // write_char('.'); print_short(i); write_char(':'); print_short(i);
if (i == cmd_words_b[start + 1] || sbuf[i] == ' ') if (i == cmd_words_b[start + 1] || cmd_buffer[i] == ' ')
return 1; return 1;
return 0; return 0;
} }
@@ -72,9 +70,9 @@ uint8_t atoi_short(register uint16_t *vlan, register uint8_t idx)
uint8_t err = 1; uint8_t err = 1;
*vlan = 0; *vlan = 0;
while (sbuf[idx] >= '0' && sbuf[idx] <= '9') { while (cmd_buffer[idx] >= '0' && cmd_buffer[idx] <= '9') {
err = 0; err = 0;
*vlan = (*vlan * 10) + sbuf[idx] - '0'; *vlan = (*vlan * 10) + cmd_buffer[idx] - '0';
idx++; idx++;
} }
return err; return err;
@@ -86,13 +84,13 @@ void parse_trunk(void)
__xdata uint8_t group; __xdata uint8_t group;
__xdata uint16_t members = 0; __xdata uint16_t members = 0;
group = sbuf[cmd_words_b[1]] - '0'; group = cmd_buffer[cmd_words_b[1]] - '0';
uint8_t w = 2; uint8_t w = 2;
while (cmd_words_b[w] > 0) { while (cmd_words_b[w] > 0) {
uint8_t port; uint8_t port;
if (sbuf[cmd_words_b[w]] >= '0' && sbuf[cmd_words_b[w]] <= '9') { if (cmd_buffer[cmd_words_b[w]] >= '0' && cmd_buffer[cmd_words_b[w]] <= '9') {
port = sbuf[cmd_words_b[w]] - '1'; port = cmd_buffer[cmd_words_b[w]] - '1';
if (port > maxPort) if (port > maxPort)
goto err; goto err;
members |= ((uint16_t)1) << port; members |= ((uint16_t)1) << port;
@@ -112,23 +110,23 @@ void parse_vlan(void)
__xdata uint16_t members = 0; __xdata uint16_t members = 0;
__xdata uint16_t tagged = 0; __xdata uint16_t tagged = 0;
if (!atoi_short(&vlan, cmd_words_b[1])) { if (!atoi_short(&vlan, cmd_words_b[1])) {
if (cmd_words_b[2] > 0 && sbuf[cmd_words_b[2]] == 'd') { if (cmd_words_b[2] > 0 && cmd_buffer[cmd_words_b[2]] == 'd') {
vlan_delete(vlan); vlan_delete(vlan);
return; return;
} }
uint8_t w = 2; uint8_t w = 2;
while (cmd_words_b[w] > 0) { while (cmd_words_b[w] > 0) {
uint8_t port; uint8_t port;
if (sbuf[cmd_words_b[w]] >= '0' && sbuf[cmd_words_b[w]] <= '9') { if (cmd_buffer[cmd_words_b[w]] >= '0' && cmd_buffer[cmd_words_b[w]] <= '9') {
port = sbuf[cmd_words_b[w]] - '1'; port = cmd_buffer[cmd_words_b[w]] - '1';
if (sbuf[cmd_words_b[w] + 1] >= '0' && sbuf[cmd_words_b[w] + 1] <= '9') { if (cmd_buffer[cmd_words_b[w] + 1] >= '0' && cmd_buffer[cmd_words_b[w] + 1] <= '9') {
port = (port + 1) * 10 + sbuf[cmd_words_b[w] + 1] - '1'; port = (port + 1) * 10 + cmd_buffer[cmd_words_b[w] + 1] - '1';
if (sbuf[cmd_words_b[w] + 2] == 't') if (cmd_buffer[cmd_words_b[w] + 2] == 't')
tagged |= ((uint16_t)1) << port; tagged |= ((uint16_t)1) << port;
} else { } else {
if (!isRTL8373) if (!isRTL8373)
port = phys_to_log_port[port]; port = phys_to_log_port[port];
if (sbuf[cmd_words_b[w] + 1] == 't') if (cmd_buffer[cmd_words_b[w] + 1] == 't')
tagged |= ((uint16_t)1) << port; tagged |= ((uint16_t)1) << port;
} }
if (port > maxPort) if (port > maxPort)
@@ -151,29 +149,29 @@ void parse_mirror(void)
__xdata uint16_t rx_pmask = 0; __xdata uint16_t rx_pmask = 0;
__xdata uint16_t tx_pmask = 0; __xdata uint16_t tx_pmask = 0;
if (sbuf[cmd_words_b[1]] < '0' || sbuf[cmd_words_b[1]] > '9') { if (cmd_buffer[cmd_words_b[1]] < '0' || cmd_buffer[cmd_words_b[1]] > '9') {
print_string("Port missing: port <mirroring port> [port][t/r]..."); print_string("Port missing: port <mirroring port> [port][t/r]...");
return; return;
} }
mirroring_port = sbuf[cmd_words_b[1]] - '1'; mirroring_port = cmd_buffer[cmd_words_b[1]] - '1';
if (sbuf[cmd_words_b[1] + 1] >= '0' && sbuf[cmd_words_b[1] + 1] <= '9') if (cmd_buffer[cmd_words_b[1] + 1] >= '0' && cmd_buffer[cmd_words_b[1] + 1] <= '9')
mirroring_port = (mirroring_port + 1) * 10 + sbuf[cmd_words_b[1] + 1] - '1'; mirroring_port = (mirroring_port + 1) * 10 + cmd_buffer[cmd_words_b[1] + 1] - '1';
if (!isRTL8373) if (!isRTL8373)
mirroring_port = phys_to_log_port[mirroring_port]; mirroring_port = phys_to_log_port[mirroring_port];
uint8_t w = 2; uint8_t w = 2;
while (cmd_words_b[w] > 0) { while (cmd_words_b[w] > 0) {
uint8_t port; uint8_t port;
if (sbuf[cmd_words_b[w]] >= '0' && sbuf[cmd_words_b[w]] <= '9') { if (cmd_buffer[cmd_words_b[w]] >= '0' && cmd_buffer[cmd_words_b[w]] <= '9') {
port = sbuf[cmd_words_b[w]] - '1'; port = cmd_buffer[cmd_words_b[w]] - '1';
if (sbuf[cmd_words_b[w] + 1] >= '0' && sbuf[cmd_words_b[w] + 1] <= '9') { if (cmd_buffer[cmd_words_b[w] + 1] >= '0' && cmd_buffer[cmd_words_b[w] + 1] <= '9') {
port = (port + 1) * 10 + sbuf[cmd_words_b[w] + 1] - '1'; port = (port + 1) * 10 + cmd_buffer[cmd_words_b[w] + 1] - '1';
if (!isRTL8373) if (!isRTL8373)
port = phys_to_log_port[port]; port = phys_to_log_port[port];
if (sbuf[cmd_words_b[w] + 2] == 'r') if (cmd_buffer[cmd_words_b[w] + 2] == 'r')
rx_pmask |= ((uint16_t)1) << port; rx_pmask |= ((uint16_t)1) << port;
else if (sbuf[cmd_words_b[w] + 2] == 't') else if (cmd_buffer[cmd_words_b[w] + 2] == 't')
tx_pmask |= ((uint16_t)1) << port; tx_pmask |= ((uint16_t)1) << port;
else { else {
rx_pmask |= ((uint16_t)1) << port; rx_pmask |= ((uint16_t)1) << port;
@@ -182,9 +180,9 @@ void parse_mirror(void)
} else { } else {
if (!isRTL8373) if (!isRTL8373)
port = phys_to_log_port[port]; port = phys_to_log_port[port];
if (sbuf[cmd_words_b[w] + 1] == 'r') if (cmd_buffer[cmd_words_b[w] + 1] == 'r')
rx_pmask |= ((uint16_t)1) << port; rx_pmask |= ((uint16_t)1) << port;
else if (sbuf[cmd_words_b[w] + 1] == 't') else if (cmd_buffer[cmd_words_b[w] + 1] == 't')
tx_pmask |= ((uint16_t)1) << port; tx_pmask |= ((uint16_t)1) << port;
else { else {
rx_pmask |= ((uint16_t)1) << port; rx_pmask |= ((uint16_t)1) << port;
@@ -198,40 +196,49 @@ void parse_mirror(void)
} }
void cmd_parser(void) __banked // Parse command into words
uint8_t cmd_tokenize(void) __banked
{ {
while (l != sbuf_ptr) {
write_char(sbuf[l]);
// Check whether there is a full line:
if (sbuf[l] == '\n' || sbuf[l] == '\r') {
write_char('\n');
#ifdef DEBUG #ifdef DEBUG
print_long(ticks); print_string("Tokenizing command\n");
print_string_x(&cmd_buffer[0]);
write_char('<'); write_char('\n');
#endif #endif
// Print line and parse command into words line_ptr = 0;
is_white = 1; is_white = 1;
uint8_t word = 0; uint8_t word = 0;
cmd_words_b[0] = -1; cmd_words_b[0] = -1;
while (line_ptr != l) { while (cmd_buffer[line_ptr] && line_ptr < SBUF_SIZE - 1) {
if (is_white && sbuf[line_ptr] != ' ') { if (is_white && cmd_buffer[line_ptr] != ' ') {
is_white = 0; is_white = 0;
cmd_words_b[word++] = line_ptr; cmd_words_b[word++] = line_ptr;
} }
if (sbuf[line_ptr] == ' ') if (cmd_buffer[line_ptr] == ' ')
is_white = 1; is_white = 1;
write_char(sbuf[line_ptr++]); line_ptr++;
line_ptr &= SBUF_SIZE - 1;
if (word >= N_WORDS - 1) { if (word >= N_WORDS - 1) {
print_string("\ntoo many arguments, truncated"); print_string("\ntoo many arguments, truncated");
line_ptr = l; // BUG: We should probably ignore the command return 1;
break;
} }
} }
if (line_ptr == SBUF_SIZE - 1)
return 1;
cmd_words_b[word++] = line_ptr; cmd_words_b[word++] = line_ptr;
cmd_words_b[word++] = -1; cmd_words_b[word++] = -1;
line_ptr = (l + 1) & (SBUF_SIZE - 1);
return 0;
}
// Identify command // Identify command
void cmd_parser(void) __banked
{
#ifdef DEBUG
print_long(ticks);
print_string("Parsing command\n");
print_string_x(&cmd_buffer[0]);
write_char('<'); write_char('\n');
#endif
signed char i = cmd_words_b[0]; signed char i = cmd_words_b[0];
if (i >= 0 && cmd_words_b[1] >= 0) { if (i >= 0 && cmd_words_b[1] >= 0) {
if (cmd_compare(0, "reset")) { if (cmd_compare(0, "reset")) {
@@ -252,37 +259,37 @@ void cmd_parser(void) __banked
if (cmd_compare(0, "stat")) { if (cmd_compare(0, "stat")) {
port_stats_print(); port_stats_print();
} }
if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && sbuf[cmd_words_b[1]] == 'r') { if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 'r') {
print_string("\nPRINT SECURITY REGISTERS\n"); print_string("\nPRINT SECURITY REGISTERS\n");
// The following will only show something else then 0xff if it was programmed for a managed switch // The following will only show something else than 0xff if it was programmed for a managed switch
flash_read_security(0x0001000, 40); flash_read_security(0x0001000, 40);
flash_read_security(0x0002000, 40); flash_read_security(0x0002000, 40);
flash_read_security(0x0003000, 40); flash_read_security(0x0003000, 40);
} }
if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && sbuf[cmd_words_b[1]] == 'd') { if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 'd') {
print_string("\nDUMPING FLASH\n"); print_string("\nDUMPING FLASH\n");
flash_dump(0, 255); flash_dump(0, 255);
} }
if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && sbuf[cmd_words_b[1]] == 'j') { if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 'j') {
print_string("\nJEDEC ID\n"); print_string("\nJEDEC ID\n");
flash_read_jedecid(); flash_read_jedecid();
} }
if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && sbuf[cmd_words_b[1]] == 'u') { if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 'u') {
print_string("\nUNIQUE ID\n"); print_string("\nUNIQUE ID\n");
flash_read_uid(); flash_read_uid();
} }
// Switch to flash 62.5 MHz mode // Switch to flash 62.5 MHz mode
if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && sbuf[cmd_words_b[1]] == 's') { if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 's') {
print_string("\nFLASH FAST MODE\n"); print_string("\nFLASH FAST MODE\n");
flash_init(1); flash_init(1);
print_string("\nNow dumping flash\n"); print_string("\nNow dumping flash\n");
flash_dump(0, 255); flash_dump(0, 255);
} }
if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && sbuf[cmd_words_b[1]] == 'e') { if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 'e') {
print_string("\nFLASH erase\n"); print_string("\nFLASH erase\n");
flash_block_erase(0x20000); flash_block_erase(0x20000);
} }
if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && sbuf[cmd_words_b[1]] == 'w') { if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 'w') {
print_string("\nFLASH write\n"); print_string("\nFLASH write\n");
for (uint8_t i = 0; i < 20; i++) for (uint8_t i = 0; i < 20; i++)
flash_buf[i] = greeting[i]; flash_buf[i] = greeting[i];
@@ -290,7 +297,7 @@ void cmd_parser(void) __banked
} }
if (cmd_compare(0, "port") && cmd_words_b[1] > 0) { if (cmd_compare(0, "port") && cmd_words_b[1] > 0) {
print_string("\nPORT "); print_string("\nPORT ");
uint8_t p = sbuf[cmd_words_b[1]] - '1'; uint8_t p = cmd_buffer[cmd_words_b[1]] - '1';
print_byte(p); print_byte(p);
if (cmd_words_b[2] > 0 && cmd_compare(2, "2g5")) { if (cmd_words_b[2] > 0 && cmd_compare(2, "2g5")) {
print_string(" 2.5G\n"); print_string(" 2.5G\n");
@@ -318,7 +325,7 @@ void cmd_parser(void) __banked
if (cmd_compare(0, "pvid") && cmd_words_b[1] > 0 && cmd_words_b[2] > 0) { if (cmd_compare(0, "pvid") && cmd_words_b[1] > 0 && cmd_words_b[2] > 0) {
__xdata uint16_t pvid; __xdata uint16_t pvid;
uint8_t port; uint8_t port;
port = sbuf[cmd_words_b[1]] - '1'; port = cmd_buffer[cmd_words_b[1]] - '1';
if (!isRTL8373) if (!isRTL8373)
port = phys_to_log_port[port]; port = phys_to_log_port[port];
if (!atoi_short(&pvid, cmd_words_b[2])) if (!atoi_short(&pvid, cmd_words_b[2]))
@@ -337,29 +344,24 @@ void cmd_parser(void) __banked
print_reg(RTL837X_REG_SDS_MODES); print_reg(RTL837X_REG_SDS_MODES);
} }
} }
print_string("\n> ");
}
l++;
l &= (SBUF_SIZE - 1);
}
} }
void execute_config() __banked void execute_config(void) __banked
{ {
flash_read_bulk(&cmd_buffer[0], 0x1fd000, CMD_BUFFER_SIZE); __xdata uint32_t pos = CONFIG_START;
// Checks for empty flash __xdata uint16_t len_left = CONFIG_LEN;
if (cmd_buffer[0] == 0xff) do {
return; flash_find_mark(pos, len_left, "\n");
print_string_x(&cmd_buffer[0]); if (mpos != 0xffff) {
__xdata uint16_t len = len_left - mpos;
flash_read_bulk(&cmd_buffer[0], pos, len > SBUF_SIZE ? SBUF_SIZE : len);
cmd_buffer[len > SBUF_SIZE ? SBUF_SIZE : len] = '\0';
len++;
pos += len;
len_left -= len;
if (len && !cmd_tokenize())
cmd_parser();
} }
} while (mpos != 0xffff);
void cmd_parser_setup(void) __banked
{
l = sbuf_ptr;
line_ptr = l;
is_white = 1;
cmdptr = 0;
} }
cmd_parser.h
+8 -2
View File
@@ -1,7 +1,13 @@
#ifndef _CMD_PARSER_H_ #ifndef _CMD_PARSER_H_
#define _CMD_PARSER_H_ #define _CMD_PARSER_H_
#include <stdint.h>
#include "rtl837x_common.h"
extern __xdata uint8_t cmd_buffer[SBUF_SIZE];
uint8_t cmd_tokenize(void) __banked;
void cmd_parser(void) __banked; void cmd_parser(void) __banked;
void cmd_parser_setup(void) __banked; void execute_config(void) __banked;
void execute_config() __banked;
#endif #endif
rtlplayground.c
+27 -1
View File
@@ -60,6 +60,8 @@ __xdata volatile uint8_t sbuf_ptr;
__xdata uint8_t sbuf[SBUF_SIZE]; __xdata uint8_t sbuf[SBUF_SIZE];
__xdata uint8_t sfr_data[4]; __xdata uint8_t sfr_data[4];
extern __xdata uint8_t cmd_buffer[SBUF_SIZE];
__code uint8_t * __code greeting = "\nA minimal prompt to explore the RTL8372:\n"; __code uint8_t * __code greeting = "\nA minimal prompt to explore the RTL8372:\n";
__code uint8_t * __code hex = "0123456789abcdef"; __code uint8_t * __code hex = "0123456789abcdef";
@@ -1683,10 +1685,34 @@ void bootloader(void)
execute_config(); execute_config();
print_string("\n> "); print_string("\n> ");
cmd_parser_setup();
idle_ready = 1; idle_ready = 1;
// Wait for commands on serial connection
// sbuf_ptr is moved forward by serial interrupt, l is the position until we have already
// printed out the entered characters
__xdata uint8_t l = sbuf_ptr; // We have printed out entered characters until l
__xdata uint8_t line_start = sbuf_ptr; // This is where the current line starts
while (1) { while (1) {
while (l != sbuf_ptr) {
write_char(sbuf[l]);
// Check whether there is a full line:
if (sbuf[l] == '\n' || sbuf[l] == '\r') {
write_char('\n');
register uint8_t i = 0;
while (line_start != l) {
cmd_buffer[i++] = sbuf[line_start++];
line_start &= (SBUF_SIZE - 1);
}
line_start++;
line_start &= (SBUF_SIZE - 1);
cmd_buffer[i] = '\0';
if (i && !cmd_tokenize())
cmd_parser(); cmd_parser();
print_string("\n> ");
}
l++;
l &= (SBUF_SIZE - 1);
}
idle(); // Enter Idle mode until interrupt occurs idle(); // Enter Idle mode until interrupt occurs
} }
} }