From 2d2de4eba16374ea05fc7ee9cd257ad0d4ebf2ca Mon Sep 17 00:00:00 2001 From: Thomas Doerfler Date: Fri, 23 Oct 2009 07:32:46 +0000 Subject: Update for exception support changes. --- c/src/lib/libbsp/powerpc/score603e/ChangeLog | 8 ++++++++ c/src/lib/libbsp/powerpc/score603e/Makefile.am | 4 +--- c/src/lib/libbsp/powerpc/score603e/irq/irq.c | 1 - c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c | 2 +- c/src/lib/libbsp/powerpc/score603e/irq/no_pic.c | 4 ++-- c/src/lib/libbsp/powerpc/score603e/preinstall.am | 8 -------- c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c | 12 ++++++++---- 7 files changed, 20 insertions(+), 19 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/score603e') diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog index f2550fedd9..09d06133c6 100644 --- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog +++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog @@ -1,3 +1,11 @@ +2009-10-22 Sebastian Huber + + * Makefile.am, preinstall.am: Update for exception support changes. + * irq/irq.c, irq/irq_init.c, irq/no_pic.c: Changed exception header + file includes. Fixes for type changes. + * startup/bspstart.c: Changed exception header file includes. Update + for ppc_exc_initialize() changes. + 2009-10-21 Ralf Corsépius * make/custom/score603e.cfg: Remove RTEMS_BSP_FAMILY. diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am index a579cc95ec..1421cc212d 100644 --- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am +++ b/c/src/lib/libbsp/powerpc/score603e/Makefile.am @@ -46,8 +46,6 @@ pci_SOURCES = PCI_bus/flash.c ../../powerpc/shared/pci/pci.c \ ../../powerpc/shared/pci/pcifinddevice.c PCI_bus/PCI.c PCI_bus/universe.c include_bsp_HEADERS += irq/irq.h \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h irq_SOURCES = irq/no_pic.c irq/irq_init.c \ @@ -70,13 +68,13 @@ libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(irq_SOURCES) \ $(pci_SOURCES) $(vectors_SOURCES) $(startup_SOURCES) libbsp_a_LIBADD = \ + ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel diff --git a/c/src/lib/libbsp/powerpc/score603e/irq/irq.c b/c/src/lib/libbsp/powerpc/score603e/irq/irq.c index aab4095a7c..8fab2c653e 100644 --- a/c/src/lib/libbsp/powerpc/score603e/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/score603e/irq/irq.c @@ -16,7 +16,6 @@ #include #include #include /* for post ISR signal processing */ -#include #include #include #include diff --git a/c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c b/c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c index ea0e257a2e..a7c223800e 100644 --- a/c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c +++ b/c/src/lib/libbsp/powerpc/score603e/irq/irq_init.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #define SHOW_ISA_PCI_BRIDGE_SETTINGS 1 diff --git a/c/src/lib/libbsp/powerpc/score603e/irq/no_pic.c b/c/src/lib/libbsp/powerpc/score603e/irq/no_pic.c index c30fb20156..f0cc12db6f 100644 --- a/c/src/lib/libbsp/powerpc/score603e/irq/no_pic.c +++ b/c/src/lib/libbsp/powerpc/score603e/irq/no_pic.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include static rtems_irq_connect_data *rtems_hdl_tbl; static rtems_irq_connect_data dflt_entry; @@ -25,7 +25,7 @@ static rtems_irq_connect_data dflt_entry; * High level IRQ handler called from shared_raw_irq_code_entry */ int C_dispatch_irq_handler( - struct _BSP_Exception_frame *frame, + BSP_Exception_frame *frame, unsigned int excNum ) { diff --git a/c/src/lib/libbsp/powerpc/score603e/preinstall.am b/c/src/lib/libbsp/powerpc/score603e/preinstall.am index d614aa8fa4..4d2f767519 100644 --- a/c/src/lib/libbsp/powerpc/score603e/preinstall.am +++ b/c/src/lib/libbsp/powerpc/score603e/preinstall.am @@ -93,14 +93,6 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h -$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h - -$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h - $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c index 9b488bd024..bbca59dd79 100644 --- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c @@ -157,10 +157,11 @@ void initialize_PMC(void) { void bsp_start( void ) { + rtems_status_code sc = RTEMS_SUCCESSFUL; unsigned char *work_space_start; unsigned int msr_value = 0x0000; - uint32_t intrStackStart; - uint32_t intrStackSize; + uintptr_t intrStackStart; + uintptr_t intrStackSize; volatile uint32_t *ptr; ppc_cpu_id_t myCpu; ppc_cpu_revision_t myCpuRevision; @@ -190,7 +191,7 @@ void bsp_start( void ) /* * Initialize the interrupt related settings. */ - intrStackStart = (uint32_t) __rtems_end; + intrStackStart = (uintptr_t) __rtems_end; intrStackSize = rtems_configuration_get_interrupt_stack_size(); printk("Interrupt Stack Start: 0x%x Size: 0x%x Heap Start: 0x%x\n", intrStackStart, intrStackSize, BSP_heap_start @@ -203,11 +204,14 @@ void bsp_start( void ) /* * Initialize default raw exception handlers. */ - ppc_exc_initialize( + sc = ppc_exc_initialize( PPC_INTERRUPT_DISABLE_MASK_DEFAULT, intrStackStart, intrStackSize ); + if (sc != RTEMS_SUCCESSFUL) { + BSP_panic("cannot initialize exceptions"); + } msr_value = 0x2030; _CPU_MSR_SET( msr_value ); -- cgit v1.2.3