From owner-p4-projects@FreeBSD.ORG Thu Dec 21 23:01:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FFBE16A47E; Thu, 21 Dec 2006 23:01:24 +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 B8AF716A403 for ; Thu, 21 Dec 2006 23:01:23 +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 8F54F13C45F for ; Thu, 21 Dec 2006 23:01:23 +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 kBLN1Le6048298 for ; Thu, 21 Dec 2006 23:01:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBLN1LPN048292 for perforce@freebsd.org; Thu, 21 Dec 2006 23:01:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 21 Dec 2006 23:01:21 GMT Message-Id: <200612212301.kBLN1LPN048292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Dec 2006 23:01:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=112041 Change 112041 by hselasky@hselasky_mini_itx on 2006/12/21 23:01:07 Sync with old EHCI driver: Add more PCI ID's. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#10 (text+ko) ==== @@ -72,10 +72,12 @@ #define PCI_EHCI_VENDORID_ACERLABS 0x10b9 #define PCI_EHCI_VENDORID_AMD 0x1022 #define PCI_EHCI_VENDORID_APPLE 0x106b +#define PCI_EHCI_VENDORID_ATI 0x1002 #define PCI_EHCI_VENDORID_CMDTECH 0x1095 #define PCI_EHCI_VENDORID_INTEL 0x8086 #define PCI_EHCI_VENDORID_NEC 0x1033 #define PCI_EHCI_VENDORID_OPTI 0x1045 +#define PCI_EHCI_VENDORID_PHILIPS 0x1131 #define PCI_EHCI_VENDORID_SIS 0x1039 #define PCI_EHCI_VENDORID_NVIDIA 0x12D2 #define PCI_EHCI_VENDORID_NVIDIA2 0x10DE @@ -132,8 +134,45 @@ { u_int32_t device_id = pci_get_devid(self); + if (device_id == 0x523910b9) + return "ALi M5239 USB 2.0 controller"; + + if (device_id == 0x10227463) + return "AMD 8111 USB 2.0 controller"; + + if (device_id == 0x43451002) + return "ATI SB200 USB 2.0 controller"; + if (device_id == 0x43731002) + return "ATI SB400 USB 2.0 controller"; + + if (device_id == 0x25ad8086) + return "Intel 6300ESB USB 2.0 controller"; + if (device_id == 0x24cd8086) + return "Intel 82801DB/L/M (ICH4) USB 2.0 controller"; + if (device_id == 0x24dd8086) + return "Intel 82801EB/R (ICH5) USB 2.0 controller"; + if (device_id == 0x265c8086) + return "Intel 82801FB (ICH6) USB 2.0 controller"; + if (device_id == 0x27cc8086) + return "Intel 82801GB/R (ICH7) USB 2.0 controller"; + if(device_id == 0x00e01033) { return ("NEC uPD 720100 USB 2.0 controller"); } + + if (device_id == 0x006810de) + return "NVIDIA nForce2 USB 2.0 controller"; + if (device_id == 0x008810de) + return "NVIDIA nForce2 Ultra 400 USB 2.0 controller"; + if (device_id == 0x00d810de) + return "NVIDIA nForce3 USB 2.0 controller"; + if (device_id == 0x00e810de) + return "NVIDIA nForce3 250 USB 2.0 controller"; + if (device_id == 0x005b10de) + return "NVIDIA nForce4 USB 2.0 controller"; + + if (device_id == 0x15621131) + return "Philips ISP156x USB 2.0 controller"; + if(device_id == 0x31041106) { return ("VIA VT6202 USB 2.0 controller"); } @@ -257,6 +296,9 @@ case PCI_EHCI_VENDORID_APPLE: sprintf(sc->sc_vendor, "Apple"); break; + case PCI_EHCI_VENDORID_ATI: + sprintf(sc->sc_vendor, "ATI"); + break; case PCI_EHCI_VENDORID_CMDTECH: sprintf(sc->sc_vendor, "CMDTECH"); break; @@ -269,6 +311,9 @@ case PCI_EHCI_VENDORID_OPTI: sprintf(sc->sc_vendor, "OPTi"); break; + case PCI_EHCI_VENDORID_PHILIPS: + sprintf(sc->sc_vendor, "Philips"); + break; case PCI_EHCI_VENDORID_SIS: sprintf(sc->sc_vendor, "SiS"); break;