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

Timestamp:

2018-02-22T19:39:53Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

0539c14

Parents:

5fe3f954 (diff), df368491 (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 commit 'df368491aa1c0ce3024a51c602b7d0cbe4bd84d3'

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (1 diff)

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

@@ -118 +118 @@
         size_t offset = pa - aligned_addr;
         
-        ns16550_t *ns16550 = (ns16550_t *) (km_map(aligned_addr, offset + size,
+        ioport8_t *ns16550 = (ioport8_t *) (km_map(aligned_addr, offset + size,
             PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
         
-        ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir,
+        ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, 0, inr, cir,
             cir_arg, NULL);
         if (ns16550_instance) {