Changeset b0b4592e in mainline for kernel/arch/arm32/src/mach/gta02/gta02.c

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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 changes

File:

• kernel/arch/arm32/src/mach/gta02/gta02.c (modified) (3 diffs)

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

@@ -41 +41 @@
 #include <genarch/fb/fb.h>
 #include <abi/fb/visuals.h>
-#include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
-#include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
-#include <genarch/drivers/s3c24xx_timer/s3c24xx_timer.h>
+#include <genarch/drivers/s3c24xx/uart.h>
+#include <genarch/drivers/s3c24xx/irqc.h>
+#include <genarch/drivers/s3c24xx/timer.h>
 #include <genarch/srln/srln.h>
 #include <sysinfo/sysinfo.h>
@@ -49 +49 @@
 #include <ddi/ddi.h>
 #include <ddi/device.h>
+#include <log.h>
 
 #define GTA02_MEMORY_START      0x30000000      /* physical */
@@ -149 +150 @@
         } else {
                 /* Spurious interrupt.*/
-                printf("cpu%d: spurious interrupt (inum=%d)\n",
+                log(LF_ARCH, LVL_DEBUG, "cpu%d: spurious interrupt (inum=%d)",
                     CPU->id, inum);
         }