From f50f53931edb24c5f30434603f5d1d3043effc0c Mon Sep 17 00:00:00 2001 From: Zhenlei Huang Date: Sat, 18 Mar 2023 01:12:30 +0800 Subject: [PATCH] xhci(4): Correct PCI device IDs for Zhaoxin USB 3.0 controllers And minor style fixes. Reviewed by: hselasky Tested by: Weitao Wang Fixes: 0d7064d58f89 xhci(4): Add new USB IDs Differential Revision: https://reviews.freebsd.org/D38921 --- sys/dev/usb/controller/xhci_pci.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 3fff1ec1db0..5da68a15672 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #define PCI_XHCI_VENDORID_AMD 0x1022 #define PCI_XHCI_VENDORID_INTEL 0x8086 #define PCI_XHCI_VENDORID_VMWARE 0x15ad -#define PCI_XHCI_VENDORID_ZHAOXIN 0x1d17 +#define PCI_XHCI_VENDORID_ZHAOXIN 0x1d17 static device_probe_t xhci_pci_probe; static device_detach_t xhci_pci_detach; @@ -206,12 +206,12 @@ xhci_pci_match(device_t self) case 0x1ada10de: return ("NVIDIA TU106 USB 3.1 controller"); - case 0x1d179202: - return ("Zhaoxin ZX-100 USB 3.0 controller"); - case 0x1d179203: - return ("Zhaoxin ZX-200 USB 3.0 controller"); - case 0x1d179204: - return ("Zhaoxin ZX-E USB 3.0 controller"); + case 0x92021d17: + return ("Zhaoxin ZX-100 USB 3.0 controller"); + case 0x92031d17: + return ("Zhaoxin ZX-200 USB 3.0 controller"); + case 0x92041d17: + return ("Zhaoxin ZX-E USB 3.0 controller"); default: break; @@ -401,9 +401,9 @@ xhci_pci_attach(device_t self) case PCI_XHCI_VENDORID_VMWARE: strlcpy(sc->sc_vendor, "VMware", sizeof(sc->sc_vendor)); break; - case PCI_XHCI_VENDORID_ZHAOXIN: - strlcpy(sc->sc_vendor, "Zhaoxin", sizeof(sc->sc_vendor)); - break; + case PCI_XHCI_VENDORID_ZHAOXIN: + strlcpy(sc->sc_vendor, "Zhaoxin", sizeof(sc->sc_vendor)); + break; default: if (bootverbose) device_printf(self, "(New XHCI DeviceId=0x%08x)\n",