From nobody Fri Mar 17 17:31:29 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 4PdWQB16HXz3ycYH; Fri, 17 Mar 2023 17:31:30 +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 4PdWQB08Lnz4Prj; Fri, 17 Mar 2023 17:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679074290; 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=sqWNRccMt2Ff6h1asWA2l4UIcIZAo/elPGF55NnCVU0=; b=jFdE5cMoBu/RJ6R2ssxTFbMOP5DFYGRO93VuFP2R2t1+QQO8F+R3P37CGkASjFS2ug3YcO VTNE4O56OaorBbZKd++Wp5wADybsM3RxklkhARpkh9uTSql5jz/m1bQXCa7zHfa8TDFrn/ TDpDMdfpKkzKOUEnk07zlmaDuOzebKIqTMYa6cD2vaSYZOZsmOmfx+luGE05PpqYEk6Q2g FPmkp6c5kdbuaqpEO6mrrXeZe7Ct5XWlDkEtWZoZcsaTFaLkT1+9DAXohHjvxkaYcE97f3 VFqa1lDVC+XqjWb0IGQ18V5/oSImUeP4Q5Yzk+62iYqcdAU2paCO7Gx44uKqvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679074290; 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=sqWNRccMt2Ff6h1asWA2l4UIcIZAo/elPGF55NnCVU0=; b=tNDp4Cjfcl827xD7VdRy4pMIWZ2CahdaZ93fvteDFsVOE4XRrhOsugTVtySv6e1XLax+wn CoSaXu4OlGsIBpiZYnRMTcOZ39nWL+7xdP42GXnVByiRMZl76CghQlCuCTPHwvSUSWoeMc 65nc+frBBKahhZiwDKa4dDEoH/oX7FWqE366uo+gMQsWcdC3y2j9IDgLCyzWM9DUIQFUyh wUUNZ695oE4JujcPoNUVWAm2zfJFN7KlCeOZS7ly1jSw46F3Q4rF+D6GTGLEJbrv2D0wCf 75u6j2JEafkoQn2g/cmFK+905eoj0TTHUI6zKwA6Ph2GOVdqG135J7Wdev3NBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679074290; a=rsa-sha256; cv=none; b=Ksq9lPg80TkTvnP3oeJuJofR+OrCFXxdgq5iTbHWSpcZM28aPEekSfGOGfIsQTkyYhrQt/ Ckv+roovq486LJfV/6K/okwO2KIR3fpfLCMbINgS+v+fV90/0o8Gd0gdJfFs1Jye02ZKX5 iOwYwwPmGHkXKoxk3sMywqJkJHHfCjdHf+FIOMBTilpuNkzJKqj1L7aHjNZPvOFIbGA0ye hwg7aN1PZf141GFu+R7eN7qr2YLcIZi293djiKk0Xll21twrIId5tAtDKSZucfAkmAEBnD /9sDtS/Le5vYcXzCIy6TIsQb7BYqO0X0UXtrc144aDODFDxQ8kFXEZVsXPtfcA== 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 4PdWQ95yBKzYnV; Fri, 17 Mar 2023 17:31:29 +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 32HHVTjR070159; Fri, 17 Mar 2023 17:31:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32HHVTnV070158; Fri, 17 Mar 2023 17:31:29 GMT (envelope-from git) Date: Fri, 17 Mar 2023 17:31:29 GMT Message-Id: <202303171731.32HHVTnV070158@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: 95b2d16b38a7 - main - ehci(4): Correct PCI device ID for Zhaoxin USB 2.0 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: 95b2d16b38a720108a51f9e8ce0685244e3e3ea4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=95b2d16b38a720108a51f9e8ce0685244e3e3ea4 commit 95b2d16b38a720108a51f9e8ce0685244e3e3ea4 Author: Zhenlei Huang AuthorDate: 2023-03-17 17:24:46 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-17 17:30:18 +0000 ehci(4): Correct PCI device ID for Zhaoxin USB 2.0 controller And minor style fixes. Tested by: Weitao Wang Fixes: f9237e1937a4 ehci(4): Add new USB IDs Differential Revision: https://reviews.freebsd.org/D38923 --- sys/dev/usb/controller/ehci_pci.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index a4430aa3a05d..3b332516f933 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -96,7 +96,7 @@ __FBSDID("$FreeBSD$"); #define PCI_EHCI_VENDORID_NVIDIA2 0x10DE #define PCI_EHCI_VENDORID_VIA 0x1106 #define PCI_EHCI_VENDORID_VMWARE 0x15ad -#define PCI_EHCI_VENDORID_ZHAOXIN 0x1d17 +#define PCI_EHCI_VENDORID_ZHAOXIN 0x1d17 static device_probe_t ehci_pci_probe; static device_attach_t ehci_pci_attach; @@ -226,8 +226,8 @@ ehci_pci_match(device_t self) case 0x077015ad: return ("VMware USB 2.0 controller"); - case 0x1d173104: - return ("Zhaoxin ZX-100/ZX-200/ZX-E USB 2.0 controller"); + case 0x31041d17: + return ("Zhaoxin ZX-100/ZX-200/ZX-E USB 2.0 controller"); default: break; @@ -414,9 +414,9 @@ ehci_pci_attach(device_t self) case PCI_EHCI_VENDORID_VMWARE: sprintf(sc->sc_vendor, "VMware"); break; - case PCI_EHCI_VENDORID_ZHAOXIN: - sprintf(sc->sc_vendor, "Zhaoxin"); - break; + case PCI_EHCI_VENDORID_ZHAOXIN: + sprintf(sc->sc_vendor, "Zhaoxin"); + break; default: if (bootverbose) device_printf(self, "(New EHCI DeviceId=0x%08x)\n",