Changeset 7de5f12 in mainline for uspace/drv/char

Timestamp:

2017-11-15T20:23:50Z (8 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.

Location:

uspace/drv/char/msim-con

Files:

• main.c (modified) (3 diffs)
• msim-con.c (modified) (4 diffs)
• msim-con.h (modified) (1 diff)

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

@@ -35 +35 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <device/hw_res_parsed.h>
 #include <errno.h>
 #include <stdio.h>
@@ -61 +62 @@
 };
 
+static int msim_con_get_res(ddf_dev_t *dev, msim_con_res_t *res)
+{
+        async_sess_t *parent_sess;
+        hw_res_list_parsed_t hw_res;
+        int rc;
+
+        parent_sess = ddf_dev_parent_sess_get(dev);
+        if (parent_sess == NULL)
+                return ENOMEM;
+
+        hw_res_list_parsed_init(&hw_res);
+        rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        if (rc != EOK)
+                return rc;
+
+        if (hw_res.mem_ranges.count != 1) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        res->base = RNGABS(hw_res.mem_ranges.ranges[0]);
+
+        if (hw_res.irqs.count != 1) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        res->irq = hw_res.irqs.irqs[0];
+
+        return EOK;
+error:
+        hw_res_list_parsed_clean(&hw_res);
+        return rc;
+}
+
 static int msim_con_dev_add(ddf_dev_t *dev)
 {
         msim_con_t *msim_con;
+        msim_con_res_t res;
+        int rc;
 
         ddf_msg(LVL_DEBUG, "msim_con_dev_add(%p)", dev);
+
         msim_con = ddf_dev_data_alloc(dev, sizeof(msim_con_t));
         if (msim_con == NULL) {
@@ -74 +113 @@
         msim_con->dev = dev;
 
-        return msim_con_add(msim_con);
+        rc = msim_con_get_res(dev, &res);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed getting hardware resource list.\n");
+                return EIO;
+        }
+
+        return msim_con_add(msim_con, &res);
 }
 

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);

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

@@ -41 +41 @@
 #include <stdint.h>
 
+/** MSIM console resources */
+typedef struct {
+        uintptr_t base;
+        int irq;
+} msim_con_res_t;
+
 /** MSIM console */
 typedef struct {
         async_sess_t *client_sess;
         ddf_dev_t *dev;
+        msim_con_res_t res;
 } msim_con_t;
 
-extern int msim_con_add(msim_con_t *);
+extern int msim_con_add(msim_con_t *, msim_con_res_t *);
 extern int msim_con_remove(msim_con_t *);
 extern int msim_con_gone(msim_con_t *);