From owner-freebsd-bugs Sat Aug 24 8:30:19 2002 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4064F37B400 for ; Sat, 24 Aug 2002 08:30:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C151F43E72 for ; Sat, 24 Aug 2002 08:30:05 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OFU5JU044121 for ; Sat, 24 Aug 2002 08:30:05 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OFU5n3044120; Sat, 24 Aug 2002 08:30:05 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6CA637B400 for ; Sat, 24 Aug 2002 08:26:52 -0700 (PDT) Received: from purple.nge.isi.edu (dial162.east.isi.edu [65.114.169.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD02343E42 for ; Sat, 24 Aug 2002 08:26:50 -0700 (PDT) (envelope-from csp@csperkins.org) Received: from purple.nge.isi.edu (localhost [127.0.0.1]) by purple.nge.isi.edu (8.12.5/8.12.5) with ESMTP id g7OFQmo4001080 for ; Sat, 24 Aug 2002 11:26:49 -0400 (EDT) (envelope-from csp@purple.nge.isi.edu) Received: (from csp@localhost) by purple.nge.isi.edu (8.12.5/8.12.5/Submit) id g7O42bdM000510; Sat, 24 Aug 2002 00:02:37 -0400 (EDT) (envelope-from csp) Message-Id: <200208240402.g7O42bdM000510@purple.nge.isi.edu> Date: Sat, 24 Aug 2002 00:02:37 -0400 (EDT) From: Colin Perkins Reply-To: Colin Perkins To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: kern/41974: Update to USB UHCI device ids (Patch enclosed) Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 41974 >Category: kern >Synopsis: Update to USB UHCI device ids (Patch enclosed) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 24 08:30:05 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Colin Perkins >Release: FreeBSD 4.6-STABLE i386 >Organization: USC/ISI >Environment: System: FreeBSD purple.nge.isi.edu 4.6-STABLE FreeBSD 4.6-STABLE #2: Fri Aug 23 23:45:28 EDT 2002 root@purple.nge.isi.edu:/usr/obj/usr/src/sys/PURPLE i386 >Description: The ThinkPad X22 has an Intel ICH3 USB with 3 controllers. -STABLE doesn't recognize the third controller. Patch enclosed to add device IDs. >How-To-Repeat: Boot system. Log shows: uhci2: port 0x1840-0x185f irq 11 at device 29.2 on pci0 uhci2: (New UHCI DeviceId=0x24878086) usb2: on uhci2 usb2: USB revision 1.0 uhub2: (0x24878086) UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub2: 2 ports with 2 removable, self powered With enclosed patch, it shows instead: uhci2: port 0x1840-0x185f irq 11 at device 29.2 on pci0 usb2: on uhci2 usb2: USB revision 1.0 uhub2: Intel UHCI root hub, class 9/0, rev 1.00/1.00, addr 1 uhub2: 2 ports with 2 removable, self powered which matches the device description shown by Win2k on same host. >Fix: (patch against -STABLE from 22nd Aug) *** uhci_pci.c.orig Fri Aug 23 23:27:43 2002 --- uhci_pci.c Fri Aug 23 23:41:20 2002 *************** *** 102,107 **** --- 102,110 ---- #define PCI_UHCI_DEVICEID_ICH3_B 0x24848086 static const char *uhci_device_ich3_b = "Intel 82801CA/CAM (ICH3) USB controller USB-B"; + #define PCI_UHCI_DEVICEID_ICH3_C 0x24878086 + static const char *uhci_device_ich3_c = "Intel 82801CA/CAM (ICH3) USB controller USB-C"; + #define PCI_UHCI_DEVICEID_ICH4_A 0x24c28086 static const char *uhci_device_ich4_a = "Intel 82801DB (ICH4) USB controller USB-A"; *************** *** 177,182 **** --- 180,187 ---- return (uhci_device_ich3_a); } else if (device_id == PCI_UHCI_DEVICEID_ICH3_B) { return (uhci_device_ich3_b); + } else if (device_id == PCI_UHCI_DEVICEID_ICH3_C) { + return (uhci_device_ich3_c); } else if (device_id == PCI_UHCI_DEVICEID_ICH4_A) { return (uhci_device_ich4_a); } else if (device_id == PCI_UHCI_DEVICEID_ICH4_B) { *************** *** 281,286 **** --- 286,295 ---- break; case PCI_UHCI_DEVICEID_ICH3_B: device_set_desc(sc->sc_bus.bdev, uhci_device_ich3_b); + sprintf(sc->sc_vendor, "Intel"); + break; + case PCI_UHCI_DEVICEID_ICH3_C: + device_set_desc(sc->sc_bus.bdev, uhci_device_ich3_c); sprintf(sc->sc_vendor, "Intel"); break; case PCI_UHCI_DEVICEID_ICH4_A: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message