From owner-svn-src-stable@FreeBSD.ORG Thu Jul 5 15:36:00 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7CE11065670; Thu, 5 Jul 2012 15:35:59 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C20468FC12; Thu, 5 Jul 2012 15:35:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q65FZxXY081379; Thu, 5 Jul 2012 15:35:59 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q65FZxCu081374; Thu, 5 Jul 2012 15:35:59 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201207051535.q65FZxCu081374@svn.freebsd.org> From: Alexander Motin Date: Thu, 5 Jul 2012 15:35:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238134 - in stable/9/sys/dev/usb: . controller X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2012 15:36:00 -0000 Author: mav Date: Thu Jul 5 15:35:59 2012 New Revision: 238134 URL: http://svn.freebsd.org/changeset/base/238134 Log: MFC r238015: Add IDs for some USB controllers I have around. Just a cosmetics. Approved by: re (kib) Modified: stable/9/sys/dev/usb/controller/ehci_pci.c stable/9/sys/dev/usb/controller/ohci_pci.c stable/9/sys/dev/usb/controller/xhci_pci.c stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/controller/ehci_pci.c ============================================================================== --- stable/9/sys/dev/usb/controller/ehci_pci.c Thu Jul 5 15:34:55 2012 (r238133) +++ stable/9/sys/dev/usb/controller/ehci_pci.c Thu Jul 5 15:35:59 2012 (r238134) @@ -104,9 +104,6 @@ ehci_pci_match(device_t self) uint32_t device_id = pci_get_devid(self); switch (device_id) { - case 0x268c8086: - return ("Intel 63XXESB USB 2.0 controller"); - case 0x523910b9: return "ALi M5239 USB 2.0 controller"; @@ -120,7 +117,13 @@ ehci_pci_match(device_t self) return "ATI SB200 USB 2.0 controller"; case 0x43731002: return "ATI SB400 USB 2.0 controller"; + case 0x43961002: + return ("AMD SB7x0/SB8x0/SB9x0 USB 2.0 controller"); + case 0x1e268086: + return ("Intel Panther Point USB 2.0 controller"); + case 0x1e2d8086: + return ("Intel Panther Point USB 2.0 controller"); case 0x25ad8086: return "Intel 6300ESB USB 2.0 controller"; case 0x24cd8086: @@ -129,9 +132,10 @@ ehci_pci_match(device_t self) return "Intel 82801EB/R (ICH5) USB 2.0 controller"; case 0x265c8086: return "Intel 82801FB (ICH6) USB 2.0 controller"; + case 0x268c8086: + return ("Intel 63XXESB USB 2.0 controller"); case 0x27cc8086: return "Intel 82801GB/R (ICH7) USB 2.0 controller"; - case 0x28368086: return "Intel 82801H (ICH8) USB 2.0 controller USB2-A"; case 0x283a8086: Modified: stable/9/sys/dev/usb/controller/ohci_pci.c ============================================================================== --- stable/9/sys/dev/usb/controller/ohci_pci.c Thu Jul 5 15:34:55 2012 (r238133) +++ stable/9/sys/dev/usb/controller/ohci_pci.c Thu Jul 5 15:35:59 2012 (r238134) @@ -132,6 +132,10 @@ ohci_pci_match(device_t self) return "ATI SB400 USB Controller"; case 0x43751002: return "ATI SB400 USB Controller"; + case 0x43971002: + return ("AMD SB7x0/SB8x0/SB9x0 USB controller"); + case 0x43991002: + return ("AMD SB7x0/SB8x0/SB9x0 USB controller"); case 0x06701095: return ("CMD Tech 670 (USB0670) USB controller"); Modified: stable/9/sys/dev/usb/controller/xhci_pci.c ============================================================================== --- stable/9/sys/dev/usb/controller/xhci_pci.c Thu Jul 5 15:34:55 2012 (r238133) +++ stable/9/sys/dev/usb/controller/xhci_pci.c Thu Jul 5 15:35:59 2012 (r238134) @@ -93,6 +93,19 @@ MODULE_DEPEND(xhci, usb, 1, 1, 1); static const char * xhci_pci_match(device_t self) { + uint32_t device_id = pci_get_devid(self); + + switch (device_id) { + case 0x01941033: + return ("NEC uPD720200 USB 3.0 controller"); + + case 0x1e318086: + return ("Intel Panther Point USB 3.0 controller"); + + default: + break; + } + if ((pci_get_class(self) == PCIC_SERIALBUS) && (pci_get_subclass(self) == PCIS_SERIALBUS_USB) && (pci_get_progif(self) == PCIP_SERIALBUS_USB_XHCI)) { Modified: stable/9/sys/dev/usb/usbdevs ============================================================================== --- stable/9/sys/dev/usb/usbdevs Thu Jul 5 15:34:55 2012 (r238133) +++ stable/9/sys/dev/usb/usbdevs Thu Jul 5 15:35:59 2012 (r238134) @@ -559,6 +559,7 @@ vendor APACER 0x1005 Apacer vendor MOTOROLA4 0x100d Motorola vendor AIRPLUS 0x1011 Airplus vendor DESKNOTE 0x1019 Desknote +vendor NEC3 0x1033 NEC vendor GIGABYTE 0x1044 GIGABYTE vendor WESTERN 0x1058 Western Digital vendor MOTOROLA 0x1063 Motorola @@ -1916,6 +1917,7 @@ product INSYSTEM STORAGE_V2 0x5701 USB S product INTEL EASYPC_CAMERA 0x0110 Easy PC Camera product INTEL TESTBOARD 0x9890 82930 test board product INTEL2 IRMH 0x0020 Integrated Rate Matching Hub +product INTEL2 IRMH2 0x0024 Integrated Rate Matching Hub /* Intersil products */ product INTERSIL PRISM_GT 0x1000 PrismGT USB 2.0 WLAN