diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-09-21 00:24:51 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-09-21 00:24:51 +0000 |
| commit | c610a1f300b410fb58a9af21884000fcabc9aa02 (patch) | |
| tree | 5e2455eda5b1802310723c166dafb640a15094f1 /c/src/lib/libbsp/i386/pc386 | |
| parent | Update from Erik Ivanenko <erik.ivanenko@utoronto.ca> to bring the (diff) | |
| download | rtems-c610a1f300b410fb58a9af21884000fcabc9aa02.tar.bz2 | |
Update from Eric Valette <valette@crf.canon.fr>:
Here are patches that bring 980911 back to what I think is a correct
version of raw IDT management as well as a correct initialisation
of video console and rtems managed interrupts.
Diffstat (limited to 'c/src/lib/libbsp/i386/pc386')
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/start/start16.s | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/bspstart.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/start/start16.s b/c/src/lib/libbsp/i386/pc386/start/start16.s index 778c0dd597..d09430e0af 100644 --- a/c/src/lib/libbsp/i386/pc386/start/start16.s +++ b/c/src/lib/libbsp/i386/pc386/start/start16.s @@ -92,10 +92,8 @@ _start16: #else ljmp $PROT_CODE_SEG, $1f # flush prefetch queue, and reload %cs #endif -1: - .code32 - +1: /*---------------------------------------------------------------------+ | load the other segment registers +---------------------------------------------------------------------*/ diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c index 7927ef2c0b..5d6635d13b 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c @@ -1,6 +1,4 @@ /*-------------------------------------------------------------------------+ -| bspstart.c v1.1 - PC386 BSP - 1997/08/07 -+--------------------------------------------------------------------------+ | This file contains the PC386 BSP startup package. It includes application, | board, and monitor specific initialization and configuration. The generic CPU | dependent initialization has been performed before this routine is invoked. @@ -38,12 +36,12 @@ #include <libcsupport.h> #include <rtems/libio.h> #include <libcpu/cpuModel.h> +#include <pc386uart.h> /*-------------------------------------------------------------------------+ | Global Variables +--------------------------------------------------------------------------*/ extern rtems_unsigned32 _end; /* End of BSS. Defined in 'linkcmds'. */ - /* * Size of heap if it is 0 it will be dynamically defined by memory size, * otherwise the value should be changed by binary patch @@ -75,6 +73,7 @@ extern void _exit(int); /* define in exit.c */ void bsp_libc_init( void *, unsigned32, int ); void bsp_postdriver_hook(void); extern void rtems_irq_mngt_init(); +extern void _IBMPC_initVideo(void); /*-------------------------------------------------------------------------+ | Function: bsp_pretasking_hook @@ -151,6 +150,10 @@ void bsp_start( void ) * Calibrate variable for 1ms-loop (see timer.c) */ Calibrate_loop_1ms(); + /* + * Initialize printk channel + */ + _IBMPC_initVideo(); rtemsFreeMemStart = (rtems_unsigned32)&_end + _stack_size; /* set the value of start of free memory. */ |