diff options
Diffstat (limited to 'c/src/lib/libbsp/shared/console.c')
-rw-r--r-- | c/src/lib/libbsp/shared/console.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/shared/console.c b/c/src/lib/libbsp/shared/console.c index b3c3d75f27..7aba7ace74 100644 --- a/c/src/lib/libbsp/shared/console.c +++ b/c/src/lib/libbsp/shared/console.c @@ -16,13 +16,13 @@ */ #include <bsp.h> +#include <bsp/generic-fatal.h> #include <rtems/libio.h> #include <stdlib.h> #include <assert.h> #include <termios.h> #include <rtems/termiostypes.h> -#include <rtems/error.h> /* rtems_panic */ #include <libchip/serial.h> #include "console_private.h" @@ -48,7 +48,7 @@ static void console_initialize_pointers(void) Console_Port_Count = Console_Configuration_Count; Console_Port_Tbl = malloc( Console_Port_Count * sizeof( console_tbl * ) ); if (Console_Port_Tbl == NULL) - rtems_panic("No memory for console pointers"); + bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_NO_MEMORY_0 ); for (i=0 ; i < Console_Port_Count ; i++) Console_Port_Tbl[i] = &Console_Configuration_Ports[i]; @@ -75,8 +75,7 @@ void console_register_devices( * register devices. */ if ( console_initialized ) { - printk( "Attempt to register console devices after driver initialized\n" ); - rtems_fatal_error_occurred( 0xdead0001 ); + bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_MULTI_INIT ); } /* @@ -89,14 +88,12 @@ void console_register_devices( Console_Port_Count * sizeof( console_tbl * ) ); if ( Console_Port_Tbl == NULL ) { - printk( "Unable to allocate pointer table for registering console devices\n" ); - rtems_fatal_error_occurred( 0xdead0002 ); + bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_NO_MEMORY_1 ); } Console_Port_Data = calloc( Console_Port_Count, sizeof( console_data ) ); if ( Console_Port_Data == NULL ) { - printk( "Unable to allocate data table for console devices\n" ); - rtems_fatal_error_occurred( 0xdead0003 ); + bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_NO_MEMORY_2 ); } /* @@ -257,8 +254,7 @@ rtems_device_driver console_initialize( console_initialize_pointers(); Console_Port_Data = calloc( Console_Port_Count, sizeof( console_data ) ); if ( Console_Port_Data == NULL ) { - printk( "Unable to allocate data table for console devices\n" ); - rtems_fatal_error_occurred( 0xdead0003 ); + bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_NO_MEMORY_3 ); } } @@ -293,8 +289,7 @@ rtems_device_driver console_initialize( if (port->sDeviceName != NULL) { status = rtems_io_register_name( port->sDeviceName, major, minor ); if (status != RTEMS_SUCCESSFUL) { - printk( "Unable to register %s\n", port->sDeviceName ); - rtems_fatal_error_occurred(status); + bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_REGISTER_DEV_0 ); } } @@ -305,8 +300,7 @@ rtems_device_driver console_initialize( #endif status = rtems_io_register_name( "dev/console", major, minor ); if (status != RTEMS_SUCCESSFUL) { - printk( "Unable to register /dev/console\n" ); - rtems_fatal_error_occurred(status); + bsp_generic_fatal( BSP_GENERIC_FATAL_CONSOLE_REGISTER_DEV_1 ); } } |