d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Removed COMPAT_ATDISK from option because it is pseudo-device now.

Browse Source 
- Fixed arguments of atcompat_dsinit() in diskslice_machdep.c.
This commit is contained in:
KATO Takenori 1999-08-29 21:28:47 +00:00
parent 0b93733576
commit 545a1c84b2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=50594
5 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/conf/options.pc98
View File

@ -194,5 +194,4 @@ FPU_ERROR_BROKEN opt_npx.h
PC98 opt_global.h
EPSON_BOUNCEDMA opt_pc98.h
EPSON_MEMWIN opt_pc98.h
COMPAT_ATDISK opt_pc98.h
LINE30 opt_syscons.h

4
sys/pc98/conf/GENERIC
View File

@ -57,10 +57,6 @@ options SYSVSEM #SYSV-style semaphores
options COM_MULTIPORT
#
# IBM-PC HDD support
#options COMPAT_ATDISK
# To make an SMP kernel, the next two are needed
#options SMP # Symmetric MultiProcessor Kernel
#options APIC_IO # Symmetric (APIC) I/O

4
sys/pc98/conf/GENERIC98
View File

@ -57,10 +57,6 @@ options SYSVSEM #SYSV-style semaphores
options COM_MULTIPORT
#
# IBM-PC HDD support
#options COMPAT_ATDISK
# To make an SMP kernel, the next two are needed
#options SMP # Symmetric MultiProcessor Kernel
#options APIC_IO # Symmetric (APIC) I/O

1
sys/pc98/conf/options.pc98
View File

@ -194,5 +194,4 @@ FPU_ERROR_BROKEN opt_npx.h
PC98 opt_global.h
EPSON_BOUNCEDMA opt_pc98.h
EPSON_MEMWIN opt_pc98.h
COMPAT_ATDISK opt_pc98.h
LINE30 opt_syscons.h

10
sys/pc98/pc98/diskslice_machdep.c
View File

@ -42,7 +42,7 @@
* PC9801 port by KATO Takenor <kato@eclogite.eps.nagoya-u.ac.jp>
*/
#include "opt_pc98.h"
#include "compat_atdisk.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -81,8 +81,8 @@ static void extended __P((char *dname, dev_t dev, struct disklabel *lp,
#ifdef PC98
#define DPBLKNO(cyl,hd,sect) ((cyl)*(lp->d_secpercyl))
#ifdef COMPAT_ATDISK
int atcompat_dsinit __P((char *dname, dev_t dev,
#if NCOMPAT_ATDISK > 0
int atcompat_dsinit __P((dev_t dev,
struct disklabel *lp, struct diskslices **sspp));
#endif
#endif
@ -312,7 +312,7 @@ dsinit(dev, lp, sspp)
ssp->dss_nslices = BASE_SLICE + 1;
goto done;
}
#ifdef COMPAT_ATDISK
#if NCOMPAT_ATDISK > 0
/*
* Check magic number of 'extended format' for PC-9801.
* If no magic, it may be formatted on IBM-PC.
@ -324,7 +324,7 @@ dsinit(dev, lp, sspp)
/* IBM-PC HDD */
bp->b_flags = B_INVAL | B_AGE;
brelse(bp);
return atcompat_dsinit(devtoname(bp->b_dev), dev, lp, sspp);
return atcompat_dsinit(dev, lp, sspp);
}
#endif
dp0 = (struct dos_partition *)(cp + 512);