Changeset 3e828ea in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (3 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -38 +38 @@
 #include <console/console.h>
 #include <ddi/irq.h>
-#include <mm/page.h>
-#include <arch/mm/page.h>
-#include <mm/km.h>
 #include <typedefs.h>
 #include <align.h>
@@ -88 +85 @@
         }
 
-        size_t size = ((ofw_ebus_reg_t *) prop->value)->size;
-
         uintptr_t pa = 0; // Prevent -Werror=maybe-uninitialized
         if (!ofw_ebus_apply_ranges(node->parent,
@@ -109 +104 @@
         }
 
-        ioport8_t *ns16550 = (ioport8_t *) km_map(pa, size,
-            KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_NOT_CACHEABLE);
-
-        ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, 0, inr, cir,
-            cir_arg, NULL);
+        ns16550_instance_t *ns16550_instance = ns16550_init((ioport8_t *) pa, 0,
+            inr, cir, cir_arg, NULL);
         if (ns16550_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();