summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>2000-03-23 08:50:56 +0000
committerkato <kato@FreeBSD.org>2000-03-23 08:50:56 +0000
commitf4fce91d7b9fdf198e90c8a72cb1f809396f90f1 (patch)
tree91865e7d3a95992aab9dcd2bef017a8695e46614 /sys
parentf9ee6714df20eea160628355a4198377b6991091 (diff)
downloadFreeBSD-src-f4fce91d7b9fdf198e90c8a72cb1f809396f90f1.zip
FreeBSD-src-f4fce91d7b9fdf198e90c8a72cb1f809396f90f1.tar.gz
Disable fdctl_wr_foo. This feature is not supported by PC98.
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/cbus/fdc.c5
-rw-r--r--sys/pc98/pc98/fd.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index e3a6d08..3031b93 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 e3a6d08..3031b93 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),
OpenPOWER on IntegriCloud