From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/lib/libbsp/i386/pc386/start/start16.S | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'c/src/lib/libbsp/i386/pc386/start/start16.S')

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:
-- 
cgit v1.2.3