diff options
| author | gibbs <gibbs@FreeBSD.org> | 1996-10-28 06:05:58 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1996-10-28 06:05:58 +0000 |
| commit | 82ea9f9f182c7e1f6fd071770b74276d696550c0 (patch) | |
| tree | eb942ccee42cdff02e116a50bda061521d418716 | |
| parent | 3e530ea93e84a0577d83fa0e2f98bf0ef85d939e (diff) | |
| download | FreeBSD-src-82ea9f9f182c7e1f6fd071770b74276d696550c0.zip FreeBSD-src-82ea9f9f182c7e1f6fd071770b74276d696550c0.tar.gz | |
Add two new aic7xxx driver options:
AHC_FORCE_PIO - This forces the driver to use PIO even on systems that
say they have memory mapped the controller's registers. This
seems to fix Ken Lam's problems. I've also placed this option
in the GENERIC kernel file so that we are guaranteed to install
even on these flakey machines.
AHC_SHARE_SCBS - This option attempts to share the external SCB SRAM on
the 398X controllers allowing a totoll of 255 non-paged SCBs.
This doesn't work quite yet, so this option is mostly here to
help 398X owners to experiment and give me feedback until this
works properly.
| -rw-r--r-- | sys/amd64/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 4 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 88327db..a64fd16 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.75 1996/08/27 16:25:53 wosch Exp $ +# $Id: GENERIC,v 1.76 1996/09/11 19:53:28 phk Exp $ machine "i386" cpu "I386_CPU" @@ -64,6 +64,9 @@ device wcd0 #IDE CD-ROM controller ncr0 controller ahb0 controller ahc0 +options "AHC_FORCE_PIO" # Some motherboards choke on MemI/O, + # so use PIO in the ahc driver in the + # generic kernel. controller bt0 at isa? port "IO_BT0" bio irq ? vector bt_isa_intr controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index a0d683a..1a3f0c7 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.24 1996/10/17 19:31:47 bde Exp $ +# $Id: options.i386,v 1.25 1996/10/23 07:29:35 pst Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -29,6 +29,8 @@ XSERVER opt_pcvt.h AHC_TAGENABLE opt_aic7xxx.h AHC_SCBPAGING_ENABLE opt_aic7xxx.h +AHC_FORCE_PIO opt_aic7xxx.h +AHC_SHARE_SCBS opt_aic7xxx.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 88327db..a64fd16 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.75 1996/08/27 16:25:53 wosch Exp $ +# $Id: GENERIC,v 1.76 1996/09/11 19:53:28 phk Exp $ machine "i386" cpu "I386_CPU" @@ -64,6 +64,9 @@ device wcd0 #IDE CD-ROM controller ncr0 controller ahb0 controller ahc0 +options "AHC_FORCE_PIO" # Some motherboards choke on MemI/O, + # so use PIO in the ahc driver in the + # generic kernel. controller bt0 at isa? port "IO_BT0" bio irq ? vector bt_isa_intr controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index a0d683a..1a3f0c7 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.24 1996/10/17 19:31:47 bde Exp $ +# $Id: options.i386,v 1.25 1996/10/23 07:29:35 pst Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -29,6 +29,8 @@ XSERVER opt_pcvt.h AHC_TAGENABLE opt_aic7xxx.h AHC_SCBPAGING_ENABLE opt_aic7xxx.h +AHC_FORCE_PIO opt_aic7xxx.h +AHC_SHARE_SCBS opt_aic7xxx.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h |
