From owner-FreeBSD-tech-jp@jp.freebsd.org  Sun Feb  6 05:28:39 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id FAA16474;
	Sun, 6 Feb 2000 05:28:39 +0900 (JST)
	(envelope-from owner-FreeBSD-tech-jp@jp.FreeBSD.org)
Received: from shrike.dti.ad.jp (shrike.dti.ad.jp [202.216.228.218])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id FAA16469
	for <freebsd-tech-jp@jp.freebsd.org>; Sun, 6 Feb 2000 05:28:37 +0900 (JST)
	(envelope-from sakichan@lares.dti.ne.jp)
Received: from localhost.lares.dti.ne.jp (PPP45.kawasaki-ap3.dti.ne.jp [210.170.222.45]) by shrike.dti.ad.jp (8.9.3/3.7W) with ESMTP id FAA11729 for <freebsd-tech-jp@jp.freebsd.org>; Sun, 6 Feb 2000 05:28:36 +0900 (JST)
Message-Id: <200002052028.FAA11729@shrike.dti.ad.jp>
Received: (from sakichan@localhost) by localhost.lares.dti.ne.jp (8.9.2/3.5Wpl5-ppp) id FAA00678; Sun, 6 Feb 2000 05:28:31 +0900 (JST)
To: freebsd-tech-jp@jp.freebsd.org
From: SAKIYAMA Nobuo <sakichan@lares.dti.ne.jp>
MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu")
Content-Type: text/plain; charset=ISO-2022-JP
Date: 06 Feb 2000 05:28:31 +0900
Lines: 118
Reply-To: FreeBSD-tech-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: FreeBSD-tech-jp 2699
Subject: [FreeBSD-tech-jp 2699] i810 
Errors-To: owner-FreeBSD-tech-jp@jp.freebsd.org
Sender: owner-FreeBSD-tech-jp@jp.freebsd.org
X-Originator: sakichan@lares.dti.ne.jp

$B:j;3$G$9!#(B

$B:G6a(B i810E $B$J%^%6!<%\!<%I$rGc$C$F(B current $B$r$$$l$F$_$F!"(Bdmesg $B$G(B
generic $B$C$F=P$^$/$k$N$,$5$_$7!<$J!<(B:-) $B$H;W$C$F(B pcisupport.c$B$H$+(B 
uhci_pci.c $B$H$+$K0J2<$N$h$&$J%Q%C%A$r$"$F$F$_$^$7$?!#$?$@!"$3$l$G$b(B
dmesg $B$H$7$F$O(B

pcib0: <Host to PCI bridge> on motherboard

$B$H$J$k$N$G!"(BGMCH $B$N$J$+$N(B Host to Hub bridge ($B%=%U%HE*$K$O(B Host to PCI
bridge)$B$N(B ID$B$rG'<1$G$-$F$$$J$$$h$&$J$N$G$9$,$I$J$?$+@52r$r$4B8$8$G$7$g(B
$B$&$+!)(B

# $B$3$l$,2r$1$F$J$$$N$G(B send-pr $B$7$F$^$;$s!#(B

--- pcisupport.c-orig	Thu Jan 27 21:02:06 2000
+++ pcisupport.c	Sun Feb  6 05:10:18 2000
@@ -685,7 +685,11 @@
 		return ("Intel 82454NX PCI Expander Bridge");
 	case 0x124b8086:
 		return ("Intel 82380FB mobile PCI to PCI bridge");
-	
+	case 0x24188086:
+		return ("Intel 82801AA (ICH) Hub to PCI bridge");
+	case 0x24288086:
+		return ("Intel 82801AB (ICH0) Hub to PCI bridge");
+
 	/* VLSI -- vendor 0x1004 */
 	case 0x01021004:
 		return ("VLSI 82C534 Eagle II PCI Bus bridge");
@@ -840,7 +844,11 @@
 		return ("Intel 82371SB PCI to ISA bridge");
 	case 0x71108086:
 		return ("Intel 82371AB PCI to ISA bridge");
-	
+	case 0x24108086:
+		return ("Intel 82801AA (ICH) PCI to LPC bridge");
+	case 0x24208086:
+		return ("Intel 82801AB (ICH0) PCI to LPC bridge");
+
 	/* VLSI -- vendor 0x1004 */
 	case 0x00061004:
 		return ("VLSI 82C593 PCI to ISA bridge");
@@ -1139,6 +1147,16 @@
 		return ("Intel 82440FX (Natoma) PCI and memory controller");
 	case 0x84c58086:
 		return ("Intel 82453KX/GX (Orion) PCI memory controller");
+	case 0x71208086:
+		return ("Intel 82810 (i810 GMCH) Host To Hub bridge");
+	case 0x71228086:
+	return ("Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge");
+	case 0x71248086:
+	return ("Intel 82810E (i810E GMCH) Host To Hub bridge");
+	case 0x24158086:
+		return ("Intel 82801AA (ICH) AC'97 Audio Controller");
+	case 0x24258086:
+		return ("Intel 82801AB (ICH0) AC'97 Audio Controller");
 
 	/* Sony -- vendor 0x104d */
 	case 0x8009104d:
@@ -1712,8 +1730,16 @@
 		break;
 	case 0x8086:
 		vendor = "Intel";
-		if ((id >> 16) == 0x7800)
-			chip = "i740 AGP";
+		switch (id >> 16) {
+		case 0x7121:
+			chip = "82810 (i810 GMCH)"; break;
+		case 0x7123:
+			chip = "82810-DC100 (i810-DC100 GMCH)"; break;
+		case 0x7125:
+			chip = "82810E (i810E GMCH)"; break;
+		case 0x7800:
+			chip = "i740 AGP"; break;
+		}
 		break;
 	case 0x10ea:
 		vendor = "Intergraphics";
--- uhci_pci.c-orig	Sat Feb  5 01:41:06 2000
+++ uhci_pci.c	Sun Feb  6 05:10:25 2000
@@ -83,6 +82,10 @@
 #define PCI_UHCI_DEVICEID_PIIX4         0x71128086
 #define PCI_UHCI_DEVICEID_PIIX4E        0x71128086    /* no separate stepping */
 static const char *uhci_device_piix4	= "Intel 82371AB/EB (PIIX4) USB controller";
+#define PCI_UHCI_DEVICEID_ICH		0x24128086
+static const char *uhci_device_ich	= "Intel 82801AA (ICH) USB controller";
+#define PCI_UHCI_DEVICEID_ICH0		0x24228086
+static const char *uhci_device_ich0 	= "Intel 82801AB (ICH0) USB controller";
 #define PCI_UHCI_DEVICEID_VT83C572	0x30381106
 static const char *uhci_device_vt83c572	= "VIA 83C572 USB controller";
 
@@ -124,6 +127,10 @@
 		return (uhci_device_piix3);
 	} else if (device_id == PCI_UHCI_DEVICEID_PIIX4) {
 		return (uhci_device_piix4);
+	} else if (device_id == PCI_UHCI_DEVICEID_ICH) {
+		return (uhci_device_ich);
+	} else if (device_id == PCI_UHCI_DEVICEID_ICH0) {
+		return (uhci_device_ich0);
 	} else if (device_id == PCI_UHCI_DEVICEID_VT83C572) {
 		return (uhci_device_vt83c572);
 	} else {
@@ -199,6 +206,14 @@
 		break;
 	case PCI_UHCI_DEVICEID_PIIX4:
 		device_set_desc(sc->sc_bus.bdev, uhci_device_piix4);
+		sprintf(sc->sc_vendor, "Intel");
+		break;
+	case PCI_UHCI_DEVICEID_ICH:
+		device_set_desc(sc->sc_bus.bdev, uhci_device_ich);
+		sprintf(sc->sc_vendor, "Intel");
+		break;
+	case PCI_UHCI_DEVICEID_ICH0:
+		device_set_desc(sc->sc_bus.bdev, uhci_device_ich0);
 		sprintf(sc->sc_vendor, "Intel");
 		break;
 	case PCI_UHCI_DEVICEID_VT83C572:
