RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsp/riscv: Simplify printk() support

Browse Source 
This is a prepartion to add NS16550 driver support to the console
driver.

Update #3433.
This commit is contained in:
Sebastian Huber
2018-07-06 13:52:22 +02:00
parent bca36d986b
commit 31f90a2ff4
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bsps/riscv/riscv/console/console-config.c
View File

@@ -31,17 +31,13 @@ static htif_console_context htif_console_instance;
static struct { static struct {
rtems_termios_device_context *context; rtems_termios_device_context *context;
void (*write_polled)( void (*putchar)(rtems_termios_device_context *base, char c);
rtems_termios_device_context *base, int (*getchar)(rtems_termios_device_context *base);
const char *buf,
size_t len
);
int (*poll_char)(rtems_termios_device_context *base);
} riscv_console; } riscv_console;
static void riscv_output_char(char c) static void riscv_output_char(char c)
{ {
(*riscv_console.write_polled)(riscv_console.context, &c, 1); (*riscv_console.putchar)(riscv_console.context, c);
} }
static int riscv_get_console_node(const void *fdt) static int riscv_get_console_node(const void *fdt)
@@ -76,8 +72,8 @@ static void riscv_console_probe(void)
htif_console_context_init(&htif_console_instance.base, node); htif_console_context_init(&htif_console_instance.base, node);
riscv_console.context = &htif_console_instance.base; riscv_console.context = &htif_console_instance.base;
riscv_console.write_polled = htif_console_write_polled; riscv_console.putchar = htif_console_putchar;
riscv_console.poll_char = htif_console_poll_char; riscv_console.getchar = htif_console_getchar;
}; };
#endif #endif

13
bsps/riscv/riscv/console/htif.c
View File

@@ -73,7 +73,7 @@ static void __set_tohost(uintptr_t dev, uintptr_t cmd, uintptr_t data)
tohost = TOHOST_CMD(dev, cmd, data); tohost = TOHOST_CMD(dev, cmd, data);
} }
int htif_console_poll_char(rtems_termios_device_context *base) int htif_console_getchar(rtems_termios_device_context *base)
{ {
__check_fromhost(); __check_fromhost();
int ch = htif_console_buf; int ch = htif_console_buf;
@@ -85,7 +85,12 @@ int htif_console_poll_char(rtems_termios_device_context *base)
return ch - 1; return ch - 1;
} }
void htif_console_write_polled( void htif_console_putchar(rtems_termios_device_context *base, char c)
{
__set_tohost(1, 1, c);
}
static void htif_console_write_polled(
rtems_termios_device_context *base, rtems_termios_device_context *base,
const char *buf, const char *buf,
size_t len size_t len
@@ -94,7 +99,7 @@ void htif_console_write_polled(
size_t i; size_t i;
for (i = 0; i < len; ++i) { for (i = 0; i < len; ++i) {
__set_tohost(1, 1, buf[i]); htif_console_putchar(base, buf[i]);
} }
} }
@@ -127,6 +132,6 @@ static bool htif_console_first_open(
const rtems_termios_device_handler htif_console_handler = { const rtems_termios_device_handler htif_console_handler = {
.first_open = htif_console_first_open, .first_open = htif_console_first_open,
.write = htif_console_write_polled, .write = htif_console_write_polled,
.poll_read = htif_console_poll_char, .poll_read = htif_console_getchar,
.mode = TERMIOS_POLLED .mode = TERMIOS_POLLED
}; };

8
bsps/riscv/riscv/include/dev/serial/htif.h
View File

@@ -41,13 +41,9 @@ void htif_console_context_init(
int device_tree_node int device_tree_node
); );
void htif_console_write_polled( void htif_console_putchar(rtems_termios_device_context *base, char c);
rtems_termios_device_context *base,
const char *buf,
size_t len
);
int htif_console_poll_char(rtems_termios_device_context *base); int htif_console_getchar(rtems_termios_device_context *base);
const rtems_termios_device_handler htif_console_handler; const rtems_termios_device_handler htif_console_handler;