From: Arun Thomas <arun@minix3.org>
Date: Mon, 11 Jul 2011 19:10:28 +0000 (+0200)
Subject: Support for 82801CAM PRO/100 VE
X-Git-Tag: v3.2.0~470
X-Git-Url: http://zhaoyanbai.com/repos/%22/xml/v3/mem/static/tz-link.htm?a=commitdiff_plain;h=8a5484202cea1f815f8e075f935bac477ec1fcde;p=minix.git

Support for 82801CAM PRO/100 VE

Contributed by Jan Wieck
---

diff --git a/commands/netconf/netconf.sh b/commands/netconf/netconf.sh
index d6513deaa..8d29b31f1 100644
--- a/commands/netconf/netconf.sh
+++ b/commands/netconf/netconf.sh
@@ -97,7 +97,8 @@ card()
 cards()
 {
     card 0 "No Ethernet card (no networking)"
-    card 1 "Intel Pro/100" "8086:103D" "8086:1064" "8086:1229" "8086:2449"
+    card 1 "Intel Pro/100" "8086:103D" "8086:1064" "8086:1229" "8086:2449" \
+           "8086:1031" "8086:1032"
     card 2 "3Com 501 or 3Com 509 based card"
     card 3 "Realtek 8139 based card (also emulated by KVM)"            \
            "10EC:8139" "02AC:1012" "1065:8139" "1113:1211" "1186:1300" \
diff --git a/drivers/fxp/fxp.c b/drivers/fxp/fxp.c
index 155990e69..dbe8b6168 100644
--- a/drivers/fxp/fxp.c
+++ b/drivers/fxp/fxp.c
@@ -53,6 +53,8 @@ PRIVATE struct pcitab pcitab_fxp[]=
 	{ 0x8086, 0x2449, 0 },		/* Intel 82801BA/BAM/CA/CAM */
 	{ 0x8086, 0x103d, 0 },		/* Intel 82801DB */
 	{ 0x8086, 0x1064, 0 },		/* Intel 82562 */
+	{ 0x8086, 0x1031, 0 },		/* Intel 82801CAM VE */
+	{ 0x8086, 0x1032, 0 },		/* Intel 82801CAM VE */
 
 	{ 0x0000, 0x0000, 0 }
 };
@@ -600,6 +602,9 @@ static int fxp_probe(fxp_t *fp, int skip)
 	case FXP_REV_82551_2:	str= "82551(2)"; 		/* 0x10 */
 				fp->fxp_type= FT_82559;
 				break;
+	case FXP_REV_82801CAM:	str= "82801CAM"; 		/* 0x42 */
+				fp->fxp_type= FT_82801;
+				break;
 	case FXP_REV_82801DB:	str= "82801DB"; 		/* 0x81 */
 				fp->fxp_type= FT_82801;
 				break;
diff --git a/drivers/fxp/fxp.h b/drivers/fxp/fxp.h
index ec1298b69..638634ca9 100644
--- a/drivers/fxp/fxp.h
+++ b/drivers/fxp/fxp.h
@@ -27,6 +27,7 @@ Created:	Nov 2004 by Philip Homburg <philip@f-mnx.phicoh.com>
 #define FXP_REV_82550_3		0x0E
 #define FXP_REV_82551_1		0x0F
 #define FXP_REV_82551_2		0x10
+#define FXP_REV_82801CAM	0x42
 #define FXP_REV_82801DB		0x81
 
 /* Control/Status Registers (CSR). The first 8 bytes are called
diff --git a/drivers/pci/pci_table.c b/drivers/pci/pci_table.c
index 6afc16fc3..966686393 100644
--- a/drivers/pci/pci_table.c
+++ b/drivers/pci/pci_table.c
@@ -134,6 +134,8 @@ struct pci_device pci_device_table[]=
 	{ 0x8086, 0x100E, "Intel PRO/1000 MT Desktop Adapter" },
  	{ 0x8086, 0x1029, "Intel EtherExpressPro100 ID1029" },
  	{ 0x8086, 0x1030, "Intel Corporation 82559 InBusiness 10/100" },
+	{ 0x8086, 0x1031, "Intel Corporation 82801CAM PRO/100 VE" },
+	{ 0x8086, 0x1032, "Intel Corporation 82801CAM PRO/100 VE" },
  	{ 0x8086, 0x103d, "Intel Corporation 82801DB PRO/100 VE (MOB)" },
  	{ 0x8086, 0x1064, "Intel Corporation 82562 PRO/100 VE" },
 	{ 0x8086, 0x107C, "Intel PRO/1000 GT Desktop Adapter" },
diff --git a/etc/system.conf b/etc/system.conf
index a77569723..d620d0873 100644
--- a/etc/system.conf
+++ b/etc/system.conf
@@ -320,6 +320,8 @@ service fxp
 		IRQCTL		# 19
 		DEVIO		# 21
 	;
+	pci device	8086/1031;
+	pci device	8086/1032;
 	pci device	8086/103d;
 	pci device	8086/1064;
 	pci device	8086/1229;