diff options
| author | peter <peter@FreeBSD.org> | 2001-06-12 09:40:04 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-06-12 09:40:04 +0000 |
| commit | bbbe8875f0844bdf4e10cbc01dc9c7f2a2c8368a (patch) | |
| tree | ddf23af998adfeb85fbbf912b89e3fa83f84fd4b /sys/i386 | |
| parent | b44fc46ed5521eb3028aafbc0c4aef220ed24141 (diff) | |
| download | FreeBSD-src-bbbe8875f0844bdf4e10cbc01dc9c7f2a2c8368a.zip FreeBSD-src-bbbe8875f0844bdf4e10cbc01dc9c7f2a2c8368a.tar.gz | |
Hints overhaul:
- Replace some very poorly thought out API hacks that should have been
fixed a long while ago.
- Provide some much more flexible search functions (resource_find_*())
- Use strings for storage instead of an outgrowth of the rather
inconvenient temporary ioconf table from config(). We already had a
fallback to using strings before malloc/vm was running anyway.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 6 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/isa_compat.c | 8 |
4 files changed, 13 insertions, 7 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index b33337c..b9f1f3a 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -43,8 +43,8 @@ options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options UCONSOLE #Allow users to grab the console -options USERCONFIG #boot -c editor -options VISUAL_USERCONFIG #visual boot -c editor +#options USERCONFIG #boot -c editor +#options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 2d22a10..13961aa 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -403,9 +403,9 @@ options COMPILING_LINT options UCONSOLE # XXX - this doesn't belong here either -options USERCONFIG #boot -c editor -options INTRO_USERCONFIG #imply -c and show intro screen -options VISUAL_USERCONFIG #visual boot -c editor +#options USERCONFIG #boot -c editor +#options INTRO_USERCONFIG #imply -c and show intro screen +#options VISUAL_USERCONFIG #visual boot -c editor ##################################################################### # NETWORKING OPTIONS diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 7fdb9be..196b3cc 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -49,7 +49,7 @@ #include "opt_msgbuf.h" #include "opt_npx.h" #include "opt_perfmon.h" -#include "opt_userconfig.h" +/* #include "opt_userconfig.h" */ #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/i386/isa/isa_compat.c b/sys/i386/isa/isa_compat.c index 099e0b9..8035c6d 100644 --- a/sys/i386/isa/isa_compat.c +++ b/sys/i386/isa/isa_compat.c @@ -276,8 +276,14 @@ compat_isa_handler(module_t mod, int type, void *data) driver->methods = isa_compat_methods; driver->size = sizeof(struct isa_device); driver->priv = id; - if (id->sensitive_hw) + if (id->sensitive_hw) { +#if 0 resource_set_int(id->name, -1, "sensitive", 1); +#else + printf("WARNING: isa driver %s is sensitive, but cannot set it!\n", + driver->name); +#endif + } devclass_add_driver(isa_devclass, driver); break; case MOD_UNLOAD: |
