diff options
author | Warner Losh <imp@FreeBSD.org> | 2004-09-17 18:50:38 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2004-09-17 18:50:38 +0000 |
commit | 27df52f99937ece59b5eabd8d26997b7b1633970 (patch) | |
tree | 465e6c9c745833f92e06577dc4b9627dbd400dd1 /sys/dev/fdc/fdc_acpi.c | |
parent | 9468063a703732468ed97cde73ca841e1d98486a (diff) | |
download | src-27df52f99937ece59b5eabd8d26997b7b1633970.tar.gz src-27df52f99937ece59b5eabd8d26997b7b1633970.zip |
The long dead hand of the past has pushed forward useless bits in this
driver. Trim its fingernails by removing some useless bits before
fixing the 'thread not terminated on detach' problem.
o dmacnt is no longer used now that we allocate at attach time. Remove
it from struct fdc_data.
o ISPNP was only ever set, but never tested. It used to be used for the
allocation routines to change how it allocated resources. Since that's
no longer necessary, retire the flag.
o ISPCMICA was only ever tested, but never set. GC it. This removes
a special case in determining the drive type. The drive type is
now set in fdc_pcmcia.c, so the hack isn't needed anymore. Sadly,
this isn't tested with a Y-E Data pcmcia floppy drive because there
are a number of other issues that preclude it from working.
o Fix ifdef for reading from the rtc. I'm of the opinion that this ifdef
should be moved into fdc_isa.c, but not today as ideally there'd be
other fixes to the probing of children. So now we just read it on
i386 ! pc98 (there's no #define for MACHINE_ARCH, just MACHINE, hence
this slightly inelegant kludge) and amd64. The PC98 exclusion likely
isn't meaningful since pc98 uses a different driver, but will be when
merging of the pc98 floppy code into this driver is complete (this is the
other reason I think this block of code belongs outside fdc.c).
All of these changes are safe to MT5.
Notes
Notes:
svn path=/head/; revision=135392
Diffstat (limited to 'sys/dev/fdc/fdc_acpi.c')
-rw-r--r-- | sys/dev/fdc/fdc_acpi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/dev/fdc/fdc_acpi.c b/sys/dev/fdc/fdc_acpi.c index 6e543aab1e0f..89a5a5de34c8 100644 --- a/sys/dev/fdc/fdc_acpi.c +++ b/sys/dev/fdc/fdc_acpi.c @@ -104,7 +104,6 @@ fdc_acpi_attach(device_t dev) /* Get our softc and use the same accessor as ISA. */ sc = device_get_softc(dev); sc->fdc_dev = dev; - sc->flags |= FDC_ISPNP; /* Initialize variables and get a temporary buffer for _FDE. */ error = ENXIO; |