diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-31 23:03:45 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-31 23:03:45 +0000 |
commit | b285860989cc2e4002e32005ce7e9005744bffa5 (patch) | |
tree | 3f27893a0a01ac2ee2a6a7fcfa9ef5e050e1b756 /c/src/lib/libbsp/i386/pc386/startup/exit.c | |
parent | Patch from Eric Valette <valette@crf.canon.fr>: (diff) | |
download | rtems-b285860989cc2e4002e32005ce7e9005744bffa5.tar.bz2 |
Patch from Eric Valette <valette@crf.canon.fr>:
Eric> NB : there is still a bug on PC386 serial line : exit does not
Eric> flush the remaining output queue. As this is not a bug in the
Eric> driver itself but somewhere in PC386 initialization/termios
Eric> relationship it will be part of another patch.
Eric> NB2 : As Emmanuel excerced the exception hanlder code, while
Eric> porting the SMC driver to the new BSD stack, we found a bug
Eric> in the exception handler : it shall not delete the current
Eric> thread in case we are running at interrupt level. This will
Eric> be part of another patch...
So here is the patch. This patch fixes the two problems mentionned above
+ it use vpath mechanism intead of copying the irq related files in
the right directory. This avoid to compile them each time and is
more homogenous with other Makefiles.
Diffstat (limited to 'c/src/lib/libbsp/i386/pc386/startup/exit.c')
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/exit.c | 69 |
1 files changed, 11 insertions, 58 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/startup/exit.c b/c/src/lib/libbsp/i386/pc386/startup/exit.c index 5166049d34..6e72e4bbd8 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/exit.c +++ b/c/src/lib/libbsp/i386/pc386/startup/exit.c @@ -37,67 +37,20 @@ #include <rtems/libio.h> #include <pc386uart.h> -/*-------------------------------------------------------------------------+ - | Which console is in use: either (-1) which means normal console or - | uart id if uart was used - +-------------------------------------------------------------------------*/ -extern int PC386ConsolePort; - -/*-------------------------------------------------------------------------+ -| External Prototypes -+--------------------------------------------------------------------------*/ -extern rtems_boolean _IBMPC_scankey(char *); /* defined in 'inch.c' */ - -/*-------------------------------------------------------------------------+ -| Function: _exit -| Description: Shutdown the PC. Called from libc's 'exit'. -| Global Variables: None. -| Arguments: status - exit status (ignored). -| Returns: Nothing. -+--------------------------------------------------------------------------*/ -void _exit(int status) +void bsp_cleanup() { - unsigned char ch, *cp; + unsigned char ch; static char line[]="EXECUTIVE SHUTDOWN! Any key to reboot..."; - - if(PC386ConsolePort == PC386_CONSOLE_PORT_CONSOLE) - { - - printk("\n"); - printk(line); - while(!_IBMPC_scankey(&ch)) - ; - printk("\n\n"); - } - else - { - /* Close console */ - __rtems_close(2); - __rtems_close(1); - __rtems_close(0); - - PC386_uart_intr_ctrl(PC386ConsolePort, PC386_UART_INTR_CTRL_DISABLE); - - PC386_uart_polled_write(PC386ConsolePort, '\r'); - PC386_uart_polled_write(PC386ConsolePort, '\n'); - - for(cp=line; *cp != 0; cp++) - { - PC386_uart_polled_write(PC386ConsolePort, *cp); - } - - PC386_uart_polled_read(PC386ConsolePort); - - PC386_uart_polled_write(PC386ConsolePort, '\r'); - PC386_uart_polled_write(PC386ConsolePort, '\n'); - PC386_uart_polled_write(PC386ConsolePort, '\r'); - PC386_uart_polled_write(PC386ConsolePort, '\n'); - } - + /* + * AT this point, the console driver is disconnected => we must + * use polled output/input. This is exactly what printk + * does. + */ + printk("\n"); + printk(line); + ch = BSP_poll_char(); rtemsReboot(); -} /* _exit */ - - +} |