2008-08-20 Sebastian Huber <sebastian.huber@embedded-brains.de>

	* include/tm27.h: Uses now a decrementer exception handler.  Replaces
	previous file.
	* startup/bspstart.c: Install a default decrementer exception handler.

3 files changed, 69 insertions, 50 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
index f6a7b4dfcc..6f36141809 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen83xx/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-20	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* include/tm27.h: Uses now a decrementer exception handler.  Replaces
+	previous file.
+	* startup/bspstart.c: Install a default decrementer exception handler.
+
 2008-08-19	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* include/bsp.h, network/network.c, spi/spi_init.c, startup/cpuinit.c,
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h b/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
index 2c85c3156e..de0a7dba4d 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
+++ b/c/src/lib/libbsp/powerpc/gen83xx/include/tm27.h
@@ -1,63 +1,63 @@
-/*
- *  tm27.h
+/**
+ * @file
  *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
+ * @brief Support file for Timer Test 27.
+ */
+
+/*
+ * Copyright (c) 2008
+ * Embedded Brains GmbH
+ * Obere Lagerstr. 30
+ * D-82178 Puchheim
+ * Germany
+ * rtems@embedded-brains.de
  *
- *  tm27.h,v 1.2 2004/04/23 04:47:38 ralf Exp
+ * The license and distribution terms for this file may be found in the file
+ * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
  */
 
 #ifndef _RTEMS_TMTEST27
-#error "This is an RTEMS internal file you must not include directly."
-#endif
+  #error "This is an RTEMS internal file you must not include directly."
+#endif /* _RTEMS_TMTEST27 */
 
-#ifndef __tm27_h
-#define __tm27_h
+#ifndef TMTESTS_TM27_H
+#define TMTESTS_TM27_H
 
-#include <bsp/irq.h>
+#include <libcpu/powerpc-utility.h>
+#include <libcpu/raw_exception.h>
 
-/*
- *  Stuff for Time Test 27
- */
+#include <bsp/ppc_exc_bspsupp.h>
 
 #define MUST_WAIT_FOR_INTERRUPT 1
 
-void nullFunc() {}
+static rtems_isr_entry tm27_interrupt_handler = NULL;
 
-static rtems_irq_connect_data clockIrqData = {BSP_DECREMENTER,
-                                              0,
-                                              (rtems_irq_enable)nullFunc,
-                                              (rtems_irq_disable)nullFunc,
-                                              (rtems_irq_is_enabled) nullFunc};
-void Install_tm27_vector(void (*_handler)())
+static int tm27_exception_handler( BSP_Exception_frame *frame, unsigned number)
 {
-  clockIrqData.hdl = _handler;
-  if (!BSP_install_rtems_irq_handler (&clockIrqData)) {
-        printk("Error installing clock interrupt handler!\n");
-        rtems_fatal_error_occurred(1);
+	tm27_interrupt_handler( 0);
+
+	return 0;
+}
+
+void Install_tm27_vector( rtems_isr_entry handler)
+{
+  int rv = 0;
+
+  tm27_interrupt_handler = handler;
+
+  rv = ppc_exc_set_handler( ASM_DEC_VECTOR, tm27_exception_handler);
+  if (rv < 0) {
+    printk( "Error installing clock interrupt handler!\n");
   }
 }
 
-#define Cause_tm27_intr()  \
-  do { \
-    uint32_t   _clicks = 8; \
-    asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
-  } while (0)
+#define Cause_tm27_intr() \
+  ppc_set_decrementer_register( 8)
 
 #define Clear_tm27_intr() \
-  do { \
-    uint32_t   _clicks = 0xffffffff; \
-    asm volatile( "mtdec %0" : "=r" ((_clicks)) : "r" ((_clicks)) ); \
-  } while (0)
+  ppc_set_decrementer_register( UINT32_MAX)
 
 #define Lower_tm27_intr() \
-  do { \
-    uint32_t   _msr = 0; \
-    _ISR_Set_level( 0 ); \
-    asm volatile( "mfmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
-    _msr |=  0x8002; \
-    asm volatile( "mtmsr %0 ;" : "=r" (_msr) : "r" (_msr) ); \
-  } while (0)
-
-#endif
+  (void) ppc_external_exceptions_enable()
+
+#endif /* TMTESTS_TM27_H */
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
index 7035fb7e9e..5548a6fbc6 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
@@ -27,6 +27,7 @@
 #include <rtems/score/thread.h>
 
 #include <libcpu/powerpc-utility.h>
+#include <libcpu/raw_exception.h>
 
 #include <bsp.h>
 #include <bsp/bootcard.h>
@@ -52,11 +53,13 @@ unsigned int BSP_bus_frequency;
 /* Configuration parameters for clock driver, ... */
 uint32_t bsp_clicks_per_usec;
 
-/*
- *  Use the shared implementations of the following routines.
- *  Look in rtems/c/src/lib/libbsp/shared/bsplibc.c.
- */
-extern void cpu_init( void);
+/* Default decrementer exception handler */
+static int mpc83xx_decrementer_exception_handler( BSP_Exception_frame *frame, unsigned number)
+{
+	ppc_set_decrementer_register( UINT32_MAX);
+
+	return 0;
+}
 
 void BSP_panic( char *s)
 {
@@ -105,6 +108,9 @@ void bsp_get_work_area( void **work_area_start, size_t *work_area_size, void **h
 
 void bsp_start( void)
 {
+	rtems_status_code sc = RTEMS_SUCCESSFUL;
+	int rv = 0;
+
 	ppc_cpu_id_t myCpu;
 	ppc_cpu_revision_t myCpuRevision;
 
@@ -155,9 +161,16 @@ void bsp_start( void)
 		interrupt_stack_size
 	);
 
+	/* Install default handler for the decrementer exception */
+	rv = ppc_exc_set_handler( ASM_DEC_VECTOR, mpc83xx_decrementer_exception_handler);
+	if (rv < 0) {
+		BSP_panic( "Cannot install decrementer exception handler!\n");
+	}
+
 	/* Initalize interrupt support */
-	if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) {
-		BSP_panic("Cannot intitialize interrupt support\n");
+	sc = bsp_interrupt_initialize();
+	if (sc != RTEMS_SUCCESSFUL) {
+		BSP_panic( "Cannot intitialize interrupt support\n");
 	}
 
 #ifdef SHOW_MORE_INIT_SETTINGS