[rtems commit] powerpc: Replace BSP_panic() with rtems_panic()
Sebastian Huber
sebh at rtems.org
Wed Nov 22 12:02:25 UTC 2017
Module: rtems
Branch: master
Commit: 1c193a26d227a42a1ea76564950488f48189dbde
Changeset: http://git.rtems.org/rtems/commit/?id=1c193a26d227a42a1ea76564950488f48189dbde
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Nov 21 11:43:13 2017 +0100
powerpc: Replace BSP_panic() with rtems_panic()
Due to a new rtems_panic() implementation, it is possible to replace the
PowerPC-specific BSP_panic() with rtems_panic(). Remove BSP_panic()
implementations.
Close #3245.
---
c/src/lib/libbsp/powerpc/beatnik/include/bsp.h | 3 +--
c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c | 2 +-
c/src/lib/libbsp/powerpc/beatnik/irq/irq_init.c | 2 +-
c/src/lib/libbsp/powerpc/beatnik/marvell/discovery.c | 4 ++--
c/src/lib/libbsp/powerpc/beatnik/pci/gt_pci_init.c | 2 +-
c/src/lib/libbsp/powerpc/beatnik/pci/motload_fixup.c | 2 +-
c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.c | 8 ++++----
c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c | 6 ------
c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c | 16 +---------------
c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c | 2 +-
c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c | 6 ------
c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h | 1 -
c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c | 7 -------
c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h | 1 -
c/src/lib/libbsp/powerpc/mvme3100/irq/irq_init.c | 2 +-
c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c | 10 ++--------
c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h | 1 -
c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c | 2 +-
c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c | 2 +-
c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c | 6 ------
c/src/lib/libbsp/powerpc/psim/irq/irq_init.c | 4 ++--
c/src/lib/libbsp/powerpc/psim/startup/bspstart.c | 6 ------
c/src/lib/libbsp/powerpc/qemuppc/irq/irq_init.c | 2 +-
c/src/lib/libbsp/powerpc/qemuppc/startup/bsppanic.c | 6 ------
c/src/lib/libbsp/powerpc/qemuppc/startup/bspstart.c | 2 +-
c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c | 14 --------------
c/src/lib/libbsp/powerpc/shared/irq/irq_init.c | 4 ++--
c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c | 4 ++--
c/src/lib/libbsp/powerpc/shared/openpic/openpic.c | 2 +-
.../lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c | 2 +-
c/src/lib/libbsp/powerpc/shared/startup/bspstart.c | 6 ------
c/src/lib/libbsp/powerpc/shared/startup/panic.c | 6 ------
c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c | 2 +-
c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c | 6 ------
c/src/lib/libbsp/powerpc/t32mppc/startup/bspstart.c | 14 --------------
c/src/lib/libbsp/powerpc/tqm8xx/console/console.c | 2 +-
c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c | 16 +---------------
c/src/lib/libbsp/powerpc/virtex4/include/bsp.h | 1 -
c/src/lib/libbsp/powerpc/virtex4/irq/irq_init.c | 2 +-
c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c | 12 ------------
c/src/lib/libbsp/powerpc/virtex5/include/bsp.h | 1 -
c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c | 2 +-
c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c | 12 ------------
c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c | 6 +++---
c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c | 8 ++++----
c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c | 6 +++---
cpukit/score/cpu/powerpc/rtems/score/cpu.h | 2 --
47 files changed, 43 insertions(+), 192 deletions(-)
diff --git a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h b/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h
index 8678404..e980f1a 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h
@@ -52,7 +52,7 @@ typedef enum {
* is cached and repeated calls just return the cached value.
*
* If a non-zero argument is passed, the routine panics
- * (BSP_panic) if no recognized bridge is found;
+ * (rtems_panic) if no recognized bridge is found;
*/
DiscoveryVersion BSP_getDiscoveryVersion(int assertion);
@@ -233,7 +233,6 @@ extern char *BSP_commandline_string;
((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
extern rtems_configuration_table BSP_Configuration;
-extern void BSP_panic(char *s);
extern void bsp_reset(void);
extern int BSP_disconnect_clock_handler (void);
extern int BSP_connect_clock_handler (void);
diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c b/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c
index 8efe2ce..f77125c 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/irq/discovery_pic.c
@@ -554,7 +554,7 @@ int i;
break;
default:
- BSP_panic("Unable to initialize interrupt controller; unknown chip");
+ rtems_panic("Unable to initialize interrupt controller; unknown chip");
break;
}
diff --git a/c/src/lib/libbsp/powerpc/beatnik/irq/irq_init.c b/c/src/lib/libbsp/powerpc/beatnik/irq/irq_init.c
index a99fc1c..2c0554c 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/irq/irq_init.c
@@ -100,7 +100,7 @@ int i;
/*
* put something here that will show the failure...
*/
- BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
+ rtems_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
}
#ifdef TRACE_IRQ_INIT
diff --git a/c/src/lib/libbsp/powerpc/beatnik/marvell/discovery.c b/c/src/lib/libbsp/powerpc/beatnik/marvell/discovery.c
index b45585a..1d84ac3 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/marvell/discovery.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/marvell/discovery.c
@@ -112,7 +112,7 @@ printk("config data is %p\n", BSP_pci_configuration.pci_config_data);
if ( PCI_VENDOR_ID_MARVELL != ds ) {
if ( assertion ) {
printk("Host bridge vendor id: 0x%04x\n",ds);
- BSP_panic("Host bridge vendor @ pci(0,0,0) is not MARVELL");
+ rtems_panic("Host bridge vendor @ pci(0,0,0) is not MARVELL");
}
else return unknown;
}
@@ -140,7 +140,7 @@ printk("config data is %p\n", BSP_pci_configuration.pci_config_data);
printk("Marvell device id 0x%04x, revision 0x%02x; check %s:%u\n",
ds, dc,
__FILE__,__LINE__);
- BSP_panic("Unknown Marvell bridge or revision@ pci(0,0,0) is not MARVELL");
+ rtems_panic("Unknown Marvell bridge or revision@ pci(0,0,0) is not MARVELL");
}
break;
}
diff --git a/c/src/lib/libbsp/powerpc/beatnik/pci/gt_pci_init.c b/c/src/lib/libbsp/powerpc/beatnik/pci/gt_pci_init.c
index d2a5232..68d7467 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/pci/gt_pci_init.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/pci/gt_pci_init.c
@@ -193,7 +193,7 @@ extern pci_config_access_functions pci_indirect_functions;
pci_initialize();
/* check for overflow of an unsigned char */
if ( BSP_pci_hose1_bus_base + pci_bus_count() > 255 ) {
- BSP_panic("Too many PCI busses in the system");
+ rtems_panic("Too many PCI busses in the system");
}
/* readjust total number */
ucMaxPCIBus+=BSP_pci_hose1_bus_base;
diff --git a/c/src/lib/libbsp/powerpc/beatnik/pci/motload_fixup.c b/c/src/lib/libbsp/powerpc/beatnik/pci/motload_fixup.c
index f3bc120..21d5591 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/pci/motload_fixup.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/pci/motload_fixup.c
@@ -163,7 +163,7 @@ uint32_t b0,b1,r0,r1,lim,dis;
break;
default:
- BSP_panic("Unknown discovery version; switch in file: "__FILE__" not implemented (yet)");
+ rtems_panic("Unknown discovery version; switch in file: "__FILE__" not implemented (yet)");
break; /* never get here */
}
diff --git a/c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.c b/c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.c
index 79dd297..56118d0 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.c
+++ b/c/src/lib/libbsp/powerpc/beatnik/pci/pci_io_remap.c
@@ -84,7 +84,7 @@ rtems_pci_io_remap(int bus_from, int bus_to, uint32_t offset)
unsigned int bas, lim;
if ( offset & ((1<<12)-1) ) {
- BSP_panic("rtems_pci_io_remap(): offset must be 4k aligned");
+ rtems_panic("rtems_pci_io_remap(): offset must be 4k aligned");
return -1;
}
@@ -114,12 +114,12 @@ rtems_pci_io_remap(int bus_from, int bus_to, uint32_t offset)
switch ( b ) {
default:
printk("PCI header type %i (@%i/%i/%i)\n", b, bus, dev, fun);
- BSP_panic("rtems_pci_io_remap(): unknown PCI header type");
+ rtems_panic("rtems_pci_io_remap(): unknown PCI header type");
return -1; /* keep compiler happy */
case PCI_HEADER_TYPE_CARDBUS:
printk("PCI header type %i (@%i/%i/%i)\n", b, bus, dev, fun);
- BSP_panic("rtems_pci_io_remap(): don't know how to deal with Cardbus bridge");
+ rtems_panic("rtems_pci_io_remap(): don't know how to deal with Cardbus bridge");
return -1;
case PCI_HEADER_TYPE_NORMAL:
@@ -167,7 +167,7 @@ rtems_pci_io_remap(int bus_from, int bus_to, uint32_t offset)
switch ( b ) {
default:
printk("Unknown IO range type 0x%x (@%i/%i/%i)\n", b, bus, dev, fun);
- BSP_panic("rtems_pci_io_remap(): unknown IO range type");
+ rtems_panic("rtems_pci_io_remap(): unknown IO range type");
return -1;
case PCI_IO_RANGE_TYPE_16:
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
index cf92b33..f09d97e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
@@ -112,12 +112,6 @@ uint32_t bsp_time_base_frequency;
/* Legacy */
uint32_t bsp_clicks_per_usec;
-void BSP_panic(char *s)
-{
- printk("%s PANIC %s\n",_RTEMS_version, s);
- __asm__ __volatile ("sc");
-}
-
void _BSP_Fatal_error(unsigned int v)
{
printk("%s PANIC ERROR %x\n",_RTEMS_version, v);
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
index f1ffcac..db89f5e 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
@@ -51,20 +51,6 @@ static int mpc83xx_decrementer_exception_handler( BSP_Exception_frame *frame, un
return 0;
}
-void BSP_panic(char *s)
-{
- rtems_interrupt_level level;
-
- rtems_interrupt_disable(level);
- (void) level;
-
- printk("%s PANIC %s\n", rtems_get_version_string(), s);
-
- while (1) {
- /* Do nothing */
- }
-}
-
void _BSP_Fatal_error(unsigned n)
{
rtems_interrupt_level level;
@@ -145,7 +131,7 @@ void bsp_start( void)
/* Install default handler for the decrementer exception */
sc = ppc_exc_set_handler( ASM_DEC_VECTOR, mpc83xx_decrementer_exception_handler);
if (sc != RTEMS_SUCCESSFUL) {
- BSP_panic("cannot install decrementer exception handler");
+ rtems_panic("cannot install decrementer exception handler");
}
/* Initalize interrupt support */
diff --git a/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c b/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c
index 4165df1..d48855a 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/haleakala/irq/irq_init.c
@@ -85,7 +85,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
/*
* put something here that will show the failure...
*/
- BSP_panic(
+ rtems_panic(
"Unable to initialize RTEMS interrupt management!!! System locked\n"
);
}
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
index 8facb27..dc53ed7 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
@@ -207,12 +207,6 @@ static void BSP_ask_for_reset(void)
while(1) {};
}
-void BSP_panic(char *s)
-{
- printk("%s PANIC %s\n",_RTEMS_version, s);
- BSP_ask_for_reset();
-}
-
void _BSP_Fatal_error(unsigned int v)
{
printk("%s FATAL ERROR %x\n",_RTEMS_version, v);
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
index e2ba856..675796b 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
@@ -206,7 +206,6 @@ extern char *BSP_commandline_string;
#define BSP_Convert_decrementer( _value ) \
((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
-extern void BSP_panic(char *s);
/* extern int printk(const char *, ...) __attribute__((format(printf, 1, 2))); */
extern int BSP_disconnect_clock_handler (void);
extern int BSP_connect_clock_handler (void);
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
index 3aa1659..b1f0219 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
@@ -103,13 +103,6 @@ static void _BSP_GPLED1_off(void)
csr->bcsr0 |= GP1_LED; /* Turn off GP1 LED */
}
-void BSP_panic(char *s)
-{
- _BSP_GPLED1_on();
- printk("%s PANIC %s\n",_RTEMS_version, s);
- __asm__ __volatile ("sc");
-}
-
void _BSP_Fatal_error(unsigned int v)
{
_BSP_GPLED0_on();
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
index 43b64f4..3fbfcb3 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
@@ -291,7 +291,6 @@ extern char *BSP_commandline_string;
((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
extern rtems_configuration_table BSP_Configuration;
-extern void BSP_panic(char *s);
/* extern int printk(const char *, ...) __attribute__((format(printf, 1, 2))); */
extern int BSP_disconnect_clock_handler (void);
extern int BSP_connect_clock_handler (void);
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mvme3100/irq/irq_init.c
index 460c3c9..c40692e 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/irq/irq_init.c
@@ -133,6 +133,6 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
/*
* put something here that will show the failure...
*/
- BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
+ rtems_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
}
}
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
index 41edaf5..f222908 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
@@ -105,12 +105,6 @@ int i;
BSP_output_char_function_type BSP_output_char = BSP_output_char_via_serial;
BSP_polling_getchar_function_type BSP_poll_char = NULL;
-void BSP_panic(char *s)
-{
- printk("\n%s PANIC %s\n",_RTEMS_version, s);
- __asm__ __volatile ("sc");
-}
-
void _BSP_Fatal_error(unsigned int v)
{
printk("\n%s PANIC ERROR %x\n",_RTEMS_version, v);
@@ -186,7 +180,7 @@ BSP_calc_freqs( void )
break;
default:
- BSP_panic("Unknown PLL sys-clock ratio; something's wrong here");
+ rtems_panic("Unknown PLL sys-clock ratio; something's wrong here");
}
switch ( e500_ratio ) {
@@ -195,7 +189,7 @@ BSP_calc_freqs( void )
break;
default:
- BSP_panic("Unknown PLL e500-clock ratio; something's wrong here");
+ rtems_panic("Unknown PLL e500-clock ratio; something's wrong here");
}
printk("Core Complex Bus (CCB) Clock Freq: %10u Hz\n", BSP_bus_frequency);
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
index 0ed628a..c1b17ce 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
@@ -136,7 +136,6 @@ extern unsigned int BSP_time_base_divisor;
#define BSP_Convert_decrementer( _value ) \
((unsigned long long) ((((unsigned long long)BSP_time_base_divisor) * 1000000ULL) /((unsigned long long) BSP_bus_frequency)) * ((unsigned long long) (_value)))
-extern void BSP_panic(char *s);
extern void bsp_reset(void);
/* extern int printk(const char *, ...) __attribute__((format(printf, 1, 2))); */
extern int BSP_disconnect_clock_handler(void);
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c b/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c
index 5bfe08d..ede4014 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/irq/irq_init.c
@@ -136,7 +136,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
/*
* put something here that will show the failure...
*/
- BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
+ rtems_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
}
#ifdef TRACE_IRQ_INIT
printk("Done setup irq mngt configuration\n");
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
index bef0173..8ef5876 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c
@@ -254,7 +254,7 @@ int pci_initialize(void)
}
if (++numPCIDevs > PCI_MAX_DEVICES) {
- BSP_panic("Too many PCI devices found; increase PCI_MAX_DEVICES in pci.h\n");
+ rtems_panic("Too many PCI devices found; increase PCI_MAX_DEVICES in pci.h\n");
}
if (!deviceFound) deviceFound=1;
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
index 1fb238b..66fcd2b 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
@@ -111,12 +111,6 @@ static unsigned char ConfVPD_buff[200];
static char cmdline_buf[CMDLINE_BUF_SIZE];
char *BSP_commandline_string = cmdline_buf;
-void BSP_panic(char *s)
-{
- printk("%s PANIC %s\n",_RTEMS_version, s);
- __asm__ __volatile ("sc");
-}
-
void _BSP_Fatal_error(unsigned int v)
{
printk("%s PANIC ERROR %x\n",_RTEMS_version, v);
diff --git a/c/src/lib/libbsp/powerpc/psim/irq/irq_init.c b/c/src/lib/libbsp/powerpc/psim/irq/irq_init.c
index 197d8b5..3d2a82f 100644
--- a/c/src/lib/libbsp/powerpc/psim/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/psim/irq/irq_init.c
@@ -80,7 +80,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
/*
* put something here that will show the failure...
*/
- BSP_panic(
+ rtems_panic(
"Unable to initialize RTEMS interrupt Management!!! System locked\n"
);
}
@@ -95,7 +95,7 @@ static int psim_exception_handler(
unsigned exception_number
)
{
- BSP_panic("Unexpected interrupt occured");
+ rtems_panic("Unexpected interrupt occured");
return 0;
}
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
index 134a850..b0dc1e6 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
@@ -60,12 +60,6 @@ unsigned int BSP_time_base_divisor;
extern unsigned long __rtems_end[];
-void BSP_panic(char *s)
-{
- printk("%s PANIC %s\n",_RTEMS_version, s);
- __asm__ __volatile ("sc");
-}
-
void _BSP_Fatal_error(unsigned int v)
{
printk("%s PANIC ERROR %x\n",_RTEMS_version, v);
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq_init.c b/c/src/lib/libbsp/powerpc/qemuppc/irq/irq_init.c
index f1c6d55..24b15dc 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/qemuppc/irq/irq_init.c
@@ -31,7 +31,7 @@ static int qemuppc_exception_handler(
unsigned exception_number
)
{
- BSP_panic("Unexpected interrupt occured");
+ rtems_panic("Unexpected interrupt occured");
return 0;
}
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/startup/bsppanic.c b/c/src/lib/libbsp/powerpc/qemuppc/startup/bsppanic.c
index c6a7267..3748600 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/startup/bsppanic.c
+++ b/c/src/lib/libbsp/powerpc/qemuppc/startup/bsppanic.c
@@ -7,12 +7,6 @@ __outb(int port, unsigned char v)
*((volatile unsigned char *)(0x80000000 + port)) = v;
}
-void BSP_panic(char *s)
-{
- printk("%s PANIC %s\n",_RTEMS_version, s);
- __outb (0x92, 0x01);
-}
-
void _BSP_Fatal_error(unsigned int v)
{
printk("%s PANIC ERROR %x\n",_RTEMS_version, v);
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/startup/bspstart.c b/c/src/lib/libbsp/powerpc/qemuppc/startup/bspstart.c
index 9dc2639..bbb7f3a 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/qemuppc/startup/bspstart.c
@@ -99,7 +99,7 @@ void bsp_start( void )
/* Install default handler for the decrementer exception */
sc = ppc_exc_set_handler( ASM_DEC_VECTOR, default_decrementer_exception_handler);
if (sc != RTEMS_SUCCESSFUL) {
- BSP_panic("cannot install decrementer exception handler");
+ rtems_panic("cannot install decrementer exception handler");
}
/* Initalize interrupt support */
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c b/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c
index 859171d..3030d37 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c
@@ -52,20 +52,6 @@ uint32_t bsp_time_base_frequency;
uint32_t qoriq_clock_frequency;
-void BSP_panic(char *s)
-{
- rtems_interrupt_level level;
-
- rtems_interrupt_local_disable(level);
- (void) level;
-
- printk("%s PANIC %s\n", rtems_get_version_string(), s);
-
- while (1) {
- /* Do nothing */
- }
-}
-
void _BSP_Fatal_error(unsigned n)
{
rtems_interrupt_level level;
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
index a58cd24..1a44992 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
@@ -208,7 +208,7 @@ void VIA_isa_bridge_interrupts_setup(void)
}
}
loop_exit:
- if (!found) BSP_panic("VIA_82C586 PCI/ISA bridge not found!n");
+ if (!found) rtems_panic("VIA_82C586 PCI/ISA bridge not found!n");
tmp = inb(0x810);
if ( !(tmp & 0x2)) {
@@ -355,7 +355,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
/*
* put something here that will show the failure...
*/
- BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
+ rtems_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
}
#ifdef TRACE_IRQ_INIT
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
index 8090122..4a9c393 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/openpic_i8259_irq.c
@@ -263,8 +263,8 @@ int C_dispatch_irq_handler (BSP_Exception_frame *frame, unsigned int excNum)
#error "Configuration Error -- BSP with ISA + PCI IRQs MUST define BSP_PCI_ISA_BRIDGE_IRQ"
#endif
#else
- BSP_panic("MUST have an OpenPIC if BSP has PCI IRQs but no ISA IRQs");
- /* BSP_panic() never returns but the 'return' statement silences
+ rtems_panic("MUST have an OpenPIC if BSP has PCI IRQs but no ISA IRQs");
+ /* rtems_panic() never returns but the 'return' statement silences
* a compiler warning about 'irq' possibly being used w/o initialization.
*/
return -1;
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c
index 15a37d1..5560149 100644
--- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c
+++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c
@@ -178,7 +178,7 @@ void openpic_init(int main_pic, unsigned char *polarities, unsigned char *senses
const char *version, *vendor, *device;
if (!OpenPIC)
- BSP_panic("No OpenPIC found");
+ rtems_panic("No OpenPIC found");
t = openpic_read(&OpenPIC->Global.Feature_Reporting0);
switch (t & OPENPIC_FEATURE_VERSION_MASK) {
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c b/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
index 80d5461..0a1c04a 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
+++ b/c/src/lib/libbsp/powerpc/shared/pci/detect_raven_bridge.c
@@ -188,7 +188,7 @@ void detect_host_bridge(void)
#if BSP_PCI_IRQ_NUMBER > 0
if (OpenPIC == (volatile struct OpenPIC *)0) {
- BSP_panic("OpenPic Not found\n");
+ rtems_panic("OpenPic Not found\n");
}
#endif
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
index 5a069b8..8a3695a 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
@@ -84,12 +84,6 @@ unsigned int BSP_processor_frequency;
*/
unsigned int BSP_time_base_divisor;
-void BSP_panic(char *s)
-{
- printk("%s PANIC %s\n",_RTEMS_version, s);
- __asm__ __volatile ("sc");
-}
-
void _BSP_Fatal_error(unsigned int v)
{
printk("%s PANIC ERROR %x\n",_RTEMS_version, v);
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/panic.c b/c/src/lib/libbsp/powerpc/shared/startup/panic.c
index b1a9268..636dbe6 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/panic.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/panic.c
@@ -18,12 +18,6 @@ rebootQuestion(void)
bsp_reset();
}
-void BSP_panic(char *s)
-{
- printk("%s PANIC %s\n",_RTEMS_version, s);
- rebootQuestion();
-}
-
#define THESRC _Internal_errors_What_happened.the_source
#define THEERR _Internal_errors_What_happened.the_error
diff --git a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c b/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
index 5036cb1..158a899 100644
--- a/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
+++ b/c/src/lib/libbsp/powerpc/shared/vme/vme_universe.c
@@ -429,7 +429,7 @@ int err;
#error "BSP_PCI_VME_DRIVER_DOES_EOI/BSP_PIC_DO_EOI feature can only be used with vmeUniverse"
#endif
if ( vmeUniverse0PciIrqLine < 0 )
- BSP_panic("Unable to get universe interrupt line info from PCI config");
+ rtems_panic("Unable to get universe interrupt line info from PCI config");
_BSP_vme_bridge_irq = vmeUniverse0PciIrqLine;
#endif
return 0;
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c
index 4016c61..98bf9e0 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c
@@ -42,12 +42,6 @@ uint32_t bsp_clock_speed; /* Serial clocks per second */
uint32_t bsp_timer_least_valid;
uint32_t bsp_timer_average_overhead;
-void BSP_panic(char *s)
-{
- printk("%s PANIC %s\n",_RTEMS_version, s);
- __asm__ __volatile ("sc");
-}
-
void _BSP_Fatal_error(unsigned int v)
{
printk("%s PANIC ERROR %x\n",_RTEMS_version, v);
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/startup/bspstart.c b/c/src/lib/libbsp/powerpc/t32mppc/startup/bspstart.c
index f729ae6..2a88329 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/t32mppc/startup/bspstart.c
@@ -33,20 +33,6 @@ LINKER_SYMBOL(bsp_exc_vector_base);
*/
uint32_t bsp_time_base_frequency = 10000000;
-void BSP_panic(char *s)
-{
- rtems_interrupt_level level;
-
- rtems_interrupt_local_disable(level);
- (void) level;
-
- printk("%s PANIC %s\n", rtems_get_version_string(), s);
-
- while (1) {
- /* Do nothing */
- }
-}
-
void _BSP_Fatal_error(unsigned n)
{
rtems_interrupt_level level;
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
index 7810bc1..5a681b1 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/console/console.c
@@ -526,7 +526,7 @@ sccInitialize (int chan)
*/
rxBuf[chan] = malloc(sizeof(*rxBuf[chan]) + 2*PPC_CACHE_ALIGNMENT);
if (rxBuf[chan] == NULL) {
- BSP_panic("Cannot allocate console rx buffer\n");
+ rtems_panic("Cannot allocate console rx buffer\n");
}
else {
/*
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
index beec6f9..4cc368a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
@@ -51,20 +51,6 @@ uint32_t bsp_timer_average_overhead; /* Average overhead of timer in ticks */
uint32_t bsp_timer_least_valid; /* Least valid number from timer */
bool bsp_timer_internal_clock; /* TRUE, when timer runs with CPU clk */
-void BSP_panic( char *s)
-{
- rtems_interrupt_level level;
-
- rtems_interrupt_disable( level);
- (void) level; /* avoid set but not used warning */
-
- printk( "%s PANIC %s\n", _RTEMS_version, s);
-
- while (1) {
- /* Do nothing */
- }
-}
-
void _BSP_Fatal_error( unsigned n)
{
rtems_interrupt_level level;
@@ -169,7 +155,7 @@ void bsp_start( void)
if (RTEMS_SUCCESSFUL !=
bsp_tqm_get_cib_uint32("cu",
&BSP_bus_frequency)) {
- BSP_panic("Cannot determine BUS frequency\n");
+ rtems_panic("Cannot determine BUS frequency\n");
}
bsp_time_base_frequency = BSP_bus_frequency / 16;
diff --git a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
index 67bf6c6..747dfdf 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/virtex4/include/bsp.h
@@ -70,7 +70,6 @@ extern rtems_configuration_table BSP_Configuration; /* owned by BSP */
#endif /* ASM */
void BSP_ask_for_reset(void);
-void BSP_panic(char *s);
void _BSP_Fatal_error(unsigned int v);
/*
diff --git a/c/src/lib/libbsp/powerpc/virtex4/irq/irq_init.c b/c/src/lib/libbsp/powerpc/virtex4/irq/irq_init.c
index 97f8c58..5feafaf 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/virtex4/irq/irq_init.c
@@ -321,6 +321,6 @@ void BSP_rtems_irq_mngt_init(unsigned cpuId)
* initialize interrupt management
*/
if (!BSP_rtems_irq_mngt_set(&initialConfig)) {
- BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
+ rtems_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
}
}
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c b/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c
index 1c4c531..8a8004d 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c
@@ -133,18 +133,6 @@ void BSP_ask_for_reset(void)
}
-void BSP_panic(char *s)
-{
- RTEMS_UNUSED rtems_interrupt_level level;
-
- rtems_interrupt_disable(level);
-
- printk("\n%s PANIC %s\n", rtems_get_version_string(), s);
-
- BSP_ask_for_reset();
-}
-
-
void _BSP_Fatal_error(unsigned int v)
{
RTEMS_UNUSED rtems_interrupt_level level;
diff --git a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h b/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
index b0df844..490ed8f 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/virtex5/include/bsp.h
@@ -99,7 +99,6 @@ void zero_bss(void);
#endif /* ASM */
void BSP_ask_for_reset(void);
-void BSP_panic(char *s);
void _BSP_Fatal_error(unsigned int v);
#ifdef __cplusplus
diff --git a/c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c b/c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c
index cba95df..1fea921 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/virtex5/irq/irq_init.c
@@ -338,6 +338,6 @@ void BSP_rtems_irq_mngt_init(unsigned cpuId)
* initialize interrupt management
*/
if (!BSP_rtems_irq_mngt_set(&initialConfig)) {
- BSP_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
+ rtems_panic("Unable to initialize RTEMS interrupt Management!!! System locked\n");
}
}
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c b/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c
index 93f99ad..ff7a384 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c
@@ -147,18 +147,6 @@ void BSP_ask_for_reset(void)
}
-void BSP_panic(char *s)
-{
- RTEMS_UNUSED rtems_interrupt_level level;
-
- rtems_interrupt_disable(level);
-
- printk("\n%s PANIC %s\n", rtems_get_version_string(), s);
-
- BSP_ask_for_reset();
-}
-
-
void _BSP_Fatal_error(unsigned int v)
{
RTEMS_UNUSED rtems_interrupt_level level;
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c
index 5d6e174..e986f23 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c
@@ -1602,15 +1602,15 @@ rtems_irq_connect_data xx;
if ( shared ) {
#if BSP_SHARED_HANDLER_SUPPORT > 0
if (!BSP_install_rtems_shared_irq_handler(&xx))
- BSP_panic("unable to install vmeTsi148 shared irq handler");
+ rtems_panic("unable to install vmeTsi148 shared irq handler");
#else
uprintf(stderr,"vmeTsi148: WARNING: your BSP doesn't support sharing interrupts\n");
if (!BSP_install_rtems_irq_handler(&xx))
- BSP_panic("unable to install vmeTsi148 irq handler");
+ rtems_panic("unable to install vmeTsi148 irq handler");
#endif
} else {
if (!BSP_install_rtems_irq_handler(&xx))
- BSP_panic("unable to install vmeTsi148 irq handler");
+ rtems_panic("unable to install vmeTsi148 irq handler");
}
}
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
index 0914eda..a5f25b4 100644
--- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
+++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c
@@ -283,7 +283,7 @@ extern int k_vsprintf(char *, char *, va_list);
char buf[200];
rval = k_vsprintf(buf,fmt,ap);
if (rval > sizeof(buf))
- BSP_panic("vmeUniverse/uprintk: buffer overrun");
+ rtems_panic("vmeUniverse/uprintk: buffer overrun");
printk(buf);
return rval;
}
@@ -2032,15 +2032,15 @@ rtems_irq_connect_data aarrggh;
if ( shared ) {
#if BSP_SHARED_HANDLER_SUPPORT > 0
if (!BSP_install_rtems_shared_irq_handler(&aarrggh))
- BSP_panic("unable to install vmeUniverse shared irq handler");
+ rtems_panic("unable to install vmeUniverse shared irq handler");
#else
uprintf(stderr,"vmeUniverse: WARNING: your BSP doesn't support sharing interrupts\n");
if (!BSP_install_rtems_irq_handler(&aarrggh))
- BSP_panic("unable to install vmeUniverse irq handler");
+ rtems_panic("unable to install vmeUniverse irq handler");
#endif
} else {
if (!BSP_install_rtems_irq_handler(&aarrggh))
- BSP_panic("unable to install vmeUniverse irq handler");
+ rtems_panic("unable to install vmeUniverse irq handler");
}
}
diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c
index 3ba7e8f..351edb4 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_init.c
@@ -141,7 +141,7 @@ void CPU_rtems_irq_mng_init(unsigned cpuId)
/*
* put something here that will show the failure...
*/
- BSP_panic("Unable to initialize RTEMS interrupt Management\n");
+ rtems_panic("Unable to initialize RTEMS interrupt Management\n");
}
/*
@@ -155,11 +155,11 @@ void CPU_rtems_irq_mng_init(unsigned cpuId)
vectorDesc.off = nop_raw_enable;
vectorDesc.isOn = raw_is_connected;
if (!mpc5xx_set_exception (&vectorDesc)) {
- BSP_panic("Unable to initialize RTEMS decrementer raw exception\n");
+ rtems_panic("Unable to initialize RTEMS decrementer raw exception\n");
}
vectorDesc.exceptIndex = ASM_EXT_VECTOR;
vectorDesc.hdl.vector = ASM_EXT_VECTOR;
if (!mpc5xx_set_exception (&vectorDesc)) {
- BSP_panic("Unable to initialize RTEMS external raw exception\n");
+ rtems_panic("Unable to initialize RTEMS external raw exception\n");
}
}
diff --git a/cpukit/score/cpu/powerpc/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
index cacd3ea..b8f00bf 100644
--- a/cpukit/score/cpu/powerpc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/powerpc/rtems/score/cpu.h
@@ -675,8 +675,6 @@ static inline void _CPU_ISR_Set_level( uint32_t level )
_CPU_MSR_SET(msr);
}
-void BSP_panic(char *);
-
/* Fatal Error manager macros */
/*
More information about the vc
mailing list