Skip to content

S
Software for White Rabbit PTP Core
Commit c0e8dfba authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

wrpc-vuart.c: refactoring before creating an API

parent a9c177a0
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 142 deletions
tools/wrpc-vuart.c
View file @ c0e8dfba
...@@ -26,6 +26,7 @@ static void wrpc_vuart_help(char *prog) ...@@ -26,6 +26,7 @@ static void wrpc_vuart_help(char *prog)
mapping_help_str = dev_mapping_help(); mapping_help_str = dev_mapping_help();
fprintf(stderr, "%s [options]\n", prog); fprintf(stderr, "%s [options]\n", prog);
fprintf(stderr, "%s\n", mapping_help_str); fprintf(stderr, "%s\n", mapping_help_str);
fprintf(stderr, "for vuart, address offset should be 0x500\n");
fprintf(stderr, "Vuart specific option: [-k(keep terminal)]\n"); fprintf(stderr, "Vuart specific option: [-k(keep terminal)]\n");
} }
...@@ -55,7 +56,7 @@ static void vuart_writel(struct mapping_desc *vuart, uint32_t value, int reg) ...@@ -55,7 +56,7 @@ static void vuart_writel(struct mapping_desc *vuart, uint32_t value, int reg)
*(volatile uint32_t *)( vuart->base + reg ) = value; *(volatile uint32_t *)( vuart->base + reg ) = value;
} }
static int8_t wr_vuart_rx(struct mapping_desc *vuart) static int wr_vuart_rx(struct mapping_desc *vuart)
{ {
int rdr = vuart_readl( vuart, UART_REG_HOST_RDR ); int rdr = vuart_readl( vuart, UART_REG_HOST_RDR );
return (rdr & UART_HOST_RDR_RDY) ? UART_HOST_RDR_DATA_R(rdr) : -1; return (rdr & UART_HOST_RDR_RDY) ? UART_HOST_RDR_DATA_R(rdr) : -1;
...@@ -116,150 +117,146 @@ static void wr_vuart_flush(struct mapping_desc *vuart) ...@@ -116,150 +117,146 @@ static void wr_vuart_flush(struct mapping_desc *vuart)
* @param[in] vuart token from dev_map() * @param[in] vuart token from dev_map()
* @param[in] buf buffer to write * @param[in] buf buffer to write
* @param[in] size numeber of bytes to write * @param[in] size numeber of bytes to write
*
* @return the number of written bytes
*/ */
static size_t wr_vuart_write(struct mapping_desc *vuart, char *buf, size_t size) static void wr_vuart_write(struct mapping_desc *vuart, char *buf, size_t size)
{ {
while(size--)
size_t s = size;
while(s--)
wr_vuart_tx(vuart, *buf++); wr_vuart_tx(vuart, *buf++);
}
return size; static void wrpc_vuart_set_tty_raw(struct termios *old_termios)
{
struct termios newkey;
tcgetattr(STDIN_FILENO,old_termios);
memcpy(&newkey, old_termios, sizeof(struct termios));
newkey.c_cflag = B9600 | CS8 | CLOCAL | CREAD;
newkey.c_iflag = IGNPAR;
newkey.c_oflag = 0;
newkey.c_lflag = ISIG; /* Keep C-c, C-z, ... */
tcflush(STDIN_FILENO, TCIFLUSH);
tcsetattr(STDIN_FILENO,TCSANOW,&newkey);
} }
static void wrpc_vuart_term_main(struct mapping_desc *vuart, int keep_term, int command_mode, char *command) static void wrpc_vuart_restore_tty(struct termios *old_termios)
{ {
struct termios oldkey, newkey; tcsetattr(STDIN_FILENO, TCSANOW, old_termios);
//above is place for old and new port settings for keyboard teletype }
static void wrpc_vuart_term(struct mapping_desc *vuart, int keep_term)
{
struct termios oldkey;
int need_exit = 0; int need_exit = 0;
int cmd_sent = 0;
int cmd_len = 0;
char *prompt = VUART_CMD_PROMPT;
int i_prompt = 0;
int i;
fd_set fds; fd_set fds;
int ret; int ret;
char rx, tx; int rx, tx;
if(!command_mode) fprintf(stderr, "[press C-a to exit]\n");
fprintf(stderr, "[press C-a to exit]\n");
if(!keep_term)
if(!keep_term) { wrpc_vuart_set_tty_raw(&oldkey);
tcgetattr(STDIN_FILENO,&oldkey);
memcpy(&newkey, &oldkey, sizeof(struct termios));
newkey.c_cflag = B9600 | CS8 | CLOCAL | CREAD;
newkey.c_iflag = IGNPAR;
newkey.c_oflag = 0;
newkey.c_lflag = ISIG; /* Keep C-c, C-z, ... */
tcflush(STDIN_FILENO, TCIFLUSH);
tcsetattr(STDIN_FILENO,TCSANOW,&newkey);
}
while(!need_exit) { while(!need_exit) {
if (!command_mode) { struct timeval tv = {0, 10000};
struct timeval tv = {0, 10000};
FD_ZERO(&fds);
FD_ZERO(&fds); FD_SET(STDIN_FILENO, &fds);
FD_SET(STDIN_FILENO, &fds);
/*
/* * Check if the STDIN has characters to read
* Check if the STDIN has characters to read * (what the user writes)
* (what the user writes) */
*/ ret = select(STDIN_FILENO + 1, &fds, NULL, NULL, &tv);
ret = select(STDIN_FILENO + 1, &fds, NULL, NULL, &tv); switch (ret) {
switch (ret) { case -1:
case -1: perror("select");
perror("select"); break;
break; case 0: /* timeout */
case 0: /* timeout */ break;
break; default:
default: if(!FD_ISSET(STDIN_FILENO, &fds))
if(!FD_ISSET(STDIN_FILENO, &fds))
break;
/* The user wrote something */
do {
ret = read(STDIN_FILENO, &tx, 1);
} while (ret < 0 && errno == EINTR);
if (ret != 1) {
fprintf(stderr, "nothing to read. Port disconnected?\n");
need_exit = 1; /* kill */
}
/* If the user character is C-a, then kill */
if(tx == '\x01') {
need_exit = 1;
break;
}
ret = wr_vuart_write(vuart, &tx, 1);
if (ret != 1) {
fprintf(stderr, "Unable to write (errno: %d)\n", errno);
need_exit = 1;
}
break; break;
/* The user wrote something */
do {
ret = read(STDIN_FILENO, &tx, 1);
} while (ret < 0 && errno == EINTR);
if (ret != 1) {
fprintf(stderr, "nothing to read. Port disconnected?\n");
need_exit = 1; /* kill */
} }
} else { /* If the user character is C-a, then kill */
if(!cmd_sent) { if(tx == '\x01') {
/* Flush Vuart before sending command */ need_exit = 1;
wr_vuart_flush(vuart); break;
/* Send command */
cmd_len = strlen(command);
ret = wr_vuart_write(vuart, command, cmd_len-1);
if (ret != cmd_len-1) {
fprintf(stderr, "Unable to write the command (errno: %d)\n",errno);
need_exit = 1;
}
/* Flush command echo */
wr_vuart_flush(vuart);
/* Send end character */
ret = wr_vuart_write(vuart, &command[cmd_len-1], 1);
if (ret != 1) {
fprintf(stderr, "Unable to write the end character of command (errno: %d)\n",errno);
need_exit = 1;
}
/* Wait for a while before reading command results */
usleep(VUART_CMD_USLEEP);
/* Discard characters until end of line control one */
while(wr_vuart_read(vuart, &rx, 1)) {
if(rx == VUART_EOL)
break;
}
cmd_sent = 1;
} }
wr_vuart_tx(vuart, tx);
break;
} }
/* Print all the incoming charactes */ /* Print all the incoming characters */
while((wr_vuart_read(vuart, &rx, 1)) == 1) { while((rx = wr_vuart_rx(vuart)) > 0) {
if (command_mode == 1) { putchar(rx);
/* Prompt detection, skip characters */
if (rx == prompt[i_prompt]) {
i_prompt++;
/* Prompt detected! */
if(i_prompt == strlen(prompt)) {
need_exit = 1;
break;
}
} else {
/* Check if some previous characters have been skipped by
prompt detector code and print them */
for(i = 0 ; i < i_prompt ; i++)
fprintf(stderr,"%c",prompt[i]);
/* Reset prompt detector */
i_prompt = 0;
/* Print current character */
fprintf(stderr,"%c", rx);
}
} else {
fprintf(stderr,"%c",rx);
}
} }
fflush(stdout);
} }
if(!keep_term) if(!keep_term)
tcsetattr(STDIN_FILENO, TCSANOW, &oldkey); wrpc_vuart_restore_tty(&oldkey);
}
static void wrpc_vuart_command(struct mapping_desc *vuart, char *command)
{
//above is place for old and new port settings for keyboard teletype
int cmd_len = 0;
char *prompt = VUART_CMD_PROMPT;
int i_prompt = 0;
int i;
int rx;
/* Flush Vuart before sending command */
wr_vuart_flush(vuart);
/* Send command */
cmd_len = strlen(command);
wr_vuart_write(vuart, command, cmd_len);
/* Flush command echo */
wr_vuart_flush(vuart);
/* Send end character */
wr_vuart_tx(vuart, VUART_EOL);
/* Wait for a while before reading command results */
usleep(VUART_CMD_USLEEP);
/* Discard characters until end of line control one */
while((rx = wr_vuart_rx(vuart)) > 0) {
if(rx == VUART_EOL)
break;
}
while(1) {
/* Print all the incoming characters */
rx = wr_vuart_rx(vuart);
if (rx < 0) {
usleep(10);
continue;
}
/* Prompt detection, skip characters */
if (rx == prompt[i_prompt]) {
i_prompt++;
/* Prompt detected! */
if(i_prompt == strlen(prompt))
return;
} else {
/* Check if some previous characters have been skipped
by prompt detector code and print them */
for(i = 0 ; i < i_prompt ; i++)
putchar(prompt[i]);
/* Reset prompt detector */
i_prompt = 0;
/* Print current character */
putchar(rx);
fflush(stdout);
}
}
} }
...@@ -267,37 +264,29 @@ int main(int argc, char *argv[]) ...@@ -267,37 +264,29 @@ int main(int argc, char *argv[])
{ {
char c; char c;
int keep_term = 0; int keep_term = 0;
int command_mode = 0; char *cmd = NULL;
char cmd[50];
int cmd_len = 0;
struct mapping_args *map_args; struct mapping_args *map_args;
struct mapping_desc *vuart = NULL; struct mapping_desc *vuart = NULL;
map_args = dev_parse_mapping_args(&argc, argv); map_args = dev_parse_mapping_args(&argc, argv);
if (!map_args) { if (!map_args) {
wrpc_vuart_help(argv[0]); wrpc_vuart_help(argv[0]);
goto out; return 1;
} }
/* Parse specific args */ /* Parse specific args */
while ((c = getopt (argc, argv, "c:k")) != -1) { while ((c = getopt (argc, argv, "c:kh")) != -1) {
switch (c) { switch (c) {
case 'c': case 'c':
/* Enable command mode */ /* Enable command mode */
command_mode = 1; cmd = optarg;
/* Get the command from args */
strcpy(cmd, optarg);
cmd_len = strlen(cmd);
/* Put end of buffer for terminal */
cmd[cmd_len] = VUART_EOL;
cmd[cmd_len+1] = 0;
break; break;
case 'k': case 'k':
keep_term = 1; keep_term = 1;
break; break;
case 'h': case 'h':
wrpc_vuart_help(argv[0]); wrpc_vuart_help(argv[0]);
break; return 0;
case '?': case '?':
break; break;
} }
...@@ -307,13 +296,15 @@ int main(int argc, char *argv[]) ...@@ -307,13 +296,15 @@ int main(int argc, char *argv[])
if (!vuart) { if (!vuart) {
fprintf(stderr, "%s: vuart_open() failed: %s\n", argv[0], fprintf(stderr, "%s: vuart_open() failed: %s\n", argv[0],
strerror(errno)); strerror(errno));
goto out; return 1;
} }
wrpc_vuart_term_main(vuart, keep_term, command_mode, cmd); if (cmd)
wrpc_vuart_command(vuart, cmd);
else
wrpc_vuart_term(vuart, keep_term);
dev_unmap(vuart); dev_unmap(vuart);
return 0; return 0;
out:
return -1;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment