Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap serial console in a TTY

Browse Source
This commit is contained in:
Kevin Lange 2013-11-27 22:24:58 -08:00
parent 3c9a717429
commit 8c469883bc
1 changed files with 97 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
kernel/misc/debug_shell.c
View File

@ -6,6 +6,21 @@
#include <logging.h>
#include <process.h>
#include <version.h>
#include <termios.h>
static struct termios old;
void set_unbuffered(fs_node_t * dev) {
ioctl_fs(dev, TCGETS, &old);
struct termios new = old;
new.c_lflag &= (~ICANON & ~ECHO);
ioctl_fs(dev, TCSETSF, &new);
}
void set_buffered(fs_node_t * dev) {
ioctl_fs(dev, TCSETSF, &old);
}
void fs_printf(fs_node_t * device, char *fmt, ...) {
va_list args;
@ -19,6 +34,7 @@ void fs_printf(fs_node_t * device, char *fmt, ...) {
int debug_shell_readline(fs_node_t * dev, char * linebuf, int max) {
int read = 0;
set_unbuffered(dev);
while (read < max) {
uint8_t buf[1];
int r = read_fs(dev, 0, 1, (unsigned char *)buf);
@ -42,6 +58,7 @@ int debug_shell_readline(fs_node_t * dev, char * linebuf, int max) {
fs_printf(dev, "%c", buf[0]);
read += r;
}
set_buffered(dev);
return read;
}
@ -66,6 +83,64 @@ void debug_shell_run_sh(void * data, char * name) {
task_exit(42);
}
struct tty_o {
fs_node_t * node;
fs_node_t * tty;
};
void debug_shell_handle_in(void * data, char * name) {
struct tty_o * tty = (struct tty_o *)data;
while (1) {
uint8_t buf[1];
int r = read_fs(tty->tty, 0, 1, (unsigned char *)buf);
write_fs(tty->node, 0, r, buf);
}
}
void debug_shell_handle_out(void * data, char * name) {
struct tty_o * tty = (struct tty_o *)data;
while (1) {
uint8_t buf[1];
int r = read_fs(tty->node, 0, 1, (unsigned char *)buf);
write_fs(tty->tty, 0, r, buf);
}
}
void divine_size(fs_node_t * dev, int * width, int * height) {
char tmp[100];
int read = 0;
unsigned long start_tick = timer_ticks;
fs_printf(dev, "\033[1000;1000H\033[6n\033[H\033[J");
while (1) {
char buf[1];
int r = read_fs(dev, 0, 1, (unsigned char *)buf);
if (r > 0) {
if (buf[0] != 'R') {
if (read > 1) {
tmp[read-2] = buf[0];
}
read++;
} else {
break;
}
}
if (timer_ticks - start_tick >= 2) {
*width = 80;
*height = 23;
return;
}
}
for (unsigned int i = 0; i < strlen(tmp); i++) {
if (tmp[i] == ';') {
tmp[i] = '\0';
break;
}
}
char * h = (char *)((uintptr_t)tmp + strlen(tmp)+1);
*height = atoi(tmp);
*width = atoi(h);
}
void debug_shell_run(void * data, char * name) {
fs_node_t * tty = kopen("/dev/ttyS0", 0);
char version_number[1024];
@ -74,6 +149,27 @@ void debug_shell_run(void * data, char * name) {
__kernel_version_minor,
__kernel_version_lower,
__kernel_version_suffix);
int master, slave;
struct winsize size = {0,0,0,0};
/* Attempt to divine the terminal size. Changing the window size after this will do bad things */
int width, height;
divine_size(tty, &width, &height);
size.ws_row = height;
size.ws_col = width;
openpty(&master, &slave, NULL, NULL, &size);
struct tty_o _tty = {.node = current_process->fds->entries[master], .tty = tty};
create_kernel_tasklet(debug_shell_handle_in, "[kttydebug-in]", (void *)&_tty);
create_kernel_tasklet(debug_shell_handle_out, "[kttydebug-out]", (void *)&_tty);
/* Set the device to be the actual TTY slave */
tty = current_process->fds->entries[slave];
while (1) {
char command[512];
@ -81,7 +177,7 @@ void debug_shell_run(void * data, char * name) {
fs_printf(tty, "%s-%s %s# ", __kernel_name, version_number, current_process->wd_name);
/* Read a line */
int r = debug_shell_readline(tty, command, 511);
debug_shell_readline(tty, command, 511);
/* Do something with it */
if (!strcmp(command, "shell")) {