exception handling maintenance

8 files changed, 27 insertions, 18 deletions

diff --git a/c/src/lib/libcpu/arm/ChangeLog b/c/src/lib/libcpu/arm/ChangeLog
index b553d5f050..91d633c1dd 100644
--- a/c/src/lib/libcpu/arm/ChangeLog
+++ b/c/src/lib/libcpu/arm/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-15	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* Makefile.am: Removed references to deleted file
+	'../../libbsp/arm/shared/irq/irq_asm.S'.
+	* s3c2410/irq/bsp_irq_asm.S, lpc22xx/irq/bsp_irq_asm.S,
+	pxa255/irq/bsp_irq_asm.S, mc9328mxl/irq/bsp_irq_asm.S,
+	at91rm9200/irq/bsp_irq_asm.S, s3c2400/irq/bsp_irq_asm.S: Renamed
+	ExecuteITHandler() into bsp_interrupt_dispatch().
+
 2009-07-10	Xi Yang <hiyangxi@gmail.com>
 
 	* Makefile.am, pxa255/ffuart/ffuart.c, pxa255/include/pxa255.h,
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index fd11fdee4f..317942fd22 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -55,7 +55,7 @@ include_HEADERS += pxa255/irq/irq.h
 noinst_PROGRAMS += pxa255/irq.rel
 pxa255_irq_rel_SOURCES = pxa255/irq/irq.c pxa255/irq/bsp_irq_init.c \
     ../../libbsp/arm/shared/irq/irq_init.c pxa255/irq/bsp_irq_asm.S \
-    ../../libbsp/arm/shared/irq/irq_asm.S pxa255/irq/irq.h
+    pxa255/irq/irq.h
 pxa255_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
 pxa255_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
@@ -95,7 +95,7 @@ include_HEADERS += at91rm9200/irq/irq.h
 noinst_PROGRAMS += at91rm9200/irq.rel
 at91rm9200_irq_rel_SOURCES = at91rm9200/irq/irq.c at91rm9200/irq/bsp_irq_init.c \
     ../../libbsp/arm/shared/irq/irq_init.c at91rm9200/irq/bsp_irq_asm.S \
-    ../../libbsp/arm/shared/irq/irq_asm.S at91rm9200/irq/irq.h
+    at91rm9200/irq/irq.h
 at91rm9200_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
 at91rm9200_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
@@ -121,7 +121,7 @@ include_HEADERS += mc9328mxl/irq/irq.h
 noinst_PROGRAMS += mc9328mxl/irq.rel
 mc9328mxl_irq_rel_SOURCES = mc9328mxl/irq/irq.c mc9328mxl/irq/bsp_irq_init.c \
     ../../libbsp/arm/shared/irq/irq_init.c mc9328mxl/irq/bsp_irq_asm.S \
-    ../../libbsp/arm/shared/irq/irq_asm.S mc9328mxl/irq/irq.h
+    mc9328mxl/irq/irq.h
 mc9328mxl_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
 mc9328mxl_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
@@ -147,7 +147,7 @@ include_HEADERS += s3c2400/irq/irq.h
 noinst_PROGRAMS += s3c2400/irq.rel
 s3c2400_irq_rel_SOURCES = s3c24xx/irq/irq.c s3c24xx/irq/bsp_irq_init.c \
     ../../libbsp/arm/shared/irq/irq_init.c s3c2400/irq/bsp_irq_asm.S \
-    ../../libbsp/arm/shared/irq/irq_asm.S s3c2400/irq/irq.h
+    s3c2400/irq/irq.h
 s3c2400_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
 s3c2400_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
@@ -173,7 +173,7 @@ include_HEADERS += s3c2410/irq/irq.h
 noinst_PROGRAMS += s3c2410/irq.rel
 s3c2410_irq_rel_SOURCES = s3c24xx/irq/irq.c s3c24xx/irq/bsp_irq_init.c \
     ../../libbsp/arm/shared/irq/irq_init.c s3c2410/irq/bsp_irq_asm.S \
-    ../../libbsp/arm/shared/irq/irq_asm.S s3c2410/irq/irq.h
+    s3c2410/irq/irq.h
 s3c2410_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
 s3c2410_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
@@ -199,7 +199,7 @@ include_HEADERS += lpc22xx/irq/irq.h
 noinst_PROGRAMS += lpc22xx/irq.rel
 lpc22xx_irq_rel_SOURCES = lpc22xx/irq/irq.c lpc22xx/irq/bsp_irq_init.c \
     ../../libbsp/arm/shared/irq/irq_init.c lpc22xx/irq/bsp_irq_asm.S \
-    ../../libbsp/arm/shared/irq/irq_asm.S lpc22xx/irq/irq.h
+    lpc22xx/irq/irq.h
 lpc22xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
 lpc22xx_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
diff --git a/c/src/lib/libcpu/arm/at91rm9200/irq/bsp_irq_asm.S b/c/src/lib/libcpu/arm/at91rm9200/irq/bsp_irq_asm.S
index 87ab9ee823..75952e9631 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/irq/bsp_irq_asm.S
+++ b/c/src/lib/libcpu/arm/at91rm9200/irq/bsp_irq_asm.S
@@ -13,8 +13,8 @@
  */
 #define __asm__
         
-        .globl ExecuteITHandler
-ExecuteITHandler :
+        .globl bsp_interrupt_dispatch
+bsp_interrupt_dispatch :
 /*
  * Look at interrupt status register to determine source.
  * From source, determine offset into expanded vector table
diff --git a/c/src/lib/libcpu/arm/lpc22xx/irq/bsp_irq_asm.S b/c/src/lib/libcpu/arm/lpc22xx/irq/bsp_irq_asm.S
index e99a346007..d8181055c3 100644
--- a/c/src/lib/libcpu/arm/lpc22xx/irq/bsp_irq_asm.S
+++ b/c/src/lib/libcpu/arm/lpc22xx/irq/bsp_irq_asm.S
@@ -19,8 +19,8 @@
  * handler.
  * Called from ISR_Handler, It is better to write in C function
  */
-	.globl ExecuteITHandler
-ExecuteITHandler :
+	.globl bsp_interrupt_dispatch
+bsp_interrupt_dispatch :
 #ifdef __thumb__
     .code 16
 #endif
diff --git a/c/src/lib/libcpu/arm/mc9328mxl/irq/bsp_irq_asm.S b/c/src/lib/libcpu/arm/mc9328mxl/irq/bsp_irq_asm.S
index b528516d11..bcb3ba0e19 100644
--- a/c/src/lib/libcpu/arm/mc9328mxl/irq/bsp_irq_asm.S
+++ b/c/src/lib/libcpu/arm/mc9328mxl/irq/bsp_irq_asm.S
@@ -18,8 +18,8 @@
  * you do determine which interrupt happened and call its
  * handler.
  */
-	.globl ExecuteITHandler
-ExecuteITHandler :
+	.globl bsp_interrupt_dispatch
+bsp_interrupt_dispatch :
 /*
  * Look at interrupt status register to determine source.
  * From source, determine offset into expanded vector table
diff --git a/c/src/lib/libcpu/arm/pxa255/irq/bsp_irq_asm.S b/c/src/lib/libcpu/arm/pxa255/irq/bsp_irq_asm.S
index cda40aa9de..ada3b67821 100755
--- a/c/src/lib/libcpu/arm/pxa255/irq/bsp_irq_asm.S
+++ b/c/src/lib/libcpu/arm/pxa255/irq/bsp_irq_asm.S
@@ -11,8 +11,8 @@
 
 #define __asm__
         
-        .globl ExecuteITHandler
-ExecuteITHandler :
+        .globl bsp_interrupt_dispatch
+bsp_interrupt_dispatch :
 /*
  * Look at interrupt status register to determine source.
  * From source, determine offset into expanded vector table
diff --git a/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S b/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S
index e966d747ff..5fab93dc2f 100644
--- a/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S
+++ b/c/src/lib/libcpu/arm/s3c2400/irq/bsp_irq_asm.S
@@ -19,9 +19,9 @@
  * Function to obtain, execute an IT handler and acknowledge the IT 
  */
 
-        .globl ExecuteITHandler
+        .globl bsp_interrupt_dispatch
         
-ExecuteITHandler :      
+bsp_interrupt_dispatch :      
 
         ldr     r0, =0x14400014  /* Read rINTOFFSET */
         ldr     r1, [r0]
diff --git a/c/src/lib/libcpu/arm/s3c2410/irq/bsp_irq_asm.S b/c/src/lib/libcpu/arm/s3c2410/irq/bsp_irq_asm.S
index cb7c911f9e..b381bbd471 100644
--- a/c/src/lib/libcpu/arm/s3c2410/irq/bsp_irq_asm.S
+++ b/c/src/lib/libcpu/arm/s3c2410/irq/bsp_irq_asm.S
@@ -19,9 +19,9 @@
  * Function to obtain, execute an IT handler and acknowledge the IT
  */
 
-        .globl ExecuteITHandler
+        .globl bsp_interrupt_dispatch
 
-ExecuteITHandler :
+bsp_interrupt_dispatch :
 
         ldr     r0, =0x4A000014 /* Read rINTOFFSET */
         ldr     r1, [r0]