diff options
| author | imp <imp@FreeBSD.org> | 2004-09-17 18:50:38 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2004-09-17 18:50:38 +0000 |
| commit | 3f2f99f7d2a1ab5fe9473bf348ac8110afa27006 (patch) | |
| tree | 465e6c9c745833f92e06577dc4b9627dbd400dd1 /sys/dev/fdc/fdcvar.h | |
| parent | 566c62aad22c4961d5511b9cf1954d16e2621bf7 (diff) | |
| download | FreeBSD-src-3f2f99f7d2a1ab5fe9473bf348ac8110afa27006.zip FreeBSD-src-3f2f99f7d2a1ab5fe9473bf348ac8110afa27006.tar.gz | |
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.
Diffstat (limited to 'sys/dev/fdc/fdcvar.h')
| -rw-r--r-- | sys/dev/fdc/fdcvar.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h index 5cfc3d1..5ecf912 100644 --- a/sys/dev/fdc/fdcvar.h +++ b/sys/dev/fdc/fdcvar.h @@ -39,7 +39,6 @@ enum fdc_type { */ struct fdc_data { int fdcu; /* our unit number */ - int dmacnt; int dmachan; int flags; #define FDC_HASDMA 0x01 @@ -47,8 +46,6 @@ struct fdc_data { #define FDC_HAS_FIFO 0x10 #define FDC_NEEDS_RESET 0x20 #define FDC_NODMA 0x40 -#define FDC_ISPNP 0x80 -#define FDC_ISPCMCIA 0x100 struct fd_data *fd; /* The active drive */ int retry; int fdout; /* mirror of the w/o digital output reg */ |
