From: | Matthew Dillon <dillon@xxxxxxxxxxxxxxxxxxxxxxx> |
Date: | Fri, 20 Feb 2004 22:37:08 -0800 (PST) |
dillon 2004/02/20 22:37:08 PST DragonFly src repository Modified files: sys/sys bus.h sys/amd64/amd64 genassym.c sys/boot/i386/libi386 Makefile sys/bus/isa isavar.h sys/bus/isa/i386 isa_compat.h sys/bus/mca mca_bus.c sys/bus/pci pci.c pci_compat.c pci_if.m pci_private.h pcireg.h pcisupport.c sys/bus/pci/i386 pcibus.c sys/conf files files.i386 sys/dev/acpica/Osd OsdHardware.c sys/dev/misc/puc puc.c sys/dev/pccard/cardbus cardbus.c sys/dev/raid/aac aac_pci.c sys/dev/raid/amr amr_compat.h sys/dev/raid/mlx mlx_compat.h sys/dev/raid/twe twe_compat.h sys/dev/serial/sio sio.c sys/i386/i386 db_interface.c exception.s genassym.c in_cksum2.s mp_machdep.c mpboot.s mplock.s nexus.c pmap.c pmap_inval.c swtch.s sys/i386/include globaldata.h mpapic.h smp.h smptests.h sys/i386/isa apic_vector.s clock.c intr_machdep.c intr_machdep.h sys/kern bus_if.m subr_bus.c sys/pc98/pc98 isa_compat.h sio.c Added files: sys/i386/include apicreg.h apicvar.h Removed files: sys/i386/include apic.h Log: Synchronize a bunch of things from FreeBSD-5 in preparation for the new ACPICA driver support. * Bring in a lot of new bus and pci DEV_METHODs from FreeBSD-5 * split apic.h into apicreg.h and apicio.h * rename INTR_TYPE_FAST -> INTR_FAST and move the #define * rename INTR_TYPE_EXCL -> INTR_EXCL and move the #define * rename some PCIR_ registers and add additional macros from FreeBSD-5 * note: new pcib bus call, host_pcib_get_busno() imported. * kern/subr_power.c no longer optional. Other changes: * machine/smp.h machine smp/smptests.h can now be #included unconditionally, and some APIC_IO vs SMP separation has been done as well. * gd_acpi_id and gd_apic_id added to machine/globaldata.h prep for new ACPI code. Despite all the changes, the generated code should be virtually the same. These were mostly additions which the pre-existing code does not (yet) use. Revision Changes Path 1.7 +40 -6 src/sys/sys/bus.h 1.3 +1 -1 src/sys/amd64/amd64/genassym.c 1.4 +3 -1 src/sys/boot/i386/libi386/Makefile 1.6 +3 -0 src/sys/bus/isa/isavar.h 1.6 +2 -2 src/sys/bus/isa/i386/isa_compat.h 1.4 +18 -4 src/sys/bus/mca/mca_bus.c 1.17 +206 -41 src/sys/bus/pci/pci.c 1.5 +1 -3 src/sys/bus/pci/pci_compat.c 1.4 +10 -4 src/sys/bus/pci/pci_if.m 1.2 +37 -4 src/sys/bus/pci/pci_private.h 1.5 +63 -10 src/sys/bus/pci/pcireg.h 1.10 +93 -11 src/sys/bus/pci/pcisupport.c 1.10 +1 -1 src/sys/bus/pci/i386/pcibus.c 1.52 +1 -1 src/sys/conf/files 1.19 +4 -1 src/sys/conf/files.i386 1.3 +1 -1 src/sys/dev/acpica/Osd/OsdHardware.c 1.5 +2 -2 src/sys/dev/misc/puc/puc.c 1.2 +1 -1 src/sys/dev/pccard/cardbus/cardbus.c 1.4 +0 -3 src/sys/dev/raid/aac/aac_pci.c 1.5 +0 -1 src/sys/dev/raid/amr/amr_compat.h 1.5 +0 -1 src/sys/dev/raid/mlx/mlx_compat.h 1.8 +0 -1 src/sys/dev/raid/twe/twe_compat.h 1.14 +1 -1 src/sys/dev/serial/sio/sio.c 1.10 +0 -2 src/sys/i386/i386/db_interface.c 1.22 +0 -2 src/sys/i386/i386/exception.s 1.35 +1 -1 src/sys/i386/i386/genassym.c 1.2 +1 -1 src/sys/i386/i386/in_cksum2.s 1.23 +1 -7 src/sys/i386/i386/mp_machdep.c 1.7 +1 -1 src/sys/i386/i386/mpboot.s 1.12 +1 -1 src/sys/i386/i386/mplock.s 1.7 +2 -2 src/sys/i386/i386/nexus.c 1.31 +1 -1 src/sys/i386/i386/pmap.c 1.2 +1 -1 src/sys/i386/i386/pmap_inval.c 1.30 +1 -3 src/sys/i386/i386/swtch.s 1.23 +2 -0 src/sys/i386/include/globaldata.h 1.6 +4 -1 src/sys/i386/include/mpapic.h 1.10 +1 -1 src/sys/i386/include/smp.h 1.5 +25 -81 src/sys/i386/include/smptests.h 1.18 +1 -1 src/sys/i386/isa/apic_vector.s 1.13 +1 -0 src/sys/i386/isa/clock.c 1.19 +0 -2 src/sys/i386/isa/intr_machdep.c 1.11 +0 -3 src/sys/i386/isa/intr_machdep.h 1.5 +21 -1 src/sys/kern/bus_if.m 1.12 +134 -6 src/sys/kern/subr_bus.c 1.4 +2 -2 src/sys/pc98/pc98/isa_compat.h 1.8 +1 -1 src/sys/pc98/pc98/sio.c http://www.dragonflybsd.org/cvsweb/src/sys/sys/bus.h.diff?r1=1.6&r2=1.7&f=h http://www.dragonflybsd.org/cvsweb/src/sys/amd64/amd64/genassym.c.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/boot/i386/libi386/Makefile.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/isa/isavar.h.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/isa/i386/isa_compat.h.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/mca/mca_bus.c.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/pci/pci.c.diff?r1=1.16&r2=1.17&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/pci/pci_compat.c.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/pci/pci_if.m.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/pci/pci_private.h.diff?r1=1.1&r2=1.2&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/pci/pcireg.h.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/pci/pcisupport.c.diff?r1=1.9&r2=1.10&f=h http://www.dragonflybsd.org/cvsweb/src/sys/bus/pci/i386/pcibus.c.diff?r1=1.9&r2=1.10&f=h http://www.dragonflybsd.org/cvsweb/src/sys/conf/files.diff?r1=1.51&r2=1.52&f=h http://www.dragonflybsd.org/cvsweb/src/sys/conf/files.i386.diff?r1=1.18&r2=1.19&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/acpica/Osd/OsdHardware.c.diff?r1=1.2&r2=1.3&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/misc/puc/puc.c.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/pccard/cardbus/cardbus.c.diff?r1=1.1&r2=1.2&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/raid/aac/aac_pci.c.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/raid/amr/amr_compat.h.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/raid/mlx/mlx_compat.h.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/raid/twe/twe_compat.h.diff?r1=1.7&r2=1.8&f=h http://www.dragonflybsd.org/cvsweb/src/sys/dev/serial/sio/sio.c.diff?r1=1.13&r2=1.14&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/db_interface.c.diff?r1=1.9&r2=1.10&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/exception.s.diff?r1=1.21&r2=1.22&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/genassym.c.diff?r1=1.34&r2=1.35&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/in_cksum2.s.diff?r1=1.1&r2=1.2&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/mp_machdep.c.diff?r1=1.22&r2=1.23&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/mpboot.s.diff?r1=1.6&r2=1.7&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/mplock.s.diff?r1=1.11&r2=1.12&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/nexus.c.diff?r1=1.6&r2=1.7&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/pmap.c.diff?r1=1.30&r2=1.31&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/pmap_inval.c.diff?r1=1.1&r2=1.2&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/i386/swtch.s.diff?r1=1.29&r2=1.30&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/include/globaldata.h.diff?r1=1.22&r2=1.23&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/include/mpapic.h.diff?r1=1.5&r2=1.6&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/include/smp.h.diff?r1=1.9&r2=1.10&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/include/smptests.h.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/isa/apic_vector.s.diff?r1=1.17&r2=1.18&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/isa/clock.c.diff?r1=1.12&r2=1.13&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/isa/intr_machdep.c.diff?r1=1.18&r2=1.19&f=h http://www.dragonflybsd.org/cvsweb/src/sys/i386/isa/intr_machdep.h.diff?r1=1.10&r2=1.11&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/bus_if.m.diff?r1=1.4&r2=1.5&f=h http://www.dragonflybsd.org/cvsweb/src/sys/kern/subr_bus.c.diff?r1=1.11&r2=1.12&f=h http://www.dragonflybsd.org/cvsweb/src/sys/pc98/pc98/isa_compat.h.diff?r1=1.3&r2=1.4&f=h http://www.dragonflybsd.org/cvsweb/src/sys/pc98/pc98/sio.c.diff?r1=1.7&r2=1.8&f=h