https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb3e2c7c8b8111bbbf0b6…
commit fb3e2c7c8b8111bbbf0b6881573a203d8c8ec659
Author: Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sat Oct 9 16:01:47 2021 -0400
Commit: Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Wed Oct 27 19:27:33 2021 -0400
[USBUHCI] Fix always-false HcFlavor checks.
Powered by clang-cl.
---
drivers/usb/usbuhci/roothub.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/usbuhci/roothub.c b/drivers/usb/usbuhci/roothub.c
index 286e5c3fd3d..7c166122c68 100644
--- a/drivers/usb/usbuhci/roothub.c
+++ b/drivers/usb/usbuhci/roothub.c
@@ -195,13 +195,13 @@ UhciRHPortResetComplete(IN PVOID uhciExtension,
PortControl.PortEnableDisableChange = 1;
WRITE_PORT_USHORT(PortControlRegister, PortControl.AsUSHORT);
- if (UhciExtension->HcFlavor == UHCI_VIA &&
- UhciExtension->HcFlavor == UHCI_VIA_x01 &&
- UhciExtension->HcFlavor == UHCI_VIA_x02 &&
- UhciExtension->HcFlavor == UHCI_VIA_x03 &&
+ if (UhciExtension->HcFlavor == UHCI_VIA ||
+ UhciExtension->HcFlavor == UHCI_VIA_x01 ||
+ UhciExtension->HcFlavor == UHCI_VIA_x02 ||
+ UhciExtension->HcFlavor == UHCI_VIA_x03 ||
UhciExtension->HcFlavor == UHCI_VIA_x04)
{
- DPRINT("UhciRHPortResetComplete: Via chip. FIXME\n");
+ DPRINT1("UhciRHPortResetComplete: Via chip. FIXME\n");
DbgBreakPoint();
return;
}
@@ -266,10 +266,10 @@ UhciRHSetFeaturePortReset(IN PVOID uhciExtension,
UhciExtension->ResetPortMask = ResetPortMask | PortBit;
- if (UhciExtension->HcFlavor == UHCI_VIA &&
- UhciExtension->HcFlavor == UHCI_VIA_x01 &&
- UhciExtension->HcFlavor == UHCI_VIA_x02 &&
- UhciExtension->HcFlavor == UHCI_VIA_x03 &&
+ if (UhciExtension->HcFlavor == UHCI_VIA ||
+ UhciExtension->HcFlavor == UHCI_VIA_x01 ||
+ UhciExtension->HcFlavor == UHCI_VIA_x02 ||
+ UhciExtension->HcFlavor == UHCI_VIA_x03 ||
UhciExtension->HcFlavor == UHCI_VIA_x04)
{
DPRINT1("UhciRHSetFeaturePortReset: Via chip. FIXME\n");