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

Timestamp:

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

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/pl011/pl011.c (modified) (3 diffs)

kernel/genarch/src/drivers/pl011/pl011.c

@@ -60 +60 @@
         pl011_uart_t *uart = dev->data;
 
-        if (!ascii_check(ch)) {
+        /* If the userspace owns the console, do not output anything. */
+        if (uart->parea.mapped && !console_override)
+                return;
+
+        if (!ascii_check(ch))
                 pl011_uart_sendb(uart, U_SPECIAL);
-        } else {
+        else {
                 if (ch == '\n')
                         pl011_uart_sendb(uart, (uint8_t) '\r');
@@ -100 +104 @@
         assert(uart);
         uart->regs = (void *)km_map(addr, sizeof(pl011_uart_regs_t),
-            KM_NATURAL_ALIGNMENT, PAGE_NOT_CACHEABLE);
+            KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_NOT_CACHEABLE);
         assert(uart->regs);
 
@@ -131 +135 @@
         uart->irq.instance = uart;
 
+        ddi_parea_init(&uart->parea);
+        uart->parea.pbase = addr;
+        uart->parea.frames = 1;
+        uart->parea.unpriv = false;
+        uart->parea.mapped = false;
+        ddi_parea_register(&uart->parea);
+
         return true;
 }