From a689db4d3d3ed9f0f5792f530d8fb7abc53e91d5 Mon Sep 17 00:00:00 2001
From: Chris M <galdarian@gmail.com>
Date: Thu, 9 Nov 2023 19:27:50 +1100
Subject: [PATCH] Removed hid_get_device_info() function to correct CI/CD
 pipelines

* Regression introduced in dbeabe61
* Removed unrequired includes
* Aligned other variables and structures to ensure feature parity
---
 .../LianLiController/LianLiControllerDetect.cpp       |  1 +
 .../LianLiController/LianLiGAIITrinityController.cpp  | 11 +++++------
 .../LianLiController/LianLiGAIITrinityController.h    |  6 ------
 .../RGBController_LianLiGAIITrinity.cpp               |  1 -
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Controllers/LianLiController/LianLiControllerDetect.cpp b/Controllers/LianLiController/LianLiControllerDetect.cpp
index 853053c7..826da725 100644
--- a/Controllers/LianLiController/LianLiControllerDetect.cpp
+++ b/Controllers/LianLiController/LianLiControllerDetect.cpp
@@ -233,6 +233,7 @@ void DetectLianLiGAIITrinity(hid_device_info* info, const std::string& /*name*/)
     {
         LianLiGAIITrinityController*     controller     = new LianLiGAIITrinityController(dev);
         RGBController_LianLiGAIITrinity* rgb_controller = new RGBController_LianLiGAIITrinity(controller);
+        rgb_controller->location                        = "HID: " + std::string(info->path);
         ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }
diff --git a/Controllers/LianLiController/LianLiGAIITrinityController.cpp b/Controllers/LianLiController/LianLiGAIITrinityController.cpp
index 659dab48..2097b28d 100644
--- a/Controllers/LianLiController/LianLiGAIITrinityController.cpp
+++ b/Controllers/LianLiController/LianLiGAIITrinityController.cpp
@@ -29,13 +29,12 @@ LianLiGAIITrinityController::GAII_Info LianLiGAIITrinityController::GetControlle
 {
     GAII_Info controllerInfo;
 
-    hid_device_info* hidInfo = hid_get_device_info(dev);
-
-    // get device location
-    controllerInfo.location = "HID: " + std::string(hidInfo->path);
-
     // get serial number
-    std::wstring serialWStr(hidInfo->serial_number);
+    const uint8_t sz    = 255;
+    wchar_t       tmp[sz];
+
+    hid_get_serial_number_string(dev, tmp, sz);
+    std::wstring serialWStr = std::wstring(tmp);
     controllerInfo.serial = std::string(serialWStr.begin(), serialWStr.end());
 
     // get firmware version
diff --git a/Controllers/LianLiController/LianLiGAIITrinityController.h b/Controllers/LianLiController/LianLiGAIITrinityController.h
index 2aa1e13b..f5ec8f83 100644
--- a/Controllers/LianLiController/LianLiGAIITrinityController.h
+++ b/Controllers/LianLiController/LianLiGAIITrinityController.h
@@ -9,11 +9,6 @@
 #include "RGBController.h"
 #include "hidapi/hidapi.h"
 #include <vector>
-#ifdef __FreeBSD__
-#include <libusb.h>
-#else
-#include <libusb-1.0/libusb.h>
-#endif
 
 #pragma once
 
@@ -26,7 +21,6 @@ class LianLiGAIITrinityController
 public:
     struct GAII_Info
     {
-        std::string location;
         std::string serial;
         std::string version;
     };
diff --git a/Controllers/LianLiController/RGBController_LianLiGAIITrinity.cpp b/Controllers/LianLiController/RGBController_LianLiGAIITrinity.cpp
index f3fa2d3f..ef20d2c9 100644
--- a/Controllers/LianLiController/RGBController_LianLiGAIITrinity.cpp
+++ b/Controllers/LianLiController/RGBController_LianLiGAIITrinity.cpp
@@ -31,7 +31,6 @@ RGBController_LianLiGAIITrinity::RGBController_LianLiGAIITrinity(LianLiGAIITrini
 
     LianLiGAIITrinityController::GAII_Info controllerInfo = controller->GetControllerInfo();
     version     = controllerInfo.version;
-    location    = controllerInfo.location;
     serial      = controllerInfo.serial;
 
     mode Rainbow;