Changes in kernel/genarch/src/drivers/pl011/pl011.c [24abb85d:7ddc2c7] in 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;
@@ -136 +137 @@
 void pl011_uart_input_wire(pl011_uart_t *uart, indev_t *indev)
 {
-        assert(uart);
-        assert(indev);
+        ASSERT(uart);
+        ASSERT(indev);
 
         uart->indev = indev;