From: Toni Wilen <twilen@winuae.net>
Date: Tue, 25 Jul 2023 17:57:16 +0000 (+0300)
Subject: USB HID controller check fix
X-Git-Tag: 5.1.0~142
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=b47968742fee29bd00f8bb024e06e9224578c4aa;p=francis%2Fwinuae.git

USB HID controller check fix
---

diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp
index 9754894e..670e434d 100644
--- a/od-win32/dinput.cpp
+++ b/od-win32/dinput.cpp
@@ -1708,20 +1708,14 @@ static bool initialize_rawinput (void)
 			} else if (type == RIM_TYPEHID) {
 				if (rdpdevice (buf1))
 					continue;
-				if (rdi->hid.usUsage != 4 && rdi->hid.usUsage != 5) {
-					write_log (_T("RAWHID: Usage not 4 or 5 (%04X)\n"), rdi->hid.usUsage);
-					continue;
-				}
-				if (rdi->hid.usUsagePage >= 0x80) {
-					write_log(_T("RAWHID: Usage %d, reserved page %04X\n"), rdi->hid.usUsage, rdi->hid.usUsagePage);
+				if (rdi->hid.usUsagePage != 0x01) {
+					write_log(_T("RAWHID: UsagePage not 1 (%04x)\n"), rdi->hid.usUsagePage);
 					continue;
 				}
-#if 0
-				if (rdi->hid.usUsagePage >= 0xff00) { // vendor specific
-					write_log (_T("RAWHID: Ignored vendor specific %04X\n"), rdi->hid.usUsagePage);
+				if (rdi->hid.usUsage != 4 && rdi->hid.usUsage != 5) {
+					write_log (_T("RAWHID: Usage not 4 or 5 (%04X)\n"), rdi->hid.usUsage);
 					continue;
 				}
-#endif
 				for (i = 0; hidnorawinput[i].vid; i++) {
 					if (rdi->hid.dwProductId == hidnorawinput[i].pid && rdi->hid.dwVendorId == hidnorawinput[i].vid)
 						break;