Changeset c309b18 in mainline for uspace/drv/char

Timestamp:

2017-11-27T16:35:20Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

07a70800

Parents:

59953b57

Message:

Move sending side of MSIM console driver out of output server.

Location:

uspace/drv/char/msim-con

Files:

• msim-con.c (modified) (3 diffs)
• msim-con.h (modified) (2 diffs)

uspace/drv/char/msim-con/msim-con.c

@@ -106 +106 @@
         }
 
+        rc = pio_enable((void *)res->base, 1, (void **) &con->out_reg);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error enabling I/O");
+                goto error;
+        }
+
         ddf_fun_set_conn_handler(fun, msim_con_connection);
 
@@ -131 +137 @@
                 goto error;
         }
+
+        ddf_fun_add_to_category(fun, "console");
 
         return EOK;
@@ -157 +165 @@
 static void msim_con_putchar(msim_con_t *con, uint8_t ch)
 {
+        pio_write_8(con->out_reg, ch);
 }
 

uspace/drv/char/msim-con/msim-con.h

@@ -39 +39 @@
 #include <async.h>
 #include <ddf/driver.h>
+#include <ddi.h>
 #include <fibril_synch.h>
 #include <io/chardev_srv.h>
@@ -66 +67 @@
         fibril_mutex_t buf_lock;
         fibril_condvar_t buf_cv;
+        ioport8_t *out_reg;
 } msim_con_t;