Changeset 31f90a2 in rtems

Timestamp:

07/06/18 11:52:22 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

1a19239

Parents:

bca36d9

git-author:

Sebastian Huber <sebastian.huber@…> (07/06/18 11:52:22)

git-committer:

Sebastian Huber <sebastian.huber@…> (07/06/18 12:27:29)

Message:

bsp/riscv: Simplify printk() support

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

Update #3433.

Location:

bsps/riscv/riscv

Files:

• console/console-config.c (modified) (2 diffs)
• console/htif.c (modified) (4 diffs)
• include/dev/serial/htif.h (modified) (1 diff)

bsps/riscv/riscv/console/console-config.c

@@ -32 +32 @@
 static struct {
   rtems_termios_device_context *context;
-  void (*write_polled)(
-    rtems_termios_device_context *base,
-    const char *buf,
-    size_t len
-  );
-  int (*poll_char)(rtems_termios_device_context *base);
+  void (*putchar)(rtems_termios_device_context *base, char c);
+  int (*getchar)(rtems_termios_device_context *base);
 } riscv_console;
 
 static void riscv_output_char(char c)
 {
-  (*riscv_console.write_polled)(riscv_console.context, &c, 1);
+  (*riscv_console.putchar)(riscv_console.context, c);
 }
 
@@ -77 +73 @@
 
       riscv_console.context = &htif_console_instance.base;
-      riscv_console.write_polled = htif_console_write_polled;
-      riscv_console.poll_char = htif_console_poll_char;
+      riscv_console.putchar = htif_console_putchar;
+      riscv_console.getchar = htif_console_getchar;
     };
 #endif

bsps/riscv/riscv/console/htif.c

@@ -74 +74 @@
 }
 
-int htif_console_poll_char(rtems_termios_device_context *base)
+int htif_console_getchar(rtems_termios_device_context *base)
 {
   __check_fromhost();
@@ -86 +86 @@
 }
 
-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,
   const char *buf,
@@ -95 +100 @@
 
   for (i = 0; i < len; ++i) {
-    __set_tohost(1, 1, buf[i]);
+    htif_console_putchar(base, buf[i]);
   }
 }
@@ -128 +133 @@
   .first_open = htif_console_first_open,
   .write = htif_console_write_polled,
-  .poll_read = htif_console_poll_char,
+  .poll_read = htif_console_getchar,
   .mode = TERMIOS_POLLED
 };

bsps/riscv/riscv/include/dev/serial/htif.h

@@ -42 +42 @@
 );
 
-void htif_console_write_polled(
-  rtems_termios_device_context *base,
-  const char *buf,
-  size_t len
-);
+void htif_console_putchar(rtems_termios_device_context *base, char c);
 
-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;