git: b754d7faafd3 - main - uhci(4): Correct PCI device ID for Zhaoxin USB controller
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Mar 2023 17:31:30 UTC
The branch main has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=b754d7faafd3536889bb6078b9fd11ef2e7717d7
commit b754d7faafd3536889bb6078b9fd11ef2e7717d7
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-03-17 17:20:58 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
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 <WeitaoWang-oc@zhaoxin.com>
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",