diff options
| -rw-r--r-- | sys/conf/NOTES | 10 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 3 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 10 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 10 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 3 | ||||
| -rw-r--r-- | sys/i386/isa/wd.c | 7 |
6 files changed, 37 insertions, 6 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index bc5defe..7fbb2ec 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.502 1998/11/08 09:57:28 peter Exp $ +# $Id: LINT,v 1.503 1998/11/11 21:29:09 msmith Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -972,6 +972,14 @@ options "CMD640" #Enable work around for CMD640 h/w bug options ATAPI #Enable ATAPI support for IDE bus options ATAPI_STATIC #Don't do it as an LKM +# +# This option allow you to override the default probe time for IDE +# devices, to get a faster probe. Setting this below 10000 violate +# the IDE specs, but may still work for you (it will work for most +# people). +# +options IDE_DELAY=8000 # Be optimistic about Joe IDE device + # Use either the acd or the wcd device, not both! # IDE CD-ROM & CD-R/RW driver - requires wdc controller and ATAPI option device acd0 diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 4baf95e..cd3f0bd 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,6 +1,7 @@ -# $Id: options.i386,v 1.90 1998/10/06 13:16:17 kato Exp $ +# $Id: options.i386,v 1.91 1998/11/03 21:08:49 msmith Exp $ DISABLE_PSE +IDE_DELAY USER_LDT MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index bc5defe..7fbb2ec 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.502 1998/11/08 09:57:28 peter Exp $ +# $Id: LINT,v 1.503 1998/11/11 21:29:09 msmith Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -972,6 +972,14 @@ options "CMD640" #Enable work around for CMD640 h/w bug options ATAPI #Enable ATAPI support for IDE bus options ATAPI_STATIC #Don't do it as an LKM +# +# This option allow you to override the default probe time for IDE +# devices, to get a faster probe. Setting this below 10000 violate +# the IDE specs, but may still work for you (it will work for most +# people). +# +options IDE_DELAY=8000 # Be optimistic about Joe IDE device + # Use either the acd or the wcd device, not both! # IDE CD-ROM & CD-R/RW driver - requires wdc controller and ATAPI option device acd0 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index bc5defe..7fbb2ec 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.502 1998/11/08 09:57:28 peter Exp $ +# $Id: LINT,v 1.503 1998/11/11 21:29:09 msmith Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -972,6 +972,14 @@ options "CMD640" #Enable work around for CMD640 h/w bug options ATAPI #Enable ATAPI support for IDE bus options ATAPI_STATIC #Don't do it as an LKM +# +# This option allow you to override the default probe time for IDE +# devices, to get a faster probe. Setting this below 10000 violate +# the IDE specs, but may still work for you (it will work for most +# people). +# +options IDE_DELAY=8000 # Be optimistic about Joe IDE device + # Use either the acd or the wcd device, not both! # IDE CD-ROM & CD-R/RW driver - requires wdc controller and ATAPI option device acd0 diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 4baf95e..cd3f0bd 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,6 +1,7 @@ -# $Id: options.i386,v 1.90 1998/10/06 13:16:17 kato Exp $ +# $Id: options.i386,v 1.91 1998/11/03 21:08:49 msmith Exp $ DISABLE_PSE +IDE_DELAY USER_LDT MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 85745cb..448e027 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.178 1998/10/22 05:58:41 bde Exp $ + * $Id: wd.c,v 1.179 1998/11/15 13:54:31 bde Exp $ */ /* TODO: @@ -67,6 +67,7 @@ #include "opt_atapi.h" #include "opt_devfs.h" #include "opt_hw_wdog.h" +#include "opt_ide_delay.h" #include "opt_wd.h" #include "pci.h" @@ -106,7 +107,11 @@ extern void wdstart(int ctrlr); +#ifdef IDE_DELAY +#define TIMEOUT IDE_DELAY +#else #define TIMEOUT 10000 +#endif #define RETRIES 5 /* number of retries before giving up */ #define RECOVERYTIME 500000 /* usec for controller to recover after err */ #define MAXTRANSFER 255 /* max size of transfer in sectors */ |
