diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/start/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/start/start16.S | 24 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/bspstart.c | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/startup/ldsegs.S | 34 |
5 files changed, 34 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/start/Makefile.am b/c/src/lib/libbsp/i386/pc386/start/Makefile.am index f8e467dab2..2d530c6695 100644 --- a/c/src/lib/libbsp/i386/pc386/start/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/pc386/start/start16.S b/c/src/lib/libbsp/i386/pc386/start/start16.S index d9aea202f3..520895de47 100644 --- a/c/src/lib/libbsp/i386/pc386/start/start16.S +++ b/c/src/lib/libbsp/i386/pc386/start/start16.S @@ -109,16 +109,16 @@ _start16: outb %al, $0x60 call empty_8042 - call delay - call delay - call delay + call pc386_delay + call pc386_delay + call pc386_delay movl %cs:HDRSTART + HDROFF, %eax # pushl %eax # jump to start of 32 bit code ret # /*----------------------------------------------------------------------------+ -| delay +| pc386_delay +------------------------------------------------------------------------------ | Delay is needed after doing I/O. | @@ -131,10 +131,10 @@ _start16: | NOTE: Saving the content of the EAX register just in case. - Rosimildo. +----------------------------------------------------------------------------*/ .p2align 4 - .globl _delay - .globl delay -delay: -_delay: + .globl _pc386_delay + .globl pc386_delay +pc386_delay: +_pc386_delay: pushl %eax #if defined(USE_OUTB_FOR_DELAY) outb %al, $0x80 # about 1uS delay on most machines @@ -142,9 +142,9 @@ _delay: #else movl $0x200, %eax -delay1: +pc386_delay1: dec %eax - jnz delay1 + jnz pc386_delay1 #endif popl %eax ret @@ -162,11 +162,11 @@ delay1: .globl empty_8042 empty_8042: _empty_8042: - call delay + call pc386_delay inb $0x64, %al # 8042 status port testb $0x01, %al # output buffer? jz no_output - call delay + call pc386_delay in $0x60, %al # read it jmp empty_8042 no_output: diff --git a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am index ac225d520b..a634ef5724 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c index dc2a24debb..e443b31402 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/pc386/startup/bspstart.c @@ -163,7 +163,7 @@ void bsp_start_default( void ) Cpu_table.do_zero_of_workspace = TRUE; Cpu_table.interrupt_table_segment = get_ds(); Cpu_table.interrupt_table_offset = (void *)Interrupt_descriptor_table; - Cpu_table.interrupt_stack_size = 4096; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.extra_mpci_receive_server_stack = 0; /* Place RTEMS workspace at beginning of free memory. */ @@ -174,8 +174,6 @@ void bsp_start_default( void ) BSP_Configuration.work_space_start = (void *)rtemsFreeMemStart; rtemsFreeMemStart += BSP_Configuration.work_space_size; - console_reserve_resources(&BSP_Configuration); - /* * Init rtems interrupt management */ diff --git a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S index 87fc02f0f4..6d7ec06022 100644 --- a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S +++ b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S @@ -50,7 +50,7 @@ BEGIN_CODE EXTERN (clockOff) /*----------------------------------------------------------------------------+ -| delay +| pc386_delay +------------------------------------------------------------------------------ | Delay is needed after doing I/O. | @@ -64,17 +64,17 @@ BEGIN_CODE #define DELAY_USE_OUTB .p2align 4 - .globl _delay - .globl delay -delay: -_delay: + .globl _pc386_delay + .globl pc386_delay +pc386_delay: +_pc386_delay: #ifdef DELAY_USE_OUTB outb al, $0x80 # about 1uS delay on most machines #else movl $0x200, eax -delay1: +pc386_delay1: dec eax - jnz delay1 + jnz pc386_delay1 #endif ret @@ -123,36 +123,36 @@ next_step: movb $0x11, al /* initialization sequence */ outb al, $0x20 /* send it to 8259A-1 */ - call SYM(delay) + call SYM(pc386_delay) outb al, $0xA0 /* and to 8259A-2 */ - call SYM(delay) + call SYM(pc386_delay) movb $0x20, al /* start of hardware int's (0x20) */ outb al, $0x21 - call SYM(delay) + call SYM(pc386_delay) movb $0x28, al /* start of hardware int's 2 (0x28) */ outb al, $0xA1 - call SYM(delay) + call SYM(pc386_delay) movb $0x04, al /* 8259-1 is master */ outb al, $0x21 - call SYM(delay) + call SYM(pc386_delay) movb $0x02, al /* 8259-2 is slave */ outb al, $0xA1 - call SYM(delay) + call SYM(pc386_delay) movb $0x01, al /* 8086 mode for both */ outb al, $0x21 - call SYM(delay) + call SYM(pc386_delay) outb al, $0xA1 - call SYM(delay) + call SYM(pc386_delay) movb $0xFF, al /* mask off all interrupts for now */ outb al, $0xA1 - call SYM(delay) + call SYM(pc386_delay) movb $0xFB, al /* mask all irq's but irq2 which */ outb al, $0x21 /* is cascaded */ - call SYM(delay) + call SYM(pc386_delay) movw $0xFFFB, SYM(i8259s_cache) /* set up same values in cache */ |