Changeset 38b0ae2 in mainline for kernel/arch

Timestamp:

2018-02-12T20:16:44Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

448e093

Parents:

8192d8a

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-12 20:16:44)

git-committer:

GitHub <noreply@…> (2018-02-12 20:16:44)

Message:

Generalize ns16550 driver to work with more chips. (#20)

Some UART controllers are compatible with 16550A, but have more spacing
between registers. In particular, ARMADA 385, which is the basis of
Turris Omnia router, has a compatible UART with 32b registers instead of 8b
(with the top three bytes unused).

Note: The device tree file hints that some UARTs may need register reads/writes
that are wider than 8 bits, and this commit does not address that possibility.

Location:

kernel/arch

Files:

• amd64/src/amd64.c (modified) (1 diff)
• ia32/src/ia32.c (modified) (1 diff)
• ia64/src/ia64.c (modified) (1 diff)
• sparc64/src/drivers/kbd.c (modified) (1 diff)

kernel/arch/amd64/src/amd64.c

@@ -216 +216 @@
 #endif
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL,
+            = ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL,
             ns16550_out_ptr);
         if (ns16550_instance) {

kernel/arch/ia32/src/ia32.c

@@ -201 +201 @@
 #endif
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL,
+            = ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL,
             ns16550_out_ptr);
         if (ns16550_instance) {

kernel/arch/ia64/src/ia64.c

@@ -181 +181 @@
 #ifdef CONFIG_NS16550
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL,
+            = ns16550_init(NS16550_BASE, 0, NS16550_IRQ, NULL, NULL,
             NULL);
         if (ns16550_instance) {

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