Changeset bc73be3 in mainline for kernel/genarch/src/drivers/dsrln/dsrlnout.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/dsrln/dsrlnout.c (modified) (2 diffs)

kernel/genarch/src/drivers/dsrln/dsrlnout.c

@@ -68 +68 @@
 };
 
-outdev_t *dsrlnout_init(ioport8_t *base)
+outdev_t *dsrlnout_init(ioport8_t *base, uintptr_t base_phys)
 {
         outdev_t *dsrlndev = malloc(sizeof(outdev_t));
@@ -85 +85 @@
         instance->base = base;
         ddi_parea_init(&instance->parea);
-        instance->parea.pbase = KA2PA(base);
+        instance->parea.pbase = base_phys;
         instance->parea.frames = 1;
         instance->parea.unpriv = false;