From owner-p4-projects@FreeBSD.ORG  Thu Dec 21 23:16:41 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 17A0816A40F; Thu, 21 Dec 2006 23:16:41 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C75F816A403
	for <perforce@FreeBSD.org>; Thu, 21 Dec 2006 23:16:40 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B79FB13C41A
	for <perforce@FreeBSD.org>; Thu, 21 Dec 2006 23:16:40 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBLNGeGu052531
	for <perforce@FreeBSD.org>; Thu, 21 Dec 2006 23:16:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBLNGeQl052526
	for perforce@freebsd.org; Thu, 21 Dec 2006 23:16:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 21 Dec 2006 23:16:40 GMT
Message-Id: <200612212316.kBLNGeQl052526@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 112042 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Dec 2006 23:16:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=112042

Change 112042 by hselasky@hselasky_mini_itx on 2006/12/21 23:16:20

	Sync ohci_pci.c with old version: Add more PCI ID's.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#10 (text+ko) ====

@@ -69,12 +69,14 @@
 #define PCI_OHCI_VENDORID_ACERLABS	0x10b9
 #define PCI_OHCI_VENDORID_AMD		0x1022
 #define PCI_OHCI_VENDORID_APPLE		0x106b
+#define PCI_OHCI_VENDORID_ATI		0x1002
 #define PCI_OHCI_VENDORID_CMDTECH	0x1095
 #define PCI_OHCI_VENDORID_NEC		0x1033
 #define PCI_OHCI_VENDORID_NVIDIA	0x12D2
 #define PCI_OHCI_VENDORID_NVIDIA2	0x10DE
 #define PCI_OHCI_VENDORID_OPTI		0x1045
 #define PCI_OHCI_VENDORID_SIS		0x1039
+#define PCI_OHCI_VENDORID_SUN		0x108e
 
 #define PCI_OHCI_BASE_REG	0x10
 
@@ -132,6 +134,12 @@
 	  { return ("AMD-756 USB Controller"); }
         if(device_id == 0x74141022)
 	  { return ("AMD-766 USB Controller"); }
+
+	if (device_id == 0x43741002)
+	    return "ATI SB400 USB Controller";
+	if (device_id == 0x43751002)
+	    return "ATI SB400 USB Controller";
+
         if(device_id == 0x06701095)
 	  { return ("CMD Tech 670 (USB0670) USB controller"); }
         if(device_id == 0x06731095)
@@ -144,6 +152,10 @@
 	  { return ("nVidia nForce3 USB Controller"); }
         if(device_id == 0x70011039)
 	  { return ("SiS 5571 USB controller"); }
+
+	if (device_id == 0x1103108e)
+	    return "Sun PCIO-2 USB controller";
+
         if(device_id == 0x0019106b)
 	  { return ("Apple KeyLargo USB controller"); }
 
@@ -252,6 +264,9 @@
 	case PCI_OHCI_VENDORID_APPLE:
 		sprintf(sc->sc_vendor, "Apple");
 		break;
+	case PCI_OHCI_VENDORID_ATI:
+		sprintf(sc->sc_vendor, "ATI");
+		break;
 	case PCI_OHCI_VENDORID_CMDTECH:
 		sprintf(sc->sc_vendor, "CMDTECH");
 		break;
@@ -268,6 +283,9 @@
 	case PCI_OHCI_VENDORID_SIS:
 		sprintf(sc->sc_vendor, "SiS");
 		break;
+	case PCI_OHCI_VENDORID_SUN:
+		sprintf(sc->sc_vendor, "SUN");
+		break;
 	default:
 		if(bootverbose)
 		{