proper includes

s/BIOSINT/DOINT/g
pass %es in bios regs save area

4 files changed, 22 insertions, 21 deletions

diff --git a/sys/arch/i386/stand/libsa/biosdisk.S b/sys/arch/i386/stand/libsa/biosdisk.S
index a546c07b536..14a89109e86 100644
--- a/sys/arch/i386/stand/libsa/biosdisk.S
+++ b/sys/arch/i386/stand/libsa/biosdisk.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdisk.S,v 1.9 1997/05/30 02:21:51 mickey Exp $	*/
+/*	$OpenBSD: biosdisk.S,v 1.10 1997/07/18 00:29:08 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -34,13 +34,13 @@
 
 #include <machine/asm.h>
 #define	_LOCORE
+#include <machine/biosvar.h>
 #include "debug_md.h"
-#include "biosdev.h"
 #undef	_LOCORE
 
 
 	.globl	_C_LABEL(errno)	/* XXX used for bios errors */
-
+	.globl	_C_LABEL(BIOS_regs)
 /*
  * int biosread(dev,cyl,head,sect,nsect,buf)
  *	read number of sectors from disk
@@ -67,8 +67,9 @@ ENTRY(biosread)
 	movl	%ebx, %edi	# split off for seg:off pair
 	andl	$0xf, %ebx	# atomic read for up to 64k
 	shrl	$4, %edi
+	movl	%edi, _C_LABEL(BIOS_regs)+BIOSR_ES
 
-	BIOSINT(0x13)
+	DOINT(0x13)
 	movb	$0, %al
 	jnc	1f
 	movb	%ah, %al
@@ -101,7 +102,7 @@ ENTRY(biosdinfo)
 
 	movb	8(%ebp), %dl		# drive #
 	movb	$0x08, %ah		# ask for disk info
-	BIOSINT(0x13)
+	DOINT(0x13)
 	movb	$1, %ah			# max head
 	movb	$18, %al		# max sector
 	jc	1f
@@ -129,7 +130,7 @@ ENTRY(biosdreset)
 
 	movb	$0x00, %ah		# reset disk system
 	movb	8(%ebp), %dl		# drive #
-	BIOSINT(0x13)
+	DOINT(0x13)
 
 	popl	%ecx
 	popl	%ebx
@@ -148,7 +149,7 @@ ENTRY(EDDcheck)
 	movb	$0x44, %ah
 	movw	$0x55aa, %bx
 	movl	8(%ebp), %edx
-	BIOSINT(0x13)
+	DOINT(0x13)
 	movl	$-1, %eax
 	jc	1f
 	cmpw	$0xaa55, %bx
@@ -192,7 +193,7 @@ ENTRY(EDDread)
 	movl	24(%ebp), %eax	/* buffer */
 	movl	%eax, 4(%esi)
 	movb	$0x42, %ah
-	BIOSINT(0x13)
+	DOINT(0x13)
 	jnc	1f
 	xorl	%eax, %eax
 
diff --git a/sys/arch/i386/stand/libsa/bioskbd.S b/sys/arch/i386/stand/libsa/bioskbd.S
index 1cc176f0a26..f1b993b297f 100644
--- a/sys/arch/i386/stand/libsa/bioskbd.S
+++ b/sys/arch/i386/stand/libsa/bioskbd.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bioskbd.S,v 1.7 1997/05/31 15:38:45 mickey Exp $	*/
+/*	$OpenBSD: bioskbd.S,v 1.8 1997/07/18 00:29:09 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -34,10 +34,10 @@
 
 #include <machine/asm.h>
 #define	_LOCORE
+#include <machine/biosvar.h>
 #include <dev/isa/isareg.h>
 #include <dev/ic/mc146818reg.h>
 #include <i386/isa/nvram.h>
-#include "biosdev.h"
 #undef	_LOCORE
 
 /* 
@@ -69,7 +69,7 @@ ENTRY(kbd_putc)
 	movb	$0x0e, %ah
 	xorl	%ebx, %ebx
 	incl	%ebx
-	BIOSINT(0x10)		# display a byte
+	DOINT(0x10)		# display a byte
 	popl	%ebx
 	ret
 
@@ -81,7 +81,7 @@ ENTRY(kbd_getc)
 	pushl	%ebx
 	pushl	%ecx
 	xorl	%eax, %eax
-	BIOSINT(0x16)
+	DOINT(0x16)
 	movzbl	%al, %eax
 	popl	%ecx
 	popl	%ebx
@@ -96,7 +96,7 @@ ENTRY(kbd_ischar)
 	pushl	%ecx
 	xorl	%eax, %eax
 	incb	%ah
-	BIOSINT(0x16)
+	DOINT(0x16)
 	setnz	%al
 	movzbl	%al, %eax
 	popl	%ecx
diff --git a/sys/arch/i386/stand/libsa/biosmem.S b/sys/arch/i386/stand/libsa/biosmem.S
index cad9d2988fb..930a51b30b3 100644
--- a/sys/arch/i386/stand/libsa/biosmem.S
+++ b/sys/arch/i386/stand/libsa/biosmem.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosmem.S,v 1.3 1997/05/29 04:41:48 mickey Exp $	*/
+/*	$OpenBSD: biosmem.S,v 1.4 1997/07/18 00:29:09 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -34,11 +34,11 @@
 
 #include <machine/asm.h>
 #define	_LOCORE
-#include "biosdev.h"
+#include <machine/biosvar.h>
 #undef	_LOCORE
 
 ENTRY(biosmem)
 	pushl	%ebx
-	BIOSINT(0x12)
+	DOINT(0x12)
 	popl	%ebx
 	ret
diff --git a/sys/arch/i386/stand/libsa/biostime.S b/sys/arch/i386/stand/libsa/biostime.S
index 1abd6ad4b29..f5527267cd9 100644
--- a/sys/arch/i386/stand/libsa/biostime.S
+++ b/sys/arch/i386/stand/libsa/biostime.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biostime.S,v 1.9 1997/07/08 03:41:00 mickey Exp $	*/
+/*	$OpenBSD: biostime.S,v 1.10 1997/07/18 00:29:10 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -36,7 +36,7 @@
 
 #include <machine/asm.h>
 #define	_LOCORE
-#include "biosdev.h"
+#include <machine/biosvar.h>
 #undef	_LOCORE
 
 /*
@@ -58,7 +58,7 @@ ENTRY(usleep)
 	shrl	$16, %ecx
 
 	movb	$0x86, %ah
-	BIOSINT(0x15)
+	DOINT(0x15)
 #ifdef notdef
 	xorb	%al, %al
 	jnc	1f
@@ -81,7 +81,7 @@ ENTRY(biostime)
 	pushl	%ebx
 
 	movb	$0x02, %ah
-	BIOSINT(0x1a)
+	DOINT(0x1a)
 	movb	$1, %al
 	jc	1f
 
@@ -112,7 +112,7 @@ ENTRY(biosdate)
 	pushl	%ebx
 
 	movb	$0x04, %ah
-	BIOSINT(0x1a)
+	DOINT(0x1a)
 	movb	$1, %al
 	jc	1f