From 9b27b6e5098aee7a050d4c3f3f14050c509f74ec Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 14 Dec 2022 19:41:07 +0200
Subject: SL-13610 [MAC] WIP List HID available devices in joystick selection

Doesn't filter the list yet, just shows full list of usb devices
Selecting visible devices doesn't work yet
---
 indra/llwindow/llwindowwin32.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindowwin32.h')

diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index b391acc12d..6fbb956539 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -129,7 +129,10 @@ public:
 	static void setDPIAwareness();
 
     /*virtual*/ void* getDirectInput8();
-    /*virtual*/ bool getInputDevices(U32 device_type_filter, void * di8_devices_callback, void* userdata);
+    /*virtual*/ bool getInputDevices(U32 device_type_filter,
+                                     std::function<void(std::string&, LLSD::Binary&, void*)> osx_callback,
+                                     void* win_callback,
+                                     void* userdata);
 
     U32 getRawWParam() { return mRawWParam; }
 
-- 
cgit v1.2.3


From 453a4a13f87d5cbfa6150a4f76f9e976692b54e6 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 20 Dec 2022 17:44:08 +0200
Subject: SL-13610 [MAC] WIP enable initing devices by local id

---
 indra/llwindow/llwindowwin32.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindowwin32.h')

diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 6fbb956539..dcefe6dab2 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -130,7 +130,7 @@ public:
 
     /*virtual*/ void* getDirectInput8();
     /*virtual*/ bool getInputDevices(U32 device_type_filter,
-                                     std::function<void(std::string&, LLSD::Binary&, void*)> osx_callback,
+                                     std::function<bool(std::string&, LLSD::Binary&, void*)> osx_callback,
                                      void* win_callback,
                                      void* userdata);
 
-- 
cgit v1.2.3


From 3084f864176dffbc5da19e6f958a55513f63e795 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Dec 2022 19:16:15 +0200
Subject: SL-13610 [MAC] Manufacturer based search

---
 indra/llwindow/llwindowwin32.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindowwin32.h')

diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index dcefe6dab2..b0d5c557b8 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -130,7 +130,7 @@ public:
 
     /*virtual*/ void* getDirectInput8();
     /*virtual*/ bool getInputDevices(U32 device_type_filter,
-                                     std::function<bool(std::string&, LLSD::Binary&, void*)> osx_callback,
+                                     std::function<bool(std::string&, LLSD&, void*)> osx_callback,
                                      void* win_callback,
                                      void* userdata);
 
-- 
cgit v1.2.3