Changeset 7de5f12 in mainline for uspace/drv/char/msim-con/msim-con.c

Timestamp:

2017-11-15T20:23:50Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ac1243d, 7f4937e

Parents:

e7a8bd2

Message:

MSIM console driver can use hw_res instead of sysinfo for configuration.

File:

• uspace/drv/char/msim-con/msim-con.c (modified) (4 diffs)

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

@@ -38 +38 @@
 #include <errno.h>
 #include <ipc/char.h>
-#include <sysinfo.h>
 
 #include "msim-con.h"
@@ -84 +83 @@
 
 /** Add msim console device. */
-int msim_con_add(msim_con_t *con)
+int msim_con_add(msim_con_t *con, msim_con_res_t *res)
 {
         ddf_fun_t *fun = NULL;
         bool subscribed = false;
         int rc;
+
+        con->res = *res;
 
         fun = ddf_fun_create(con->dev, fun_exposed, "a");
@@ -99 +100 @@
         ddf_fun_set_conn_handler(fun, msim_con_connection);
 
-        sysarg_t paddr;
-        if (sysinfo_get_value("kbd.address.physical", &paddr) != EOK) {
-                rc = ENOENT;
-                goto error;
-        }
-
-        sysarg_t inr;
-        if (sysinfo_get_value("kbd.inr", &inr) != EOK) {
-                rc = ENOENT;
-                goto error;
-        }
-
-        msim_ranges[0].base = paddr;
-        msim_cmds[0].addr = (void *) paddr;
-        async_irq_subscribe(inr, msim_irq_handler, con, &msim_kbd);
+        msim_ranges[0].base = res->base;
+        msim_cmds[0].addr = (void *) res->base;
+        async_irq_subscribe(res->irq, msim_irq_handler, con, &msim_kbd);
         subscribed = true;
 
@@ -125 +114 @@
 error:
         if (subscribed)
-                async_irq_unsubscribe(inr);
+                async_irq_unsubscribe(res->irq);
         if (fun != NULL)
                 ddf_fun_destroy(fun);