Changeset 33cb8bf in rtems


Ignore:
Timestamp:
Feb 17, 2014, 10:40:18 AM (6 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
46d7fa5
Parents:
b39e055
git-author:
Sebastian Huber <sebastian.huber@…> (02/17/14 10:40:18)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/19/14 08:59:39)
Message:

score: Add RTEMS_FATAL_SOURCE_BSP

Merge RTEMS_FATAL_SOURCE_BSP_GENERIC and RTEMS_FATAL_SOURCE_BSP_SPECIFIC
into new fatal source RTEMS_FATAL_SOURCE_BSP. This makes it easier to
figure out the code position given a fatal source and code.

Files:
1 added
1 deleted
39 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/Makefile.am

    rb39e055 r33cb8bf  
    3434include_bsp_HEADERS =
    3535include_bsp_HEADERS += shared/include/default-initial-extension.h
    36 include_bsp_HEADERS += shared/include/generic-fatal.h
     36include_bsp_HEADERS += shared/include/fatal.h
    3737
    3838include $(srcdir)/preinstall.am
  • c/src/lib/libbsp/arm/lpc24xx/include/bsp.h

    rb39e055 r33cb8bf  
    118118bool lpc24xx_uart_probe_3(int minor);
    119119
    120 typedef enum {
    121   BSP_ARM_PL111_FATAL_REGISTER_DEV,
    122   BSP_ARM_PL111_FATAL_SEM_CREATE,
    123   BSP_ARM_PL111_FATAL_SEM_RELEASE,
    124   LPC24XX_FATAL_PL111_SET_UP,
    125   LPC24XX_FATAL_PL111_PINS_SET_UP,
    126   LPC24XX_FATAL_PL111_PINS_TEAR_DOWN,
    127   LPC24XX_FATAL_PL111_TEAR_DOWN
    128 } lpc24xx_fatal_code;
    129 
    130120/** @} */
    131121
  • c/src/lib/libbsp/arm/lpc24xx/startup/fb-config.c

    rb39e055 r33cb8bf  
    1616
    1717#include <bsp.h>
     18#include <bsp/fatal.h>
    1819#include <bsp/io.h>
    1920#include <bsp/lcd.h>
     
    4950  sc = lpc24xx_module_enable(LPC24XX_MODULE_LCD, LPC24XX_MODULE_PCLK_DEFAULT);
    5051  if (sc != RTEMS_SUCCESSFUL) {
    51     rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, LPC24XX_FATAL_PL111_SET_UP);
     52    bsp_fatal(LPC24XX_FATAL_PL111_SET_UP);
    5253  }
    5354
     
    6970  sc = lpc24xx_pin_config(tft_16_bit_5_6_5_pins, LPC24XX_PIN_SET_FUNCTION);
    7071  if (sc != RTEMS_SUCCESSFUL) {
    71     rtems_fatal(
    72       RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
    73       LPC24XX_FATAL_PL111_PINS_SET_UP
    74     );
     72    bsp_fatal(LPC24XX_FATAL_PL111_PINS_SET_UP);
    7573  }
    7674}
     
    8280  sc = lpc24xx_pin_config(tft_16_bit_5_6_5_pins, LPC24XX_PIN_SET_INPUT);
    8381  if (sc != RTEMS_SUCCESSFUL) {
    84     rtems_fatal(
    85       RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
    86       LPC24XX_FATAL_PL111_PINS_TEAR_DOWN
    87     );
     82    bsp_fatal(LPC24XX_FATAL_PL111_PINS_TEAR_DOWN);
    8883  }
    8984}
     
    9994  sc = lpc24xx_module_disable(LPC24XX_MODULE_LCD);
    10095  if (sc != RTEMS_SUCCESSFUL) {
    101     rtems_fatal(
    102       RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
    103       LPC24XX_FATAL_PL111_TEAR_DOWN
    104     );
     96    bsp_fatal(LPC24XX_FATAL_PL111_TEAR_DOWN);
    10597  }
    10698}
  • c/src/lib/libbsp/arm/realview-pbx-a9/include/bsp.h

    rb39e055 r33cb8bf  
    5252#define BSP_ARM_GIC_DIST_BASE 0x1f001000
    5353
    54 typedef enum {
    55   BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_INSTALL,
    56   BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE,
    57   BSP_ARM_PL111_FATAL_REGISTER_DEV,
    58   BSP_ARM_PL111_FATAL_SEM_CREATE,
    59   BSP_ARM_PL111_FATAL_SEM_RELEASE
    60 } rvpbxa9_fatal_code;
    61 
    62 void rvpbxa9_fatal(rvpbxa9_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
    63 
    6454#ifdef __cplusplus
    6555}
  • c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstart.c

    rb39e055 r33cb8bf  
    1717#include <bsp/irq-generic.h>
    1818
    19 void rvpbxa9_fatal(rvpbxa9_fatal_code code)
    20 {
    21   rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
    22 }
    23 
    2419void bsp_start(void)
    2520{
  • c/src/lib/libbsp/arm/shared/arm-a9mpcore-clock-config.c

    rb39e055 r33cb8bf  
    1616
    1717#include <bsp.h>
     18#include <bsp/fatal.h>
    1819#include <bsp/irq.h>
    1920#include <bsp/arm-a9mpcore-regs.h>
     
    5253  );
    5354  if (sc != RTEMS_SUCCESSFUL) {
    54     rtems_fatal(
    55       RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
    56       BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_INSTALL
    57     );
     55    bsp_fatal(BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_INSTALL);
    5856  }
    5957}
     
    122120  );
    123121  if (sc != RTEMS_SUCCESSFUL) {
    124     rtems_fatal(
    125       RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
    126       BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE
    127     );
     122    bsp_fatal(BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE);
    128123  }
    129124}
  • c/src/lib/libbsp/arm/shared/arm-pl111-fb.c

    rb39e055 r33cb8bf  
    2323#include <bsp.h>
    2424#include <bsp/arm-pl111-fb.h>
     25#include <bsp/fatal.h>
    2526
    2627typedef struct {
     
    155156  rtems_status_code sc = rtems_semaphore_release(ctx->semaphore);
    156157  if (sc != RTEMS_SUCCESSFUL) {
    157     rtems_fatal(
    158       RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
    159       BSP_ARM_PL111_FATAL_SEM_RELEASE
    160     );
     158    bsp_fatal(BSP_ARM_PL111_FATAL_SEM_RELEASE);
    161159  }
    162160}
     
    173171  sc = rtems_io_register_name(FRAMEBUFFER_DEVICE_0_NAME, major, 0);
    174172  if (sc != RTEMS_SUCCESSFUL) {
    175     rtems_fatal(
    176       RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
    177       BSP_ARM_PL111_FATAL_REGISTER_DEV
    178     );
     173    bsp_fatal(BSP_ARM_PL111_FATAL_REGISTER_DEV);
    179174  }
    180175
     
    187182  );
    188183  if (sc != RTEMS_SUCCESSFUL) {
    189     rtems_fatal(
    190       RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
    191       BSP_ARM_PL111_FATAL_SEM_CREATE
    192     );
     184    bsp_fatal(BSP_ARM_PL111_FATAL_SEM_CREATE);
    193185  }
    194186
  • c/src/lib/libbsp/arm/xilinx-zynq/include/bsp.h

    rb39e055 r33cb8bf  
    5656#define BSP_ARM_GIC_DIST_BASE 0xf8f01000
    5757
    58 typedef enum {
    59   BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_INSTALL,
    60   BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE
    61 } zynq_fatal_code;
    62 
    63 void zynq_fatal(zynq_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
    64 
    6558/**
    6659 * @brief Zynq specific set up of the MMU.
  • c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstart.c

    rb39e055 r33cb8bf  
    1717#include <bsp/irq-generic.h>
    1818
    19 void zynq_fatal(zynq_fatal_code code)
    20 {
    21   rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
    22 }
    23 
    2419void bsp_start(void)
    2520{
  • c/src/lib/libbsp/m68k/mrm332/spurious/spinit.c

    rb39e055 r33cb8bf  
    1616
    1717#include <bsp.h>
    18 #include <bsp/generic-fatal.h>
     18#include <bsp/fatal.h>
    1919#include <stdio.h>
    2020
     
    7373  RAW_PUTS("\n\r");
    7474#endif
    75   bsp_generic_fatal( BSP_GENERIC_FATAL_SPURIOUS_INTERRUPT );
     75  bsp_fatal( MRM332_FATAL_SPURIOUS_INTERRUPT );
    7676}
    7777
  • c/src/lib/libbsp/powerpc/gen5200/ide/ata-dma-pio-single.c

    rb39e055 r33cb8bf  
    2020
    2121#include <bsp.h>
     22#include <bsp/fatal.h>
    2223#include <bsp/irq.h>
    2324
     
    183184    );
    184185    if (sc != RTEMS_SUCCESSFUL) {
    185       mpc5200_fatal(MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL);
     186      bsp_fatal(MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL);
    186187    }
    187188  }
  • c/src/lib/libbsp/powerpc/gen5200/ide/ata-instance.c

    rb39e055 r33cb8bf  
    1414
    1515#include <bsp/ata.h>
     16#include <bsp/fatal.h>
    1617
    1718#include <libchip/ata.h>
     
    3435    ata_driver_dma_pio_single_create(&ata_driver_instance, "/dev/hda", TASK_PCI_TX);
    3536  } else {
    36     mpc5200_fatal(MPC5200_FATAL_ATA_DISK_IO_INIT);
     37    bsp_fatal(MPC5200_FATAL_ATA_DISK_IO_INIT);
    3738  }
    3839
  • c/src/lib/libbsp/powerpc/gen5200/ide/ata.c

    rb39e055 r33cb8bf  
    1818
    1919#include <bsp.h>
     20#include <bsp/fatal.h>
    2021#include <bsp/mpc5200.h>
    2122
     
    126127  );
    127128  if (sc != RTEMS_SUCCESSFUL) {
    128     mpc5200_fatal(MPC5200_FATAL_ATA_LOCK_CREATE);
     129    bsp_fatal(MPC5200_FATAL_ATA_LOCK_CREATE);
    129130  }
    130131}
     
    134135  rtems_status_code sc = rtems_semaphore_delete(self->lock);
    135136  if (sc != RTEMS_SUCCESSFUL) {
    136     mpc5200_fatal(MPC5200_FATAL_ATA_LOCK_DESTROY);
     137    bsp_fatal(MPC5200_FATAL_ATA_LOCK_DESTROY);
    137138  }
    138139}
     
    163164
    164165        if (sc != RTEMS_SUCCESSFUL) {
    165           mpc5200_fatal(MPC5200_FATAL_ATA_DISK_CREATE);
     166          bsp_fatal(MPC5200_FATAL_ATA_DISK_CREATE);
    166167        }
    167168      }
  • c/src/lib/libbsp/powerpc/gen5200/include/bsp.h

    rb39e055 r33cb8bf  
    255255void cpu_init(void);
    256256
    257 typedef enum {
    258   MPC5200_FATAL_PCF8563_INVALID_YEAR,
    259   MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL,
    260   MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL,
    261   MPC5200_FATAL_TM27_IRQ_INSTALL,
    262   MPC5200_FATAL_MSCAN_A_INIT,
    263   MPC5200_FATAL_MSCAN_B_INIT,
    264   MPC5200_FATAL_MSCAN_A_SET_MODE,
    265   MPC5200_FATAL_MSCAN_B_SET_MODE,
    266   MPC5200_FATAL_ATA_DISK_IO_INIT,
    267   MPC5200_FATAL_ATA_DISK_CREATE,
    268   MPC5200_FATAL_ATA_DMA_SINGLE_IRQ_INSTALL,
    269   MPC5200_FATAL_ATA_LOCK_CREATE,
    270   MPC5200_FATAL_ATA_LOCK_DESTROY
    271 } mpc5200_fatal_code;
    272 
    273 void mpc5200_fatal(mpc5200_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
    274 
    275257#ifdef __cplusplus
    276258}
  • c/src/lib/libbsp/powerpc/gen5200/include/tm27.h

    rb39e055 r33cb8bf  
    1818#define __tm27_h
    1919
     20#include <bsp/fatal.h>
    2021#include <bsp/irq.h>
    2122
     
    3839  if (!BSP_install_rtems_irq_handler (&clockIrqData)) {
    3940        printk("Error installing clock interrupt handler!\n");
    40         mpc5200_fatal(MPC5200_FATAL_TM27_IRQ_INSTALL);
     41        bsp_fatal(MPC5200_FATAL_TM27_IRQ_INSTALL);
    4142  }
    4243}
  • c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c

    rb39e055 r33cb8bf  
    2626
    2727#include "../include/bsp.h"
     28#include <bsp/fatal.h>
    2829#include <bsp/irq.h>
    2930#include "../mscan/mscan_int.h"
     
    771772  /* Initialization requested via RTEMS */
    772773  if ((status = mscan_channel_initialize(major, MSCAN_A)) != RTEMS_SUCCESSFUL)
    773     mpc5200_fatal(MPC5200_FATAL_MSCAN_A_INIT);
     774    bsp_fatal(MPC5200_FATAL_MSCAN_A_INIT);
    774775
    775776  if ((status = mscan_channel_initialize(major, MSCAN_B)) != RTEMS_SUCCESSFUL)
    776     mpc5200_fatal(MPC5200_FATAL_MSCAN_B_INIT);
     777    bsp_fatal(MPC5200_FATAL_MSCAN_B_INIT);
    777778
    778779  if ((status =
    779780       mpc5200_mscan_set_mode(MSCAN_A,
    780781                              MSCAN_INIT_NORMAL_MODE)) != RTEMS_SUCCESSFUL)
    781     mpc5200_fatal(MPC5200_FATAL_MSCAN_A_SET_MODE);
     782    bsp_fatal(MPC5200_FATAL_MSCAN_A_SET_MODE);
    782783
    783784  if ((status =
    784785       mpc5200_mscan_set_mode(MSCAN_B,
    785786                              MSCAN_INIT_NORMAL_MODE)) != RTEMS_SUCCESSFUL)
    786     mpc5200_fatal(MPC5200_FATAL_MSCAN_B_SET_MODE);
     787    bsp_fatal(MPC5200_FATAL_MSCAN_B_SET_MODE);
    787788
    788789  return status;
  • c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c

    rb39e055 r33cb8bf  
    100100#include <bsp.h>
    101101#include <rtems/bspIo.h>
     102#include <bsp/fatal.h>
    102103#include <bsp/irq.h>
    103104
     
    339340
    340341      printk("Unable to connect PSC Irq handler\n");
    341       mpc5200_fatal(MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL);
     342      bsp_fatal(MPC5200_FATAL_SLICETIMER_0_IRQ_INSTALL);
    342343
    343344      }
     
    354355
    355356      printk("Unable to connect PSC Irq handler\n");
    356       mpc5200_fatal(MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL);
     357      bsp_fatal(MPC5200_FATAL_SLICETIMER_1_IRQ_INSTALL);
    357358
    358359      }
  • c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c

    rb39e055 r33cb8bf  
    125125}
    126126
    127 void mpc5200_fatal(mpc5200_fatal_code code)
    128 {
    129   rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
    130 }
    131 
    132127void bsp_start(void)
    133128{
  • c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c

    rb39e055 r33cb8bf  
    4242
    4343#include <rtems.h>
     44#include <bsp/fatal.h>
    4445#include <libchip/rtc.h>
    4546#include <string.h>
     
    186187
    187188    if ((time->year >= 2100) || (time->year <  1900)) {
    188       mpc5200_fatal(MPC5200_FATAL_PCF8563_INVALID_YEAR);
     189      bsp_fatal(MPC5200_FATAL_PCF8563_INVALID_YEAR);
    189190    }
    190191    info[0] = PCF8563_SECOND_ADR;
  • c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c

    rb39e055 r33cb8bf  
    2222
    2323#include <bsp.h>
     24#include <bsp/fatal.h>
    2425#include <bsp/irq.h>
    2526
     
    5455  );
    5556  if (sc != RTEMS_SUCCESSFUL) {
    56     mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL);
     57    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL);
    5758  }
    5859}
     
    7475    interval /= (uint64_t) prescaler;
    7576  } else {
    76     mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER);
     77    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER);
    7778  }
    7879
    7980  /* Check interval */
    8081  if (interval == 0 || interval > MPC55XX_EMIOS_VALUE_MAX) {
    81     mpc55xx_fatal(MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL);
     82    bsp_fatal(MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL);
    8283  }
    8384
     
    160161  );
    161162  if (sc != RTEMS_SUCCESSFUL) {
    162     mpc55xx_fatal(MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL);
     163    bsp_fatal(MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL);
    163164  }
    164165}
  • c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-esci.c

    rb39e055 r33cb8bf  
    2222
    2323#include <bsp.h>
     24#include <bsp/fatal.h>
    2425#include <bsp/irq.h>
    2526
     
    269270  rv = rtems_termios_set_initial_baud(tty, BSP_DEFAULT_BAUD_RATE);
    270271  if (rv != 0) {
    271     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_BAUD);
     272    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_BAUD);
    272273  }
    273274
    274275  rv = mpc55xx_esci_set_attributes(minor, &tty->termios);
    275276  if (rv != 0) {
    276     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES);
     277    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES);
    277278  }
    278279
     
    286287  );
    287288  if (sc != RTEMS_SUCCESSFUL) {
    288     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL);
     289    bsp_fatal(MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL);
    289290  }
    290291
  • c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-generic.c

    rb39e055 r33cb8bf  
    2323#include <bsp.h>
    2424#include <bsp/console-generic.h>
     25#include <bsp/fatal.h>
    2526
    2627#include <rtems/console.h>
     
    8182
    8283  if (count <= 0) {
    83     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_COUNT);
     84    bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_COUNT);
    8485  }
    8586
     
    9192    sc = rtems_io_register_name(info->device_path, major, minor);
    9293    if (sc != RTEMS_SUCCESSFUL) {
    93       mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER);
     94      bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER);
    9495    }
    9596  }
     
    9798  sc = rtems_io_register_name(CONSOLE_DEVICE_NAME, major, console);
    9899  if (sc != RTEMS_SUCCESSFUL) {
    99     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE);
     100    bsp_fatal(MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE);
    100101  }
    101102
  • c/src/lib/libbsp/powerpc/mpc55xxevb/console/console-linflex.c

    rb39e055 r33cb8bf  
    2222
    2323#include <bsp.h>
     24#include <bsp/fatal.h>
    2425#include <bsp/irq.h>
    2526
     
    262263  rv = rtems_termios_set_initial_baud(tty, BSP_DEFAULT_BAUD_RATE);
    263264  if (rv != 0) {
    264     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD);
     265    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD);
    265266  }
    266267
    267268  rv = mpc55xx_linflex_set_attributes(minor, &tty->termios);
    268269  if (rv != 0) {
    269     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES);
     270    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES);
    270271  }
    271272
     
    279280  );
    280281  if (sc != RTEMS_SUCCESSFUL) {
    281     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL);
     282    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL);
    282283  }
    283284
     
    291292  );
    292293  if (sc != RTEMS_SUCCESSFUL) {
    293     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL);
     294    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL);
    294295  }
    295296
     
    304305  );
    305306  if (sc != RTEMS_SUCCESSFUL) {
    306     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL);
     307    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL);
    307308  }
    308309  */
     
    334335  );
    335336  if (sc != RTEMS_SUCCESSFUL) {
    336     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE);
     337    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE);
    337338  }
    338339
     
    343344  );
    344345  if (sc != RTEMS_SUCCESSFUL) {
    345     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE);
     346    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE);
    346347  }
    347348
     
    353354  );
    354355  if (sc != RTEMS_SUCCESSFUL) {
    355     mpc55xx_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE);
     356    bsp_fatal(MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE);
    356357  }
    357358  */
  • c/src/lib/libbsp/powerpc/mpc55xxevb/include/bsp.h

    rb39e055 r33cb8bf  
    100100#define BSP_SYSRAM_SECTION __attribute__((section(".bsp_sysram")))
    101101
    102 typedef enum {
    103   MPC55XX_FATAL_FMPLL_LOCK,
    104   MPC55XX_FATAL_CLOCK_EMIOS_IRQ_INSTALL,
    105   MPC55XX_FATAL_CLOCK_EMIOS_PRESCALER,
    106   MPC55XX_FATAL_CLOCK_EMIOS_INTERVAL,
    107   MPC55XX_FATAL_CLOCK_PIT_IRQ_INSTALL,
    108   MPC55XX_FATAL_CONSOLE_GENERIC_COUNT,
    109   MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER,
    110   MPC55XX_FATAL_CONSOLE_GENERIC_REGISTER_CONSOLE,
    111   MPC55XX_FATAL_CONSOLE_ESCI_BAUD,
    112   MPC55XX_FATAL_CONSOLE_ESCI_ATTRIBUTES,
    113   MPC55XX_FATAL_CONSOLE_ESCI_IRQ_INSTALL,
    114   MPC55XX_FATAL_CONSOLE_LINFLEX_BAUD,
    115   MPC55XX_FATAL_CONSOLE_LINFLEX_ATTRIBUTES,
    116   MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_INSTALL,
    117   MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_INSTALL,
    118   MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_INSTALL,
    119   MPC55XX_FATAL_CONSOLE_LINFLEX_RX_IRQ_REMOVE,
    120   MPC55XX_FATAL_CONSOLE_LINFLEX_TX_IRQ_REMOVE,
    121   MPC55XX_FATAL_CONSOLE_LINFLEX_ERR_IRQ_REMOVE,
    122   MPC55XX_FATAL_EDMA_IRQ_INSTALL,
    123   MPC55XX_FATAL_EDMA_IRQ_REMOVE
    124 } mpc55xx_fatal_code;
    125 
    126 void mpc55xx_fatal(mpc55xx_fatal_code code) RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
    127 
    128102#ifdef __cplusplus
    129103}
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c

    rb39e055 r33cb8bf  
    6262}
    6363
    64 void mpc55xx_fatal(mpc55xx_fatal_code code)
    65 {
    66   rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, code);
    67 }
    68 
    6964static void null_pointer_protection(void)
    7065{
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c

    rb39e055 r33cb8bf  
    2222
    2323#include <bsp.h>
     24#include <bsp/fatal.h>
    2425#include <bsp/start.h>
    2526#include <bsp/bootcard.h>
     
    3940
    4041      if (!lock) {
    41         mpc55xx_fatal(MPC55XX_FATAL_FMPLL_LOCK);
     42        bsp_fatal(MPC55XX_FATAL_FMPLL_LOCK);
    4243      }
    4344    }
  • c/src/lib/libbsp/preinstall.am

    rb39e055 r33cb8bf  
    2323PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/default-initial-extension.h
    2424
    25 $(PROJECT_INCLUDE)/bsp/generic-fatal.h: shared/include/generic-fatal.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    26         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/generic-fatal.h
    27 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/generic-fatal.h
     25$(PROJECT_INCLUDE)/bsp/fatal.h: shared/include/fatal.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     26        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/fatal.h
     27PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/fatal.h
    2828
  • c/src/lib/libbsp/shared/console.c

    rb39e055 r33cb8bf  
    1717
    1818#include <bsp.h>
    19 #include <bsp/generic-fatal.h>
     19#include <bsp/fatal.h>
    2020#include <rtems/libio.h>
    2121#include <rtems/console.h>
     
    5050  Console_Port_Tbl   = malloc( Console_Port_Count * sizeof( console_tbl * ) );
    5151  if (Console_Port_Tbl == NULL)
    52     bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_NO_MEMORY_0 );
     52    bsp_fatal( BSP_FATAL_CONSOLE_NO_MEMORY_0 );
    5353
    5454  for (i=0 ; i < Console_Port_Count ; i++)
     
    7777   */
    7878  if ( console_initialized ) {
    79     bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_MULTI_INIT );
     79    bsp_fatal( BSP_FATAL_CONSOLE_MULTI_INIT );
    8080  }
    8181
     
    9090  );
    9191  if ( Console_Port_Tbl == NULL ) {
    92     bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_NO_MEMORY_1 );
     92    bsp_fatal( BSP_FATAL_CONSOLE_NO_MEMORY_1 );
    9393  }
    9494
    9595  Console_Port_Data  = calloc( Console_Port_Count, sizeof( console_data ) );
    9696  if ( Console_Port_Data == NULL ) {
    97     bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_NO_MEMORY_2 );
     97    bsp_fatal( BSP_FATAL_CONSOLE_NO_MEMORY_2 );
    9898  }
    9999
     
    256256    Console_Port_Data  = calloc( Console_Port_Count, sizeof( console_data ) );
    257257    if ( Console_Port_Data == NULL ) {
    258       bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_NO_MEMORY_3 );
     258      bsp_fatal( BSP_FATAL_CONSOLE_NO_MEMORY_3 );
    259259    }
    260260  }
     
    291291        status = rtems_io_register_name( port->sDeviceName, major, minor );
    292292        if (status != RTEMS_SUCCESSFUL) {
    293           bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_REGISTER_DEV_0 );
     293          bsp_fatal( BSP_FATAL_CONSOLE_REGISTER_DEV_0 );
    294294        }
    295295      }
     
    298298        status = rtems_io_register_name( CONSOLE_DEVICE_NAME, major, minor );
    299299        if (status != RTEMS_SUCCESSFUL) {
    300           bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_REGISTER_DEV_1 );
     300          bsp_fatal( BSP_FATAL_CONSOLE_REGISTER_DEV_1 );
    301301        }
    302302      }
  • c/src/lib/libbsp/shared/console_select.c

    rb39e055 r33cb8bf  
    2020
    2121#include <bsp.h>
    22 #include <bsp/generic-fatal.h>
     22#include <bsp/fatal.h>
    2323#include <rtems/libio.h>
    2424#include <stdlib.h>
     
    7373   *  Error No devices were found.  We will want to bail here.
    7474   */
    75   bsp_generic_fatal(BSP_GENERIC_FATAL_CONSOLE_NO_DEV);
     75  bsp_fatal(BSP_FATAL_CONSOLE_NO_DEV);
    7676}
    7777
  • c/src/lib/libbsp/shared/include/irq-generic.h

    rb39e055 r33cb8bf  
    172172 * all internals are initialized.  If the BSP specific initialization fails,
    173173 * then this is a fatal error.  The fatal error source is
    174  * RTEMS_FATAL_SOURCE_BSP_GENERIC and the fatal error code is
    175  * BSP_GENERIC_FATAL_INTERRUPT_INITIALIZATION.
     174 * RTEMS_FATAL_SOURCE_BSP and the fatal error code is
     175 * BSP_FATAL_INTERRUPT_INITIALIZATION.
    176176 */
    177177void bsp_interrupt_initialize(void);
  • c/src/lib/libbsp/shared/src/irq-generic.c

    rb39e055 r33cb8bf  
    2424
    2525#include <bsp/irq-generic.h>
    26 #include <bsp/generic-fatal.h>
     26#include <bsp/fatal.h>
    2727
    2828#include <stdlib.h>
     
    172172  sc = bsp_interrupt_facility_initialize();
    173173  if (sc != RTEMS_SUCCESSFUL) {
    174     bsp_generic_fatal(BSP_GENERIC_FATAL_INTERRUPT_INITIALIZATION);
     174    bsp_fatal(BSP_FATAL_INTERRUPT_INITIALIZATION);
    175175  }
    176176
  • c/src/lib/libbsp/sparc/leon3/include/bsp.h

    rb39e055 r33cb8bf  
    210210extern void BSP_shared_interrupt_mask(int irq);
    211211
    212 typedef enum {
    213   LEON3_FATAL_CPU_COUNTER_INIT
    214 } leon3_fatal_code;
    215 
    216212#ifdef __cplusplus
    217213}
  • c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c

    rb39e055 r33cb8bf  
    1414
    1515#include <bsp.h>
     16#include <bsp/fatal.h>
    1617#include <leon.h>
    1718
     
    3839  );
    3940  if (adev == NULL) {
    40     rtems_fatal(RTEMS_FATAL_SOURCE_BSP_SPECIFIC, LEON3_FATAL_CPU_COUNTER_INIT);
     41    bsp_fatal(LEON3_FATAL_CPU_COUNTER_INIT);
    4142  }
    4243
  • c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c

    rb39e055 r33cb8bf  
    2727
    2828#include <bsp.h>
     29#include <bsp/fatal.h>
    2930#include <bsp/irq.h>
    3031
     
    200201    );
    201202    if (sc != RTEMS_SUCCESSFUL) {
    202       mpc55xx_fatal(MPC55XX_FATAL_EDMA_IRQ_INSTALL);
     203      bsp_fatal(MPC55XX_FATAL_EDMA_IRQ_INSTALL);
    203204    }
    204205  }
     
    284285  );
    285286  if (sc != RTEMS_SUCCESSFUL) {
    286     mpc55xx_fatal(MPC55XX_FATAL_EDMA_IRQ_REMOVE);
     287    bsp_fatal(MPC55XX_FATAL_EDMA_IRQ_REMOVE);
    287288  }
    288289}
  • c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c

    rb39e055 r33cb8bf  
    2626
    2727#include <bsp/vectors.h>
    28 #include <bsp/generic-fatal.h>
     28#include <bsp/fatal.h>
    2929
    3030#define PPC_EXC_ASSERT_OFFSET(field, off) \
     
    146146static void ppc_exc_fatal_error(void)
    147147{
    148   bsp_generic_fatal(BSP_GENERIC_FATAL_EXCEPTION_INITIALIZATION);
     148  bsp_fatal(PPC_FATAL_EXCEPTION_INITIALIZATION);
    149149}
    150150
  • c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/vectors.h

    rb39e055 r33cb8bf  
    371371 *
    372372 * If the initialization fails, then this is a fatal error.  The fatal error
    373  * source is RTEMS_FATAL_SOURCE_BSP_GENERIC and the fatal error code is
    374  * BSP_GENERIC_FATAL_EXCEPTION_INITIALIZATION.
     373 * source is RTEMS_FATAL_SOURCE_BSP and the fatal error code is
     374 * PPC_FATAL_EXCEPTION_INITIALIZATION.
    375375 *
    376376 * Possible error reasons are
  • cpukit/sapi/src/fatalsrctext.c

    rb39e055 r33cb8bf  
    3434  "RTEMS_FATAL_SOURCE_APPLICATION",
    3535  "RTEMS_FATAL_SOURCE_EXIT",
    36   "RTEMS_FATAL_SOURCE_BSP_GENERIC",
    37   "RTEMS_FATAL_SOURCE_BSP_SPECIFIC",
     36  "RTEMS_FATAL_SOURCE_BSP",
    3837  "RTEMS_FATAL_SOURCE_ASSERT",
    3938  "RTEMS_FATAL_SOURCE_STACK_CHECKER",
  • cpukit/score/include/rtems/score/interr.h

    rb39e055 r33cb8bf  
    7070
    7171  /**
    72    * @brief Fatal source for generic BSP errors.
    73    *
    74    * The fatal codes are defined in <bsp/generic-fatal.h>.  Examples are
    75    * interrupt and exception initialization.
    76    *
    77    * @see bsp_generic_fatal_code and bsp_generic_fatal().
    78    */
    79   RTEMS_FATAL_SOURCE_BSP_GENERIC,
    80 
    81   /**
    82    * @brief Fatal source for BSP specific errors.
    83    *
    84    * The fatal code is BSP specific.
    85    */
    86   RTEMS_FATAL_SOURCE_BSP_SPECIFIC,
     72   * @brief Fatal source for BSP errors.
     73   *
     74   * The fatal codes are defined in <bsp/fatal.h>.  Examples are interrupt and
     75   * exception initialization.
     76   *
     77   * @see bsp_fatal_code and bsp_fatal().
     78   */
     79  RTEMS_FATAL_SOURCE_BSP,
    8780
    8881  /**
  • testsuites/sptests/spinternalerror02/spinternalerror02.scn

    rb39e055 r33cb8bf  
    3333RTEMS_FATAL_SOURCE_APPLICATION
    3434RTEMS_FATAL_SOURCE_EXIT
    35 RTEMS_FATAL_SOURCE_BSP_GENERIC
    36 RTEMS_FATAL_SOURCE_BSP_SPECIFIC
     35RTEMS_FATAL_SOURCE_BSP
    3736RTEMS_FATAL_SOURCE_ASSERT
    3837RTEMS_FATAL_SOURCE_STACK_CHECKER
Note: See TracChangeset for help on using the changeset viewer.