diff options
| author | KATO Takenori <kato@FreeBSD.org> | 2000-03-23 08:50:56 +0000 |
|---|---|---|
| committer | KATO Takenori <kato@FreeBSD.org> | 2000-03-23 08:50:56 +0000 |
| commit | aad765270690c255ff678394589ba062d19d2b80 (patch) | |
| tree | ec7b3e39654c077e68abf3046dc3c608086d57fb /sys/pc98 | |
| parent | 25d654e785a0ff5763cc936a73e5f8e73c0be9cd (diff) | |
| download | src-aad765270690c255ff678394589ba062d19d2b80.tar.gz src-aad765270690c255ff678394589ba062d19d2b80.zip | |
Disable fdctl_wr_foo. This feature is not supported by PC98.
Notes
Notes:
svn path=/head/; revision=58475
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/fdc.c | 5 | ||||
| -rw-r--r-- | sys/pc98/pc98/fd.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index e3a6d081c388..3031b93a1298 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -952,8 +952,9 @@ fdc_pccard_probe(device_t dev) fdc = device_get_softc(dev); bzero(fdc, sizeof *fdc); fdc->fdc_dev = dev; +#ifndef PC98 fdc->fdctl_wr = fdctl_wr_pcmcia; - +#endif fdc->flags |= FDC_ISPCMCIA | FDC_NODMA; /* Attempt to allocate our resources for the duration of the probe */ @@ -961,10 +962,12 @@ fdc_pccard_probe(device_t dev) if (error) goto out; +#ifndef PC98 /* First - lets reset the floppy controller */ fdout_wr(fdc, 0); DELAY(100); fdout_wr(fdc, FDO_FRST); +#endif /* see if it can handle a command */ if (fd_cmd(fdc, 3, NE7CMD_SPECIFY, NE7_SPEC_1(3, 240), diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index e3a6d081c388..3031b93a1298 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -952,8 +952,9 @@ fdc_pccard_probe(device_t dev) fdc = device_get_softc(dev); bzero(fdc, sizeof *fdc); fdc->fdc_dev = dev; +#ifndef PC98 fdc->fdctl_wr = fdctl_wr_pcmcia; - +#endif fdc->flags |= FDC_ISPCMCIA | FDC_NODMA; /* Attempt to allocate our resources for the duration of the probe */ @@ -961,10 +962,12 @@ fdc_pccard_probe(device_t dev) if (error) goto out; +#ifndef PC98 /* First - lets reset the floppy controller */ fdout_wr(fdc, 0); DELAY(100); fdout_wr(fdc, FDO_FRST); +#endif /* see if it can handle a command */ if (fd_cmd(fdc, 3, NE7CMD_SPECIFY, NE7_SPEC_1(3, 240), |