diff options
| author | imp <imp@FreeBSD.org> | 2000-01-06 07:13:54 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2000-01-06 07:13:54 +0000 |
| commit | 074edecdbd1b54910669b2f8c5c0131ffb437b5c (patch) | |
| tree | c5149f8e2f074da99a15432d42b7655e8b0f3cc8 /sys/isa/fdc.h | |
| parent | dc40bd8713bb7a5f402696b647bcba2957a49efa (diff) | |
| download | FreeBSD-src-074edecdbd1b54910669b2f8c5c0131ffb437b5c.zip FreeBSD-src-074edecdbd1b54910669b2f8c5c0131ffb437b5c.tar.gz | |
Merge most of FDC_YE into the mainline driver.
o Rename FDC_PCMCIA to FDC_NODMA to allow systems that don't have dma
for floppies.
o Remove all but two FDC_YE ifdefs. They aren't needed.
o Move defines for YE_DATAPORT to fdreg.h.
Not fixed:
o The pccard probe/attach. However, motivated individuals can more
easily add this now.
This is a merge of changes I've had in my tree for a long time. These
fixes were tested on my VAIO with its normal floppy. Please let me
know if I broke anything.
Prodded by: Peter Wemm <peter@freebsd.org>
Diffstat (limited to 'sys/isa/fdc.h')
| -rw-r--r-- | sys/isa/fdc.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/isa/fdc.h b/sys/isa/fdc.h index caa0a07..821e01d 100644 --- a/sys/isa/fdc.h +++ b/sys/isa/fdc.h @@ -55,10 +55,8 @@ struct fdc_data #define FDC_STAT_VALID 0x08 #define FDC_HAS_FIFO 0x10 #define FDC_NEEDS_RESET 0x20 -#ifdef FDC_YE -#define FDC_PCMCIA 0x40 +#define FDC_NODMA 0x40 #define FDC_UNLOADED 0x80 -#endif #define FDC_ISPNP 0x100 struct fd_data *fd; int fdu; /* the active drive */ |
