From nobody Fri Mar 17 17:31:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PdWQC1HJfz3ycYK; Fri, 17 Mar 2023 17:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PdWQC0lMGz4Q5j; Fri, 17 Mar 2023 17:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679074291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3F6gQmnB81HpKhqd4C2WsuLMbW3skE+e5CzunpHMEoY=; b=q/aMfrcWP6ikvD78nIQb4gm8i7RIRxKx5lpmiF0nl5H+cyCSsKzm5pUzLTNq1gbRBBV+Ow VUxmUcsJUKn4UGx9v5R/ryfKus1h1RCASTXVre40MMm9pUY78q+RkwqloC15csiiEahjOx mYxxENNeXnFYBLSKN0J0XC64s5Yez4Le3itoXwgrcmYvgxVgfzaSVfNipyPyq0byahIoFc pdaretZHOLNesjtSVtB3pXZeOyX94OLI2St3yp7cCJiixKaPE5NoLzgxBplzmx4MEut3Rc cMK9KNKC8oebCZaIabqRuAMrSf17q/wjhwQqBu3twmHqc2ax4kXPo2rX2aI+JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679074291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3F6gQmnB81HpKhqd4C2WsuLMbW3skE+e5CzunpHMEoY=; b=lWUz9aAvLl5YW8wPWwEhmKgp2sX98dDfaVQCeqiNT9vQGHiCMlrKYmcTV1yj3a93t7/LDV RiHJiAv0rFLKCB4tiUZSDBeXreFGOqBZIFakyejxNo47MoeQN08NuOqD+BMH0asNRfl0AD ddRFtbkg6FVFwvfIJTJ5JV5VPFeLz8tK54Y3miXzWUZiLlbgwGJzREnYeoDhd7LebHt8OL EP8d3RR62cVNxKklBetWiljz1iH1LqAH5Sys6G3rULV6HiKzQB9TZ5U7aW2JP5AZaFSFDZ Iw5yegc/u35OWNq9VYuTOu+uw6hiNP1ueaBO7cxsVLlppvm1RmC4S3gA9Q0ofQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679074291; a=rsa-sha256; cv=none; b=arUjGAGpf5QFxXxoGcXu1pmEuqApEuECHs7q86mbLbYmP+b/oMVF0FsmJI5MKSSUEWptfx EhQB3HtkvZGllyTpKExmF59Shr0/xFNge9tZ6S1iRJDXgBGFhEPqTCmte/P+CIEkYmU/KZ sVQlVFRgqkWzf0tTe6EVJiqf8fTSrnvLgBfA1EXLcftq3dOrwlWd2CgT6ocJC185SIqFlS jGUa6tJInrP9iULfDraRkxM20tKWa7OZpGkLuXkoPLhPd0Mrjo8ZaNojoN+uVMGJomrNKA rgcYrwzsAGHTlJrN6c5NZk0SY60hY1/5KLaMgfhUP7gEFaqLter3xZZXfUTqkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PdWQB6tVgzZHD; Fri, 17 Mar 2023 17:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32HHVUJG070179; Fri, 17 Mar 2023 17:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32HHVUdW070178; Fri, 17 Mar 2023 17:31:30 GMT (envelope-from git) Date: Fri, 17 Mar 2023 17:31:30 GMT Message-Id: <202303171731.32HHVUdW070178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: b754d7faafd3 - main - uhci(4): Correct PCI device ID for Zhaoxin USB controller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b754d7faafd3536889bb6078b9fd11ef2e7717d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b754d7faafd3536889bb6078b9fd11ef2e7717d7 commit b754d7faafd3536889bb6078b9fd11ef2e7717d7 Author: Zhenlei Huang AuthorDate: 2023-03-17 17:20:58 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-17 17:30:19 +0000 uhci(4): Correct PCI device ID for Zhaoxin USB controller And minor style fixes. Tested by: Weitao Wang Fixes: 986c7be472bd uhci(4): Add new USB IDs Differential Revision: https://reviews.freebsd.org/D38924 --- sys/dev/usb/controller/uhci_pci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index 19efb0ef6a5a..22a4c1124f81 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); #define PCI_UHCI_VENDORID_HP 0x103c #define PCI_UHCI_VENDORID_VIA 0x1106 #define PCI_UHCI_VENDORID_VMWARE 0x15ad -#define PCI_UHCI_VENDORID_ZHAOXIN 0x1d17 +#define PCI_UHCI_VENDORID_ZHAOXIN 0x1d17 /* PIIX4E has no separate stepping */ @@ -242,8 +242,8 @@ uhci_pci_match(device_t self) case 0x077415ad: return ("VMware USB controller"); - case 0x1d173038: - return ("Zhaoxin ZX-100/ZX-200/ZX-E USB controller"); + case 0x30381d17: + return ("Zhaoxin ZX-100/ZX-200/ZX-E USB controller"); default: break; @@ -338,9 +338,9 @@ uhci_pci_attach(device_t self) case PCI_UHCI_VENDORID_VMWARE: sprintf(sc->sc_vendor, "VMware"); break; - case PCI_UHCI_VENDORID_ZHAOXIN: - sprintf(sc->sc_vendor, "Zhaoxin"); - break; + case PCI_UHCI_VENDORID_ZHAOXIN: + sprintf(sc->sc_vendor, "Zhaoxin"); + break; default: if (bootverbose) { device_printf(self, "(New UHCI DeviceId=0x%08x)\n",