Changeset bc73be3 in mainline for kernel/genarch/src/drivers/ns16550/ns16550.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• kernel/genarch/src/drivers/ns16550/ns16550.c (modified) (4 diffs)

kernel/genarch/src/drivers/ns16550/ns16550.c

@@ -39 +39 @@
 #include <genarch/drivers/ns16550/ns16550.h>
 #include <ddi/irq.h>
+#include <ddi/ddi.h>
 #include <arch/asm.h>
 #include <console/chardev.h>
 #include <stdlib.h>
+#include <align.h>
 #include <str.h>
 
@@ -143 +145 @@
  *
  */
-ns16550_instance_t *ns16550_init(ioport8_t *dev, unsigned reg_shift, inr_t inr,
-    cir_t cir, void *cir_arg, outdev_t **output)
-{
-        ns16550_instance_t *instance =
-            malloc(sizeof(ns16550_instance_t));
+ns16550_instance_t *ns16550_init(ioport8_t *dev_phys, unsigned reg_shift,
+    inr_t inr, cir_t cir, void *cir_arg, outdev_t **output)
+{
+        size_t size = 6 * (1U << reg_shift);
+        ioport8_t *dev = pio_map((void *) dev_phys, size);
+
+        ns16550_instance_t *instance = malloc(sizeof(ns16550_instance_t));
         if (instance) {
                 instance->ns16550 = dev;
@@ -158 +162 @@
                         if (!instance->output) {
                                 free(instance);
+                                pio_unmap((void *) dev_phys, (void *) dev,
+                                    size);
                                 return NULL;
                         }
@@ -176 +182 @@
 
                 ddi_parea_init(&instance->parea);
-                instance->parea.pbase = (uintptr_t) dev;
-                instance->parea.frames = 1;
+                instance->parea.pbase = ALIGN_DOWN((uintptr_t) dev_phys,
+                    PAGE_SIZE);
+                instance->parea.frames = ALIGN_UP(size, PAGE_SIZE);
                 instance->parea.unpriv = false;
                 instance->parea.mapped = false;