Changeset 19b3cc6 in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

Timestamp:

2014-01-17T23:12:10Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e26a9d95

Parents:

fddffb2 (diff), facc34d (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 libdrv-cleanup branch (includes mainline changes)

File:

• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (6 diffs)

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -37 +37 @@
 #include <ipc/irq.h>
 #include <console/chardev.h>
+#include <genarch/drivers/pl011/pl011.h>
 #include <genarch/drivers/pl050/pl050.h>
-#include <genarch/drivers/arm926_uart/arm926_uart.h>
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
-#include <print.h>
 #include <ddi/device.h>
 #include <mm/page.h>
@@ -53 +52 @@
 #include <abi/fb/visuals.h>
 #include <ddi/ddi.h>
-#include <print.h>
+#include <log.h>
+
 
 
@@ -61 +61 @@
         icp_hw_map_t hw_map;
         irq_t timer_irq;
-        arm926_uart_t uart;
+        pl011_uart_t uart;
 } icp;
 
@@ -275 +275 @@
                         } else {
                                 /* Spurious interrupt.*/
-                                printf("cpu%d: spurious interrupt (inum=%d)\n",
+                                log(LF_ARCH, LVL_DEBUG,
+                                    "cpu%d: spurious interrupt (inum=%d)",
                                     CPU->id, i);
                         }
@@ -314 +315 @@
                 stdout_wire(fbdev);
 #endif
-#ifdef CONFIG_ARM926_UART
-        if (arm926_uart_init(&icp.uart, ARM926_UART0_IRQ,
-            ARM926_UART0_BASE_ADDRESS, sizeof(arm926_uart_regs_t)))
+#ifdef CONFIG_PL011_UART
+        if (pl011_uart_init(&icp.uart, ICP_UART0_IRQ, ICP_UART))
                 stdout_wire(&icp.uart.outdev);
 #endif
@@ -350 +350 @@
             ICP_KBD);
 
-#ifdef CONFIG_ARM926_UART
+#ifdef CONFIG_PL011_UART
         srln_instance_t *srln_instance = srln_init();
         if (srln_instance) {
                 indev_t *sink = stdin_wire();
                 indev_t *srln = srln_wire(srln_instance, sink);
-                arm926_uart_input_wire(&icp.uart, srln);
-                icp_irqc_unmask(ARM926_UART0_IRQ);
+                pl011_uart_input_wire(&icp.uart, srln);
+                icp_irqc_unmask(ICP_UART0_IRQ);
         }
 #endif