Module Name:	src
Committed By:	sekiya
Date:		Tue Jun 21 08:19:26 UTC 2005

Modified Files:
	src/sys/arch/i386/conf: CARDBUS GENERIC GENERIC.MPACPI GENERIC_LAPTOP
	    INSTALL_LAPTOP IOPENER LAMB NET4501 SWINGER VIRTUALPC files.i386
	src/sys/arch/i386/i386: mainbus.c rbus_machdep.c
	src/sys/arch/i386/pci: pci_intr_fixup.c pcibios.c
	src/sys/dev/acpi: acpi.c files.acpi

Log Message:
Rework the configuration scheme for PCI fixups:

* bus enumeration fixups are not PCIBIOS-specific, interrupt fixups are done
  by both PCIBIOS and ACPI.  The redundancy is very redundant.  Therefore,
  rename PCIBIOS_*_FIXUP to PCI_*_FIXUP, use PCI_INTR_FIXUP in place of
  ACPI_PCI_FIXUP, and change code refences to match.

* move the fixup defines from opt_pcibios.h to opt_pcifixup.h to reflect
  the above.

* fix up the PCI bus numbering in mainbus_attach(), right after we detect the
  configuration mode.  This probably renders the fixup in pcibios.c
  redundant -- but it should be harmless.

These changes make cardbus work in ACPI-only machines, when PCI_BUS_FIXUP
and PCI_INTR_FIXUP are defined.


To generate a diff of this commit:
cvs rdiff -r1.73 -r1.74 src/sys/arch/i386/conf/CARDBUS
cvs rdiff -r1.678 -r1.679 src/sys/arch/i386/conf/GENERIC
cvs rdiff -r1.31 -r1.32 src/sys/arch/i386/conf/GENERIC.MPACPI
cvs rdiff -r1.141 -r1.142 src/sys/arch/i386/conf/GENERIC_LAPTOP
cvs rdiff -r1.84 -r1.85 src/sys/arch/i386/conf/INSTALL_LAPTOP
cvs rdiff -r1.60 -r1.61 src/sys/arch/i386/conf/IOPENER
cvs rdiff -r1.50 -r1.51 src/sys/arch/i386/conf/LAMB
cvs rdiff -r1.33 -r1.34 src/sys/arch/i386/conf/NET4501
cvs rdiff -r1.64 -r1.65 src/sys/arch/i386/conf/SWINGER
cvs rdiff -r1.21 -r1.22 src/sys/arch/i386/conf/VIRTUALPC
cvs rdiff -r1.263 -r1.264 src/sys/arch/i386/conf/files.i386
cvs rdiff -r1.57 -r1.58 src/sys/arch/i386/i386/mainbus.c
cvs rdiff -r1.16 -r1.17 src/sys/arch/i386/i386/rbus_machdep.c
cvs rdiff -r1.31 -r1.32 src/sys/arch/i386/pci/pci_intr_fixup.c
cvs rdiff -r1.24 -r1.25 src/sys/arch/i386/pci/pcibios.c
cvs rdiff -r1.72 -r1.73 src/sys/dev/acpi/acpi.c
cvs rdiff -r1.31 -r1.32 src/sys/dev/acpi/files.acpi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.