diff options
| author | peter <peter@FreeBSD.org> | 1999-11-18 05:15:09 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-11-18 05:15:09 +0000 |
| commit | 773cbf275819857dc5a621832ca8ae4c509b82cc (patch) | |
| tree | d90e89e4a53939bd9ae35543c0e2db105003981b /sys/isa | |
| parent | ab56d89b349b14c836eadb426f6e724101e1d2f7 (diff) | |
| download | FreeBSD-src-773cbf275819857dc5a621832ca8ae4c509b82cc.zip FreeBSD-src-773cbf275819857dc5a621832ca8ae4c509b82cc.tar.gz | |
Tidy up a few loose ends in the fifo setup code.
Don't use NFDC as an arbitary limit, it is not required and goes against
using PnP fdc devices (eg: when PNPBIOS is turned on, the motherboard
devices (sio, fdc, etc etc) are detected via PnP, not config(8).)
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/fd.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 442e1e1..da131e1 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -51,11 +51,8 @@ * */ -#include "fd.h" #include "opt_fdc.h" -#if NFDC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -344,9 +341,6 @@ static int yeinit(struct pccard_devinfo *devi) { fdc_p fdc = &fdc_data[devi->isahd.id_unit]; - /* validate unit number. */ - if (devi->isahd.id_unit >= NFDC) - return(ENODEV); fdc->baseport = devi->isahd.id_iobase; /* * reset controller @@ -812,14 +806,6 @@ fdc_attach(device_t dev) fdout_wr(fdc, ((fdc->fdout = 0))); bufq_init(&fdc->head); -#ifdef FIFO_BEFORE_MOTORON - /* Hmm, this doesn't work here - is set_motor() magic? -Peter */ - if (fdc->fdct != FDC_NE765 && fdc->fdct != FDC_UNKNOWN - && enable_fifo(fdc) == 0) { - device_print_prettyname(dev); - printf("FIFO enabled, %d bytes threshold\n", fifo_threshold); - } -#endif /* * Probe and attach any children as were configured above. */ @@ -874,9 +860,7 @@ fd_probe(device_t dev) struct fd_data *fd; struct fdc_data *fdc; fdsu_t fdsu; -#ifndef FIFO_BEFORE_MOTORON static int fd_fifo = 0; -#endif fdsu = *(int *)device_get_ivars(dev); /* xxx cheat a bit... */ fd = device_get_softc(dev); @@ -916,14 +900,13 @@ fd_probe(device_t dev) set_motor(fdc, fdsu, TURNON); DELAY(1000000); /* 1 sec */ -#ifndef FIFO_BEFORE_MOTORON + /* XXX This doesn't work before the first set_motor() */ if (fd_fifo == 0 && fdc->fdct != FDC_NE765 && fdc->fdct != FDC_UNKNOWN && enable_fifo(fdc) == 0) { device_print_prettyname(device_get_parent(dev)); printf("FIFO enabled, %d bytes threshold\n", fifo_threshold); } fd_fifo = 1; -#endif if ((fd_cmd(fdc, 2, NE7CMD_SENSED, fdsu, 1, &st3) == 0) && (st3 & NE7_ST3_T0)) { @@ -2356,8 +2339,6 @@ fdioctl(dev, cmd, addr, flag, p) return (error); } -#endif /* NFDC > 0 */ - /* * Hello emacs, these are the * Local Variables: |
