Since there have been so many reports of the Memory Mapped I/O to the
aic7xxx cards failing on certain motherboards, reverse the logic used to control this feature. AHC_FORCE_PIO is replaced with AHC_ALLOW_MEMIO. GENERIC no longer needs to specify the AHC_FORCE_PIO option since this is the default.
This commit is contained in:
Justin T. Gibbs
parent
bde5245890
commit
11b5ea7239
@ -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.76 1996/09/11 19:53:28 phk Exp $
|
||||
# $Id: GENERIC,v 1.77 1996/10/28 06:05:56 gibbs Exp $
|
||||
|
||||
machine "i386"
|
||||
cpu "I386_CPU"
|
||||
@ -64,9 +64,6 @@ 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
|
||||
|
||||
@ -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.293 1996/11/13 22:50:32 ache Exp $
|
||||
# $Id: LINT,v 1.294 1996/11/15 18:36:21 jkh 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
|
||||
@ -903,10 +903,10 @@ options AHC_TAGENABLE
|
||||
options AHC_SCBPAGING_ENABLE
|
||||
|
||||
# The aic7xxx driver will attempt to use memory mapped I/O for all PCI
|
||||
# controllers that have it configured. Unfortunately, this doesn't work
|
||||
# on some motherboards. This option will force the driver to use programmed
|
||||
# I/O instead.
|
||||
options AHC_FORCE_PIO
|
||||
# controllers that have it configured only if this option is set. Unfortunately,
|
||||
# this doesn't work on some motherboards, which prevents it from being the
|
||||
# default.
|
||||
options AHC_ALLOW_MEMIO
|
||||
|
||||
#
|
||||
# PCI devices:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: options.i386,v 1.29 1996/11/11 20:38:29 bde Exp $
|
||||
# $Id: options.i386,v 1.30 1996/11/11 22:04:31 nate Exp $
|
||||
BOUNCEPAGES opt_bounce.h
|
||||
USER_LDT
|
||||
MATH_EMULATE opt_math_emulate.h
|
||||
@ -30,7 +30,7 @@ XSERVER opt_pcvt.h
|
||||
|
||||
AHC_TAGENABLE opt_aic7xxx.h
|
||||
AHC_SCBPAGING_ENABLE opt_aic7xxx.h
|
||||
AHC_FORCE_PIO opt_aic7xxx.h
|
||||
AHC_ALLOW_MEMIO opt_aic7xxx.h
|
||||
AHC_SHARE_SCBS opt_aic7xxx.h
|
||||
|
||||
CLK_CALIBRATION_LOOP opt_clock.h
|
||||
|
||||
@ -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.76 1996/09/11 19:53:28 phk Exp $
|
||||
# $Id: GENERIC,v 1.77 1996/10/28 06:05:56 gibbs Exp $
|
||||
|
||||
machine "i386"
|
||||
cpu "I386_CPU"
|
||||
@ -64,9 +64,6 @@ 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
|
||||
|
||||
@ -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.293 1996/11/13 22:50:32 ache Exp $
|
||||
# $Id: LINT,v 1.294 1996/11/15 18:36:21 jkh 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
|
||||
@ -903,10 +903,10 @@ options AHC_TAGENABLE
|
||||
options AHC_SCBPAGING_ENABLE
|
||||
|
||||
# The aic7xxx driver will attempt to use memory mapped I/O for all PCI
|
||||
# controllers that have it configured. Unfortunately, this doesn't work
|
||||
# on some motherboards. This option will force the driver to use programmed
|
||||
# I/O instead.
|
||||
options AHC_FORCE_PIO
|
||||
# controllers that have it configured only if this option is set. Unfortunately,
|
||||
# this doesn't work on some motherboards, which prevents it from being the
|
||||
# default.
|
||||
options AHC_ALLOW_MEMIO
|
||||
|
||||
#
|
||||
# PCI devices:
|
||||
|
||||
@ -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.293 1996/11/13 22:50:32 ache Exp $
|
||||
# $Id: LINT,v 1.294 1996/11/15 18:36:21 jkh 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
|
||||
@ -903,10 +903,10 @@ options AHC_TAGENABLE
|
||||
options AHC_SCBPAGING_ENABLE
|
||||
|
||||
# The aic7xxx driver will attempt to use memory mapped I/O for all PCI
|
||||
# controllers that have it configured. Unfortunately, this doesn't work
|
||||
# on some motherboards. This option will force the driver to use programmed
|
||||
# I/O instead.
|
||||
options AHC_FORCE_PIO
|
||||
# controllers that have it configured only if this option is set. Unfortunately,
|
||||
# this doesn't work on some motherboards, which prevents it from being the
|
||||
# default.
|
||||
options AHC_ALLOW_MEMIO
|
||||
|
||||
#
|
||||
# PCI devices:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: options.i386,v 1.29 1996/11/11 20:38:29 bde Exp $
|
||||
# $Id: options.i386,v 1.30 1996/11/11 22:04:31 nate Exp $
|
||||
BOUNCEPAGES opt_bounce.h
|
||||
USER_LDT
|
||||
MATH_EMULATE opt_math_emulate.h
|
||||
@ -30,7 +30,7 @@ XSERVER opt_pcvt.h
|
||||
|
||||
AHC_TAGENABLE opt_aic7xxx.h
|
||||
AHC_SCBPAGING_ENABLE opt_aic7xxx.h
|
||||
AHC_FORCE_PIO opt_aic7xxx.h
|
||||
AHC_ALLOW_MEMIO opt_aic7xxx.h
|
||||
AHC_SHARE_SCBS opt_aic7xxx.h
|
||||
|
||||
CLK_CALIBRATION_LOOP opt_clock.h
|
||||
|
||||
Loading…
Reference in New Issue
Block a user