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

Timestamp:

2012-01-28T09:17:24Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ca3d77a

Parents:

8da2c60 (diff), 9970a5a (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.

Message:

Merge with mainline

File:

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

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

@@ -40 +40 @@
 #include <mm/page.h>
 #include <arch/mm/page.h>
+#include <mm/km.h>
 #include <typedefs.h>
 #include <align.h>
@@ -113 +114 @@
         size_t offset = pa - aligned_addr;
         
-        ns16550_t *ns16550 = (ns16550_t *)
-           (hw_map(aligned_addr, offset + size) + offset);
+        ns16550_t *ns16550 = (ns16550_t *) (km_map(aligned_addr, offset + size,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
         
         ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir, cir_arg);