diff options
author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2009-11-03 18:45:04 +0000 |
---|---|---|
committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2009-11-03 18:45:04 +0000 |
commit | e08dbc5ea9ec881b6fc93cf926c18fb094d3bd55 (patch) | |
tree | 465630c9bb6a962362ed043b9bb0bc4c5505a3a5 /c/src/lib/libbsp/powerpc/mpc8260ads | |
parent | 2009-11-03 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-e08dbc5ea9ec881b6fc93cf926c18fb094d3bd55.tar.bz2 |
various PowerPC code maintenance
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mpc8260ads')
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c | 17 |
5 files changed, 18 insertions, 18 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index fef8f5e5be..3af3aeef6a 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,9 @@ +2009-11-03 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> + + * start/start.S: checked and removed boot_card warning + * irq/irq.c: adapted exception handler parameters + * startup/bspstart.c: removed non-prototype warnings + 2009-10-23 Sebastian Huber <sebastian.huber@embedded-brains.de> * vectors/vectors.h, vectors/vectors_init.c, vectors/vectors.S, diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index 9fa5325019..d3ac98c2fa 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am @@ -30,8 +30,9 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = -# pclock -libbsp_a_SOURCES += clock/p_clock.c +# clock +libbsp_a_SOURCES += ../shared/clock/clock.c + # console libbsp_a_SOURCES += console/console.c @@ -68,7 +69,6 @@ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ - ../../../libcpu/@RTEMS_CPU@/mpc8260/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/console-generic.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \ ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \ diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c index e7b212177e..8994896696 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c @@ -213,7 +213,7 @@ volatile unsigned int maxLoop = 0; /* * High level IRQ handler called from shared_raw_irq_code_entry */ -int C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum) +int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned excNum) { register unsigned int irq; #if 0 diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S b/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S index 1d3d7aeb26..d238634cc1 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/start/start.S @@ -33,11 +33,6 @@ #include <rtems/asm.h> -#warning Call to boot_card has changed and needs checking. -#warning The call is "void boot_card(const char* cmdline);" -#warning You need to pass a NULL. -#warning Please check and remove these warnings. - /* * The initial stack is set to run BELOW the code base address. * (between the vectors and text sections) diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c index fc48062bbc..0126091224 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c @@ -89,56 +89,56 @@ void _BSP_Fatal_error(unsigned int v) __asm__ __volatile ("sc"); } -void _BSP_GPLED0_on() +void _BSP_GPLED0_on(void) { BCSR *csr; csr = (BCSR *)(m8260.memc[1].br & 0xFFFF8000); csr->bcsr0 &= ~GP0_LED; /* Turn on GP0 LED */ } -void _BSP_GPLED0_off() +void _BSP_GPLED0_off(void) { BCSR *csr; csr = (BCSR *)(m8260.memc[1].br & 0xFFFF8000); csr->bcsr0 |= GP0_LED; /* Turn off GP0 LED */ } -void _BSP_GPLED1_on() +void _BSP_GPLED1_on(void) { BCSR *csr; csr = (BCSR *)(m8260.memc[1].br & 0xFFFF8000); csr->bcsr0 &= ~GP1_LED; /* Turn on GP1 LED */ } -void _BSP_GPLED1_off() +void _BSP_GPLED1_off(void) { BCSR *csr; csr = (BCSR *)(m8260.memc[1].br & 0xFFFF8000); csr->bcsr0 |= GP1_LED; /* Turn off GP1 LED */ } -void _BSP_Uart1_enable() +void _BSP_Uart1_enable(void) { BCSR *csr; csr = (BCSR *)(m8260.memc[1].br & 0xFFFF8000); csr->bcsr1 &= ~UART1_E; /* Enable Uart1 */ } -void _BSP_Uart1_disable() +void _BSP_Uart1_disable(void) { BCSR *csr; csr = (BCSR *)(m8260.memc[1].br & 0xFFFF8000); csr->bcsr1 |= UART1_E; /* Disable Uart1 */ } -void _BSP_Uart2_enable() +void _BSP_Uart2_enable(void) { BCSR *csr; csr = (BCSR *)(m8260.memc[1].br & 0xFFFF8000); csr->bcsr1 &= ~UART2_E; /* Enable Uart2 */ } -void _BSP_Uart2_disable() +void _BSP_Uart2_disable(void) { BCSR *csr; csr = (BCSR *)(m8260.memc[1].br & 0xFFFF8000); @@ -149,7 +149,6 @@ void _BSP_Uart2_disable() void bsp_start(void) { rtems_status_code sc = RTEMS_SUCCESSFUL; - extern void *_WorkspaceBase; ppc_cpu_id_t myCpu; ppc_cpu_revision_t myCpuRevision; |