diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2004-08-30 23:03:58 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2004-08-30 23:03:58 +0000 |
| commit | f37a929ca103ae6f67e0b0110efa0e4b11fbd407 (patch) | |
| tree | 48d9944fb7d50a767ae5d57a3e3f8f4c3facf67e /sys/pc98 | |
| parent | c591d41f7c1044647cc1c848180b4318d50bd09d (diff) | |
| download | src-f37a929ca103ae6f67e0b0110efa0e4b11fbd407.tar.gz src-f37a929ca103ae6f67e0b0110efa0e4b11fbd407.zip | |
Kill count device support from config. I've changed the last few
remaining consumers to have the count passed as an option. This is
i4b, pc98/wdc, and coda.
Bump configvers.h from 500013 to 600000.
Remove heuristics that tried to parse "device ed5" as 5 units of the ed
device. This broke things like the snd_emu10k1 device, which required
quotes to make it parse right. The no-longer-needed quotes have been
removed from NOTES, GENERIC etc. eg, I've removed the quotes from:
device snd_maestro
device "snd_maestro3"
device snd_mss
I believe everything will still compile and work after this.
Notes
Notes:
svn path=/head/; revision=134542
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/pc98/pc98/atapi.c | 13 | ||||
| -rw-r--r-- | sys/pc98/pc98/wd.c | 6 |
3 files changed, 8 insertions, 16 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 954157535825..7dac4274f45d 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -89,10 +89,11 @@ device atapist # ATAPI tape drives options ATA_STATIC_ID # Static device numbering # IDE controller and disks -#device wdc 1 # Needs COMPAT_OLDISA +#device wdc # Needs COMPAT_OLDISA +#options NWDC=1 # ATAPI devices on wdc -#device wcd 1 # IDE CD-ROM +#device wcd # IDE CD-ROM # SCSI Controllers device adv # Advansys SCSI adapters diff --git a/sys/pc98/pc98/atapi.c b/sys/pc98/pc98/atapi.c index d52fff5a6fea..b8c7817bbca2 100644 --- a/sys/pc98/pc98/atapi.c +++ b/sys/pc98/pc98/atapi.c @@ -101,11 +101,8 @@ */ #undef DEBUG -#include "wdc.h" - -#include "wcd.h" - -#if NWDC > 0 +#include "opt_wcd.h" +#include "opt_wdc.h" #include <sys/param.h> #include <sys/systm.h> @@ -248,14 +245,14 @@ int atapi_attach (int ctlr, int unit, int port) break; case AT_TYPE_DIRECT: /* direct-access */ -#if NWCD > 0 +#ifdef DEV_WCD /* FALLTHROUGH */ #else printf ("wdc%d: ATAPI Floppies not configured\n", ctlr); break; #endif case AT_TYPE_CDROM: /* CD-ROM device */ -#if NWCD > 0 +#ifdef DEV_WCD /* ATAPI CD-ROM & CD-R/RW drives */ if (acdattach (ata, unit, ap, ata->debug) < 0) break; @@ -966,5 +963,3 @@ struct atapires atapi_request_immediate (struct atapi *ata, int unit, } return (ac->result); } - -#endif /* NWDC */ diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 6e366946a972..9e096b72276b 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -48,12 +48,10 @@ * driver entries for polled reinit and polled write). */ -#include "wdc.h" +#include "opt_wdc.h" #undef NWD #define NWD (NWDC * 4) /* 4 drives per wdc on PC98 */ -#if NWDC > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -2068,5 +2066,3 @@ wdwait(struct softc *du, u_char bits_wanted, int timeout) } while (--timeout != 0); return (-1); } - -#endif /* NWDC > 0 */ |