diff options
author | kato <kato@FreeBSD.org> | 1997-01-04 08:32:33 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 1997-01-04 08:32:33 +0000 |
commit | 5717d507652943b907f7afd3045e0e2bc719ef12 (patch) | |
tree | 7a4e53b9ddd5c7786708511511ea444307f98689 /sys | |
parent | 75697c25bc61c91b5809c10e662dbe37cc7b00e4 (diff) | |
download | FreeBSD-src-5717d507652943b907f7afd3045e0e2bc719ef12.zip FreeBSD-src-5717d507652943b907f7afd3045e0e2bc719ef12.tar.gz |
Clean-up.
Submitted by: Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
Diffstat (limited to 'sys')
-rw-r--r-- | sys/pc98/boot/biosboot/io.c | 6 | ||||
-rw-r--r-- | sys/pc98/boot/biosboot/sys.c | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/sys/pc98/boot/biosboot/io.c b/sys/pc98/boot/biosboot/io.c index a292d45..bdf4ba1 100644 --- a/sys/pc98/boot/biosboot/io.c +++ b/sys/pc98/boot/biosboot/io.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:35:57 rpd - * $Id: io.c,v 1.5 1996/10/23 07:24:32 asami Exp $ + * $Id: io.c,v 1.6 1996/11/09 00:18:03 asami Exp $ */ #include "boot.h" @@ -176,11 +176,7 @@ isch(void) } -#ifdef PC98 -static __inline unsigned -#else static __inline unsigned -#endif pword(unsigned physaddr) { #ifdef PC98 diff --git a/sys/pc98/boot/biosboot/sys.c b/sys/pc98/boot/biosboot/sys.c index e7930b0..04dbccc 100644 --- a/sys/pc98/boot/biosboot/sys.c +++ b/sys/pc98/boot/biosboot/sys.c @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd - * $Id: sys.c,v 1.6 1996/10/29 08:36:11 asami Exp $ + * $Id: sys.c,v 1.7 1996/11/09 00:18:10 asami Exp $ */ /* @@ -46,7 +46,7 @@ static char biosdrivedigit; #define BUFSIZE 8192 #define MAPBUFSIZE BUFSIZE -char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE]; +char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE]; char mapbuf[MAPBUFSIZE]; int mapblock; @@ -271,8 +271,8 @@ openrd(void) } switch(maj) { - case 4: /* sd */ #ifdef PC98 + case 4: /* sd */ dosdev_copy = unit | 0xa0; disk_equips = *(unsigned char *)V(0xA1482); sdunit = unit; @@ -280,18 +280,21 @@ openrd(void) for (i = 0; i < sdunit; i++) unit += ((disk_equips >> i) & 0x01); #else /* IBM-PC */ + case 0: + case 4: dosdev_copy = biosdrive | 0x80; #endif break; +#ifdef PC98 case 0: case 2: -#ifdef PC98 dosdev_copy = (maj << 3) | unit | 0x80; #else + case 2: dosdev_copy = biosdrive; #endif break; - case 3: + default: printf("Unknown device\n"); return 1; } |