svn commit: r187633 - in head/sys: conf dev/agp modules/agp
Jung-uk Kim
jkim at FreeBSD.org
Fri Jan 23 09:48:19 PST 2009
Author: jkim
Date: Fri Jan 23 17:48:18 2009
New Revision: 187633
URL: http://svn.freebsd.org/changeset/base/187633
Log:
- Add few VIA bridges to agp_via.c and connect it to amd64 build
as they support Intel Core/Core 2 and VIA Nano processors.
- Align "optional agp" in conf/files.* for consistency while I am here.
Modified:
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/conf/files.pc98
head/sys/dev/agp/agp_via.c
head/sys/modules/agp/Makefile
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Fri Jan 23 16:09:19 2009 (r187632)
+++ head/sys/conf/files.amd64 Fri Jan 23 17:48:18 2009 (r187633)
@@ -132,9 +132,10 @@ crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
dev/acpica/acpi_if.m standard
-dev/agp/agp_amd64.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_amd64.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
+dev/agp/agp_via.c optional agp
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/asmc/asmc.c optional asmc isa
dev/atkbdc/atkbd.c optional atkbd atkbdc
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Fri Jan 23 16:09:19 2009 (r187632)
+++ head/sys/conf/files.i386 Fri Jan 23 17:48:18 2009 (r187633)
@@ -118,15 +118,15 @@ crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock
dev/advansys/adv_isa.c optional adv isa
-dev/agp/agp_ali.c optional agp
-dev/agp/agp_amd.c optional agp
-dev/agp/agp_amd64.c optional agp
-dev/agp/agp_ati.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_ali.c optional agp
+dev/agp/agp_amd.c optional agp
+dev/agp/agp_amd64.c optional agp
+dev/agp/agp_ati.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
dev/agp/agp_nvidia.c optional agp
-dev/agp/agp_sis.c optional agp
-dev/agp/agp_via.c optional agp
+dev/agp/agp_sis.c optional agp
+dev/agp/agp_via.c optional agp
dev/aic/aic_isa.c optional aic isa
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/ar/if_ar.c optional ar
Modified: head/sys/conf/files.pc98
==============================================================================
--- head/sys/conf/files.pc98 Fri Jan 23 16:09:19 2009 (r187632)
+++ head/sys/conf/files.pc98 Fri Jan 23 17:48:18 2009 (r187633)
@@ -77,13 +77,13 @@ bf_enc.o optional crypto | ipsec \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb
-dev/agp/agp_ali.c optional agp
-dev/agp/agp_amd.c optional agp
-dev/agp/agp_i810.c optional agp
-dev/agp/agp_intel.c optional agp
+dev/agp/agp_ali.c optional agp
+dev/agp/agp_amd.c optional agp
+dev/agp/agp_i810.c optional agp
+dev/agp/agp_intel.c optional agp
dev/agp/agp_nvidia.c optional agp
-dev/agp/agp_sis.c optional agp
-dev/agp/agp_via.c optional agp
+dev/agp/agp_sis.c optional agp
+dev/agp/agp_via.c optional agp
dev/aic/aic_cbus.c optional aic isa
dev/ar/if_ar.c optional ar
dev/ar/if_ar_pci.c optional ar pci
Modified: head/sys/dev/agp/agp_via.c
==============================================================================
--- head/sys/dev/agp/agp_via.c Fri Jan 23 16:09:19 2009 (r187632)
+++ head/sys/dev/agp/agp_via.c Fri Jan 23 17:48:18 2009 (r187633)
@@ -85,8 +85,14 @@ agp_via_match(device_t dev)
return ("VIA 3296 (P4M800) host to PCI bridge");
case 0x03051106:
return ("VIA 82C8363 (Apollo KT133x/KM133) host to PCI bridge");
+ case 0x03141106:
+ return ("VIA 3314 (P4M800CE) host to PCI bridge");
case 0x03241106:
return ("VIA VT3324 (CX700) host to PCI bridge");
+ case 0x03271106:
+ return ("VIA 3327 (P4M890) host to PCI bridge");
+ case 0x03641106:
+ return ("VIA 3364 (P4M900) host to PCI bridge");
case 0x03911106:
return ("VIA 8371 (Apollo KX133) host to PCI bridge");
case 0x05011106:
@@ -168,7 +174,10 @@ agp_via_attach(device_t dev)
case 0x02591106:
case 0x02691106:
case 0x02961106:
+ case 0x03141106:
case 0x03241106:
+ case 0x03271106:
+ case 0x03641106:
case 0x31231106:
case 0x31681106:
case 0x31891106:
Modified: head/sys/modules/agp/Makefile
==============================================================================
--- head/sys/modules/agp/Makefile Fri Jan 23 16:09:19 2009 (r187632)
+++ head/sys/modules/agp/Makefile Fri Jan 23 17:48:18 2009 (r187633)
@@ -12,7 +12,7 @@ SRCS+= agp_i810.c agp_intel.c agp_via.c
SRCS+= agp_amd64.c
.endif
.if ${MACHINE_ARCH} == "amd64"
-SRCS+= agp_amd64.c agp_i810.c
+SRCS+= agp_amd64.c agp_i810.c agp_via.c
.endif
SRCS+= device_if.h bus_if.h agp_if.h pci_if.h
SRCS+= opt_bus.h
More information about the svn-src-all
mailing list