Changeset f4cfd271 in mainline for uspace/drv/char/sun4v-con/sun4v-con.c

Timestamp:

2017-11-26T10:22:30Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

474c68b

Parents:

5f4c41b2

Message:

Sun4v-con should get output buffer address via hw_res, too.

File:

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

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

@@ -38 +38 @@
 #include <io/chardev_srv.h>
 #include <stdbool.h>
-#include <sysinfo.h>
 
 #include "sun4v-con.h"
@@ -115 +114 @@
         ddf_fun_set_conn_handler(fun, sun4v_con_connection);
 
-        rc = physmem_map(res->base, 1, AS_AREA_READ | AS_AREA_WRITE,
+        rc = physmem_map(res->in_base, 1, AS_AREA_READ | AS_AREA_WRITE,
             (void *) &input_buffer);
         if (rc != EOK) {
@@ -122 +121 @@
         }
 
-        sysarg_t paddr;
-        rc = sysinfo_get_value("niagara.outbuf.address", &paddr);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Outbuf address information not found");
-                return rc;
-        }
-
         output_fifo = (output_fifo_t *) AS_AREA_ANY;
 
-        rc = physmem_map(paddr, 1, AS_AREA_READ | AS_AREA_WRITE,
+        rc = physmem_map(res->out_base, 1, AS_AREA_READ | AS_AREA_WRITE,
             (void *) &output_fifo);
         if (rc != EOK) {
@@ -150 +142 @@
         if (input_buffer != (input_buffer_t) AS_AREA_ANY)
                 physmem_unmap((void *) input_buffer);
+
+        if (output_fifo != (output_fifo_t *) AS_AREA_ANY)
+                physmem_unmap((void *) output_fifo);
 
         if (fun != NULL)