patch for Intel 915g

[Chuck Tuffli <chuck_tuffli@xxxxxxxxxxx>]

The attached patch allows DFly to boot on an Intel 915g chipset and
adds support for the internal 10/100 NIC. The specific board tested is
an ASUS P5GD1-VM.

Details:
- adds new PCI id for Intel Pro/100 VE Ethernet (ICH6)
- adds above to list of supported chips in if_fxp
- adds PCI id of SATA controller to the ISR in ata-pci

-- 
Chuck Tuffli
Agilent Technologies

cvs server: /home/dcvs/CVSROOT/config: unrecognized keyword 'LocalKeyword'
Index: bus/pci/pcidevs
===================================================================
RCS file: /home/dcvs/src/sys/bus/pci/pcidevs,v
retrieving revision 1.6
diff -u -r1.6 pcidevs
--- bus/pci/pcidevs	18 Dec 2004 15:59:36 -0000	1.6
+++ bus/pci/pcidevs	31 Jan 2005 18:21:51 -0000
@@ -1547,6 +1547,7 @@
 product	INTEL 82597EX		0x1048	PRO/10GbE LR Server Adapter
 product INTEL PRO_100_VM_6	0x1050	PRO/100 VM Network Controller with 82562ET/EZ PHY
 product INTEL PRO_100_M		0x1059	PRO/100 M Network Controller
+product	INTEL PRO_100_VE_5	0x1064	PRO/100 VE (LOM) Ethernet Controller with 82562ET/EZ/GT/GZ
 product INTEL 82547GI		0x1075	i82547GI Gigabit Ethernet
 product INTEL 82541GI		0x1076	i82541GI Gigabit Ethernet
 product INTEL 82541GI_MOBILE	0x1077	i82541GI Mobile Gigabit Ethernet
Index: bus/pci/pcidevs.h
===================================================================
RCS file: /home/dcvs/src/sys/bus/pci/pcidevs.h,v
retrieving revision 1.6
diff -u -r1.6 pcidevs.h
--- bus/pci/pcidevs.h	18 Dec 2004 16:00:07 -0000	1.6
+++ bus/pci/pcidevs.h	31 Jan 2005 18:21:55 -0000
@@ -4,7 +4,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	DragonFly: src/sys/bus/pci/pcidevs,v 1.6 2004/12/18 15:59:36 asmodai Exp 
+ *	DragonFly
  */
 /* $NetBSD: pcidevs,v 1.606 2004/01/06 19:44:17 matt Exp $ */
 
@@ -1554,6 +1554,7 @@
 #define	PCI_PRODUCT_INTEL_82597EX	0x1048		/* PRO/10GbE LR Server Adapter */
 #define	PCI_PRODUCT_INTEL_PRO_100_VM_6	0x1050		/* PRO/100 VM Network Controller with 82562ET/EZ PHY */
 #define	PCI_PRODUCT_INTEL_PRO_100_M	0x1059		/* PRO/100 M Network Controller */
+#define	PCI_PRODUCT_INTEL_PRO_100_VE_5	0x1064		/* PRO/100 VE (LOM) Ethernet Controller with 82562ET/EZ/GT/GZ */
 #define	PCI_PRODUCT_INTEL_82547GI	0x1075		/* i82547GI Gigabit Ethernet */
 #define	PCI_PRODUCT_INTEL_82541GI	0x1076		/* i82541GI Gigabit Ethernet */
 #define	PCI_PRODUCT_INTEL_82541GI_MOBILE	0x1077		/* i82541GI Mobile Gigabit Ethernet */
Index: bus/pci/pcidevs_data.h
===================================================================
RCS file: /home/dcvs/src/sys/bus/pci/pcidevs_data.h,v
retrieving revision 1.6
diff -u -r1.6 pcidevs_data.h
--- bus/pci/pcidevs_data.h	18 Dec 2004 16:00:07 -0000	1.6
+++ bus/pci/pcidevs_data.h	31 Jan 2005 18:22:00 -0000
@@ -4,7 +4,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	DragonFly: src/sys/bus/pci/pcidevs,v 1.6 2004/12/18 15:59:36 asmodai Exp 
+ *	DragonFly
  */
 /* $NetBSD: pcidevs,v 1.606 2004/01/06 19:44:17 matt Exp $ */
 
@@ -4407,6 +4407,12 @@
 	    0,
 	    "Intel",
 	    "PRO/100 M Network Controller",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100_VE_5,
+	    0,
+	    "Intel",
+	    "PRO/100 VE (LOM) Ethernet Controller with 82562ET/EZ/GT/GZ",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI,
Index: dev/disk/ata/ata-pci.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/disk/ata/ata-pci.c,v
retrieving revision 1.17
diff -u -r1.17 ata-pci.c
--- dev/disk/ata/ata-pci.c	1 Sep 2004 14:13:55 -0000	1.17
+++ dev/disk/ata/ata-pci.c	31 Jan 2005 18:22:01 -0000
@@ -684,6 +684,8 @@
 	break;
 
     case 0x24d18086:   /* Intel ICH5 SATA150 */
+    case 0x26518086:   /* Intel ICH6 SATA150 */
+    case 0x26528086:   /* Intel ICH6R SATA150 */
 	dmastat = ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT);
 	if ((dmastat & (ATA_BMSTAT_ACTIVE | ATA_BMSTAT_INTERRUPT)) !=
 		ATA_BMSTAT_INTERRUPT)
Index: dev/netif/fxp/if_fxp.c
===================================================================
RCS file: /home/dcvs/src/sys/dev/netif/fxp/if_fxp.c,v
retrieving revision 1.19
diff -u -r1.19 if_fxp.c
--- dev/netif/fxp/if_fxp.c	23 Jan 2005 20:21:31 -0000	1.19
+++ dev/netif/fxp/if_fxp.c	31 Jan 2005 18:22:02 -0000
@@ -166,6 +166,7 @@
      { 0x1050,	-1,	"Intel 82801BA (D865) Pro/100 VE Ethernet" },
      { 0x1051,	-1,	"Intel 82562ET (ICH5/ICH5R) Pro/100 VE Ethernet" },
      { 0x1059,	-1,	"Intel 82551QM Pro/100 M Mobile Connection" },
+	 { 0x1064,  -1, "Intel 82562ET/EZ/GT/GZ (ICH6/ICH6R) Pro/100 VE Ethernet" },
      { 0x1209,	-1,	"Intel 82559ER Embedded 10/100 Ethernet" },
      { 0x1229,	0x01,	"Intel 82557 Pro/100 Ethernet" },
      { 0x1229,	0x02,	"Intel 82557 Pro/100 Ethernet" },