summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Weingartner <weingart@cvs.openbsd.org>1997-04-23 14:49:25 +0000
committerTobias Weingartner <weingart@cvs.openbsd.org>1997-04-23 14:49:25 +0000
commit74568dffac788c7812e22fabcdd6830ce3b672c4 (patch)
treefb59cef0b00685c90c9a9399a126208c39f5b852
parentd761d42c1b72901509c9084e6e913a9f0b08c567 (diff)
Clean up disk reset code
-rw-r--r--sys/arch/i386/stand/libsa/biosdev.c4
-rw-r--r--sys/arch/i386/stand/libsa/biosdev.h4
-rw-r--r--sys/arch/i386/stand/libsa/biosdisk.S3
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index 7c4a944888a..073a94eae33 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosdev.c,v 1.13 1997/04/23 06:49:06 mickey Exp $ */
+/* $OpenBSD: biosdev.c,v 1.14 1997/04/23 14:49:23 weingart Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -333,7 +333,7 @@ biosstrategy(void *devdata, int rw,
p->bd_id != error; p++);
printf("\nBIOS error %x (%s)\n",
p->bd_id, p->msg);
- biosdreset();
+ biosdreset(bd->biosdev);
break;
}
}
diff --git a/sys/arch/i386/stand/libsa/biosdev.h b/sys/arch/i386/stand/libsa/biosdev.h
index 43dcbdc100f..fd556f44e3a 100644
--- a/sys/arch/i386/stand/libsa/biosdev.h
+++ b/sys/arch/i386/stand/libsa/biosdev.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosdev.h,v 1.6 1997/04/21 20:20:27 mickey Exp $ */
+/* $OpenBSD: biosdev.h,v 1.7 1997/04/23 14:49:23 weingart Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -50,7 +50,7 @@ int biosioctl __P((struct open_file *, u_long, void *));
/* biosdisk.S */
u_int16_t biosdinfo __P((int dev));
-int biosdreset __P((void));
+int biosdreset __P((int dev));
int biosread __P((int dev, int cyl, int hd, int sect, int nsect, void *));
int bioswrite __P((int dev, int cyl, int hd, int sect, int nsect, void *));
diff --git a/sys/arch/i386/stand/libsa/biosdisk.S b/sys/arch/i386/stand/libsa/biosdisk.S
index 99282717071..84267f3e836 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.7 1997/04/18 17:48:23 mickey Exp $ */
+/* $OpenBSD: biosdisk.S,v 1.8 1997/04/23 14:49:24 weingart Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff
@@ -125,6 +125,7 @@ ENTRY(biosdreset)
pushl %ecx
movb $0x00, %ah # reset disk system
+ movb 8(%ebp), %dl # drive #
BIOSINT(0x13)
popl %ecx