From: John Hodge <tpg@mutabah.net>
Date: Sun, 22 Sep 2013 11:20:13 +0000 (+0800)
Subject: Kernel/armv7 - Missing files for 25398a7f24d189ee7a70fcf0e64827cbc8999028
X-Git-Tag: rel0.15~187
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=a26cf54691097b509fad23be0f0e242147f25c07;p=tpg%2Facess2.git

Kernel/armv7 - Missing files for 25398a7f24d189ee7a70fcf0e64827cbc8999028
---

diff --git a/KernelLand/Kernel/arch/armv7/include/options.h b/KernelLand/Kernel/arch/armv7/include/options.h
index 95345ed6..9289891a 100644
--- a/KernelLand/Kernel/arch/armv7/include/options.h
+++ b/KernelLand/Kernel/arch/armv7/include/options.h
@@ -14,6 +14,7 @@
 
 #if PLATFORM_is_realview_pb
 # define UART0_PADDR	0x10009000	// Realview
+# define UART0_IRQ	12	// IRQ 12
 # define GICI_PADDR	0x1e000000
 # define GICD_PADDR	0x1e001000
 # define PL110_BASE	0x10020000	// Integrator
@@ -22,6 +23,7 @@
 
 #if PLATFORM_is_tegra2	// Tegra2
 # define UART0_PADDR	0x70006000
+# define UART0_IRQ	0
 # define GICD_PADDR	0x50041000
 # define GICI_PADDR	0x50040100
 //# define PL110_BASE	0x10020000	// Integrator
diff --git a/KernelLand/Kernel/arch/armv7/main.c b/KernelLand/Kernel/arch/armv7/main.c
index 903f5fc7..b5176b26 100644
--- a/KernelLand/Kernel/arch/armv7/main.c
+++ b/KernelLand/Kernel/arch/armv7/main.c
@@ -8,6 +8,7 @@
 
 #include <acess.h>
 #include <modules.h>
+#include "include/options.h"
 
 // === IMPORTS ===
 extern void	Interrupts_Setup(void);
@@ -16,6 +17,7 @@ extern void	Heap_Install(void);
 extern void	Threads_Init(void);
 extern void	System_Init(const char *Commandline);
 extern void	Time_Setup(void);
+extern void	Debug_int_SerialIRQHandler(int IRQ, void *unused);
 
 // === PROTOTYPES ===
  int	kmain(void);
@@ -42,6 +44,7 @@ int kmain(void)
 	// Boot modules?
 	// - most ARMv7 configs use a GIC
 	Module_EnsureLoaded("armv7_GIC");
+	IRQ_AddHandler(UART0_IRQ, Debug_int_SerialIRQHandler, NULL);
 	
 	Time_Setup();