diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-11-21 11:43:13 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-11-22 09:40:23 +0100 |
commit | 1c193a26d227a42a1ea76564950488f48189dbde (patch) | |
tree | 5818e3c47383605bd5fd78f80ceb0c9f9ce3cef8 /c/src/lib/libbsp/powerpc/shared | |
parent | sapi: New implementation of rtems_panic() (diff) | |
download | rtems-1c193a26d227a42a1ea76564950488f48189dbde.tar.bz2 |
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.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/shared')
7 files changed, 7 insertions, 19 deletions
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 a58cd246c4..1a44992a5b 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 80901223b8..4a9c393f7f 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 15a37d1444..556014964b 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 80d5461dcb..0a1c04a2e2 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 5a069b84f4..8a3695ab47 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 b1a926827b..636dbe6fd0 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 5036cb17d1..158a899b2a 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; |