From f4adc0d1a16d638654ac82159f32c97cdf065e1c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 13 Jul 2011 18:35:43 +0000 Subject: 2011-07-13 Joel Sherrill PR 1824/cpukit * startup/bspclean.c: Return exit/shutdown status back to boot_card(). boot_card() propagates this to bsp_cleanup() and returns it to the assembly that started the application. bsp_cleanup() prototype changed. --- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 8 ++++++++ c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c | 4 +++- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 8 ++++++++ c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c | 4 +++- c/src/lib/libbsp/m68k/mvme162/ChangeLog | 8 ++++++++ c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c | 4 +++- c/src/lib/libbsp/m68k/mvme167/ChangeLog | 8 ++++++++ c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c | 4 +++- c/src/lib/libbsp/m68k/uC5282/ChangeLog | 8 ++++++++ c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c | 6 ++++-- c/src/lib/libbsp/powerpc/mvme5500/ChangeLog | 8 ++++++++ c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c | 4 +++- 12 files changed, 67 insertions(+), 7 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 4953a09a19..755a77e646 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,11 @@ +2011-07-13 Joel Sherrill + + PR 1824/cpukit + * startup/bspclean.c: Return exit/shutdown status back to boot_card(). + boot_card() propagates this to bsp_cleanup() and returns it to the + assembly that started the application. bsp_cleanup() prototype + changed. + 2011-02-11 Ralf Corsépius * include/bsp.h, shmsupp/lock.c, startup/bspclean.c: diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c index 1d2f511db7..601cedc7cf 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme136/startup/bspclean.c @@ -33,7 +33,9 @@ void bsp_return_to_monitor_trap(void) #define TIMER 0xfffb0000 -void bsp_cleanup( void ) +void bsp_cleanup( + uint32_t status +) { Z8x36_WRITE( TIMER, MASTER_INTR, 0x62 ); /* redo timer */ Z8x36_WRITE( TIMER, CT1_MODE_SPEC, 0x00 ); diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 99a3f84b6b..504b23afde 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,11 @@ +2011-07-13 Joel Sherrill + + PR 1824/cpukit + * startup/bspclean.c: Return exit/shutdown status back to boot_card(). + boot_card() propagates this to bsp_cleanup() and returns it to the + assembly that started the application. bsp_cleanup() prototype + changed. + 2011-02-11 Ralf Corsépius * startup/bspclean.c: diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c index 114aafd6dc..6c2b86d910 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c @@ -34,7 +34,9 @@ void bsp_return_to_monitor_trap(void) __asm__ volatile ( "jmp %0@" : "=a" (start_addr) : "0" (start_addr) ); } -void bsp_cleanup( void ) +void bsp_cleanup( + uint32_t status +) { pcc->timer1_int_control = 0; /* Disable Timer 1 */ pcc->timer2_int_control = 0; /* Disable Timer 2 */ diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index 5b9ede8a5c..2c9f79278a 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,11 @@ +2011-07-13 Joel Sherrill + + PR 1824/cpukit + * startup/bspclean.c: Return exit/shutdown status back to boot_card(). + boot_card() propagates this to bsp_cleanup() and returns it to the + assembly that started the application. bsp_cleanup() prototype + changed. + 2011-06-11 Joel Sherrill * Makefile.am: Remove reference to wrapup directory. diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c index 1a5cec7151..baa153690e 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c @@ -52,7 +52,9 @@ void bsp_return_to_monitor_trap(void) #endif } -void bsp_cleanup( void ) +void bsp_cleanup( + uint32_t status +) { M68Kvec[ 45 ] = bsp_return_to_monitor_trap; /* install handler */ __asm__ volatile( "trap #13" ); /* insures SUPV mode */ diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index fb07d32961..5900051d19 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,11 @@ +2011-07-13 Joel Sherrill + + PR 1824/cpukit + * startup/bspclean.c: Return exit/shutdown status back to boot_card(). + boot_card() propagates this to bsp_cleanup() and returns it to the + assembly that started the application. bsp_cleanup() prototype + changed. + 2011-02-11 Ralf Corsépius * console/console.c, fatal/bspfatal.c, startup/bspclean.c, diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c index 35e5210406..6303a41190 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c @@ -74,7 +74,9 @@ static void bsp_return_to_monitor_trap( void ) * * Return values: DOES NOT RETURN */ -void bsp_cleanup( void ) +void bsp_cleanup( + uint32_t status +) { M68Kvec[ 45 ] = bsp_return_to_monitor_trap; __asm__ volatile( "trap #13" ); diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 8530610d1e..73ad9dc0fd 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,11 @@ +2011-07-13 Joel Sherrill + + PR 1824/cpukit + * startup/bspclean.c: Return exit/shutdown status back to boot_card(). + boot_card() propagates this to bsp_cleanup() and returns it to the + assembly that started the application. bsp_cleanup() prototype + changed. + 2011-03-15 Till Straumann * startup/bspstart.c: Fix clock code on qemu. Also ensure UART is diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c index 500663ab8b..3f5698fb39 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c @@ -21,7 +21,9 @@ extern void bsp_reset(int); -void bsp_cleanup( void ) +void bsp_cleanup( + uint32_t status +) { - bsp_reset(0); + bsp_reset(0); } diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog index 418d3091d5..2e3eff58ad 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog @@ -1,3 +1,11 @@ +2011-07-13 Joel Sherrill + + PR 1824/cpukit + * startup/bspclean.c: Return exit/shutdown status back to boot_card(). + boot_card() propagates this to bsp_cleanup() and returns it to the + assembly that started the application. bsp_cleanup() prototype + changed. + 2011-04-10 Kate Feng PR 1786/bsps diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c index 88b27c1bbd..bf92820828 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c @@ -8,7 +8,9 @@ #define AUTO_BOOT 0 -void bsp_cleanup(void) +void bsp_cleanup( + uint32_t status +) { #if AUTO_BOOT /* Till Straumann for SVGM */ -- cgit v1.2.3