Attachment #7681 for bug #16517

View | Details | Raw Unified | Return to bug 16517
Collapse All | Expand All

Lines 279-284 Link Here

(-)src/sys/i386/isa/pcibus.c (+9 lines)
279	/* XXX This is a guess */	279	/* XXX This is a guess */
280	*busnum = pci_cfgread(cfg, 0x41, 1);	280	*busnum = pci_cfgread(cfg, 0x41, 1);
281	break;	281	break;
		282	case 0x71208086:
		283	s = "Intel 82810 (i810 GMCH) Host To Hub bridge";
		284	break;
		285	case 0x71228086:
		286	s = "Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge";
		287	break;
		288	case 0x71248086:
		289	s = "Intel 82810E (i810E GMCH) Host To Hub bridge";
		290	break;
282	case 0x71808086:	291	case 0x71808086:
283	s = "Intel 82443LX (440 LX) host to PCI bridge";	292	s = "Intel 82443LX (440 LX) host to PCI bridge";
284	break;	293	break;

Lines 685-691 Link Here

(-)src/sys/pci/pcisupport.c (-4 / +30 lines)
685	return ("Intel 82454NX PCI Expander Bridge");	685	return ("Intel 82454NX PCI Expander Bridge");
686	case 0x124b8086:	686	case 0x124b8086:
687	return ("Intel 82380FB mobile PCI to PCI bridge");	687	return ("Intel 82380FB mobile PCI to PCI bridge");
688		688	case 0x24188086:
		689	return ("Intel 82801AA (ICH) Hub to PCI bridge");
		690	case 0x24288086:
		691	return ("Intel 82801AB (ICH0) Hub to PCI bridge");
		692
689	/* VLSI -- vendor 0x1004 */	693	/* VLSI -- vendor 0x1004 */
690	case 0x01021004:	694	case 0x01021004:
691	return ("VLSI 82C534 Eagle II PCI Bus bridge");	695	return ("VLSI 82C534 Eagle II PCI Bus bridge");
Lines 840-846 Link Here
840	return ("Intel 82371SB PCI to ISA bridge");	844	return ("Intel 82371SB PCI to ISA bridge");
841	case 0x71108086:	845	case 0x71108086:
842	return ("Intel 82371AB PCI to ISA bridge");	846	return ("Intel 82371AB PCI to ISA bridge");
843		847	case 0x24108086:
		848	return ("Intel 82801AA (ICH) PCI to LPC bridge");
		849	case 0x24208086:
		850	return ("Intel 82801AB (ICH0) PCI to LPC bridge");
		851
844	/* VLSI -- vendor 0x1004 */	852	/* VLSI -- vendor 0x1004 */
845	case 0x00061004:	853	case 0x00061004:
846	return ("VLSI 82C593 PCI to ISA bridge");	854	return ("VLSI 82C593 PCI to ISA bridge");
Lines 1139-1144 Link Here
1139	return ("Intel 82440FX (Natoma) PCI and memory controller");	1147	return ("Intel 82440FX (Natoma) PCI and memory controller");
1140	case 0x84c58086:	1148	case 0x84c58086:
1141	return ("Intel 82453KX/GX (Orion) PCI memory controller");	1149	return ("Intel 82453KX/GX (Orion) PCI memory controller");
		1150	case 0x71208086:
		1151	return ("Intel 82810 (i810 GMCH) Host To Hub bridge");
		1152	case 0x71228086:
		1153	return ("Intel 82810-DC100 (i810-DC100 GMCH) Host To Hub bridge");
		1154	case 0x71248086:
		1155	return ("Intel 82810E (i810E GMCH) Host To Hub bridge");
		1156	case 0x24158086:
		1157	return ("Intel 82801AA (ICH) AC'97 Audio Controller");
		1158	case 0x24258086:
		1159	return ("Intel 82801AB (ICH0) AC'97 Audio Controller");
1142		1160
1143	/* Sony -- vendor 0x104d */	1161	/* Sony -- vendor 0x104d */
1144	case 0x8009104d:	1162	case 0x8009104d:
Lines 1712-1719 Link Here
1712	break;	1730	break;
1713	case 0x8086:	1731	case 0x8086:
1714	vendor = "Intel";	1732	vendor = "Intel";
1715	if ((id >> 16) == 0x7800)	1733	switch (id >> 16) {
1716	chip = "i740 AGP";	1734	case 0x7121:
		1735	chip = "82810 (i810 GMCH)"; break;
		1736	case 0x7123:
		1737	chip = "82810-DC100 (i810-DC100 GMCH)"; break;
		1738	case 0x7125:
		1739	chip = "82810E (i810E GMCH)"; break;
		1740	case 0x7800:
		1741	chip = "i740 AGP"; break;
		1742	}
1717	break;	1743	break;
1718	case 0x10ea:	1744	case 0x10ea:
1719	vendor = "Intergraphics";	1745	vendor = "Intergraphics";

Lines 83-88 Link Here

(-)src/sys/pci/uhci_pci.c (+16 lines)
83	#define PCI_UHCI_DEVICEID_PIIX4 0x71128086	83	#define PCI_UHCI_DEVICEID_PIIX4 0x71128086
84	#define PCI_UHCI_DEVICEID_PIIX4E 0x71128086 /* no separate stepping */	84	#define PCI_UHCI_DEVICEID_PIIX4E 0x71128086 /* no separate stepping */
85	static const char *uhci_device_piix4 = "Intel 82371AB/EB (PIIX4) USB controller";	85	static const char *uhci_device_piix4 = "Intel 82371AB/EB (PIIX4) USB controller";
		86	#define PCI_UHCI_DEVICEID_ICH 0x24128086
		87	static const char *uhci_device_ich = "Intel 82801AA (ICH) USB controller";
		88	#define PCI_UHCI_DEVICEID_ICH0 0x24228086
		89	static const char *uhci_device_ich0 = "Intel 82801AB (ICH0) USB controller";
86	#define PCI_UHCI_DEVICEID_VT83C572 0x30381106	90	#define PCI_UHCI_DEVICEID_VT83C572 0x30381106
87	static const char *uhci_device_vt83c572 = "VIA 83C572 USB controller";	91	static const char *uhci_device_vt83c572 = "VIA 83C572 USB controller";
88		92
Lines 124-129 Link Here
124	return (uhci_device_piix3);	128	return (uhci_device_piix3);
125	} else if (device_id == PCI_UHCI_DEVICEID_PIIX4) {	129	} else if (device_id == PCI_UHCI_DEVICEID_PIIX4) {
126	return (uhci_device_piix4);	130	return (uhci_device_piix4);
		131	} else if (device_id == PCI_UHCI_DEVICEID_ICH) {
		132	return (uhci_device_ich);
		133	} else if (device_id == PCI_UHCI_DEVICEID_ICH0) {
		134	return (uhci_device_ich0);
127	} else if (device_id == PCI_UHCI_DEVICEID_VT83C572) {	135	} else if (device_id == PCI_UHCI_DEVICEID_VT83C572) {
128	return (uhci_device_vt83c572);	136	return (uhci_device_vt83c572);
129	} else {	137	} else {
Lines 199-204 Link Here
199	break;	207	break;
200	case PCI_UHCI_DEVICEID_PIIX4:	208	case PCI_UHCI_DEVICEID_PIIX4:
201	device_set_desc(sc->sc_bus.bdev, uhci_device_piix4);	209	device_set_desc(sc->sc_bus.bdev, uhci_device_piix4);
		210	sprintf(sc->sc_vendor, "Intel");
		211	break;
		212	case PCI_UHCI_DEVICEID_ICH:
		213	device_set_desc(sc->sc_bus.bdev, uhci_device_ich);
		214	sprintf(sc->sc_vendor, "Intel");
		215	break;
		216	case PCI_UHCI_DEVICEID_ICH0:
		217	device_set_desc(sc->sc_bus.bdev, uhci_device_ich0);
202	sprintf(sc->sc_vendor, "Intel");	218	sprintf(sc->sc_vendor, "Intel");
203	break;	219	break;
204	case PCI_UHCI_DEVICEID_VT83C572:	220	case PCI_UHCI_DEVICEID_VT83C572:

Return to bug 16517