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

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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 mainline

File:

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

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

@@ -35 +35 @@
  */
 
+#include <assert.h>
 #include <genarch/drivers/pl011/pl011.h>
 #include <console/chardev.h>
 #include <console/console.h>
-#include <ddi/device.h>
 #include <arch/asm.h>
 #include <mm/slab.h>
@@ -98 +98 @@
 bool pl011_uart_init(pl011_uart_t *uart, inr_t interrupt, uintptr_t addr)
 {
-        ASSERT(uart);
+        assert(uart);
         uart->regs = (void*)km_map(addr, sizeof(pl011_uart_regs_t),
                                    PAGE_NOT_CACHEABLE);
-        ASSERT(uart->regs);
+        assert(uart->regs);
 
         /* Disable UART */
@@ -126 +126 @@
         /* Initialize IRQ */
         irq_initialize(&uart->irq);
-        uart->irq.devno = device_assign_devno();
         uart->irq.inr = interrupt;
         uart->irq.claim = pl011_uart_claim;
@@ -137 +136 @@
 void pl011_uart_input_wire(pl011_uart_t *uart, indev_t *indev)
 {
-        ASSERT(uart);
-        ASSERT(indev);
+        assert(uart);
+        assert(indev);
 
         uart->indev = indev;