Skip to content

Commit 31bfa1a

Browse files
author
Jerry Fan
committed
Update rtk_argb_lib to new architecture
- Using one lib for RtkArgbController and RtkBridgeController
1 parent ea0afec commit 31bfa1a

49 files changed

Lines changed: 506 additions & 1025 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Controllers/RtkArgbApi/bridge_func.h

Lines changed: 0 additions & 162 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Controllers/RtkArgbApi/scsi.h

Lines changed: 0 additions & 104 deletions
This file was deleted.

Controllers/RtkArgbController/RGBController_RtkArgb.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
| This file is part of the OpenRGB project |
88
| SPDX-License-Identifier: GPL-2.0-only |
99
\*---------------------------------------------------------*/
10+
#ifndef __FreeBSD__
1011

1112
#include "RGBController_RtkArgb.h"
1213

@@ -371,3 +372,5 @@ void RGBController_RtkArgb::DeviceUpdateMode()
371372
DeviceUpdateLEDs();
372373
}
373374
}
375+
376+
#endif

Controllers/RtkArgbController/RtkArgbControllerDetect.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#ifndef __FreeBSD__
2+
13
#include "Detector.h"
24
#include "RGBController.h"
35
#include "RGBController_RtkArgb.h"
@@ -19,7 +21,7 @@ void DetectRtkArgbControllers(hid_device_info *info, const std::string &name)
1921
argbCtl *argb_ctl = NULL;
2022
int ret = -1;
2123

22-
dev = argb_path_open(info->path, ARGB_DEV_HID);
24+
dev = argb_path_open(info->path, BRINTF_TYPE_HID, NULL);
2325
if (!dev) {
2426
goto exit;
2527
}
@@ -28,7 +30,7 @@ void DetectRtkArgbControllers(hid_device_info *info, const std::string &name)
2830
goto exit;
2931
}
3032

31-
if (argb_bridge_write_unlock(dev)) {
33+
if (bridge_write_unlock(dev)) {
3234
goto exit;
3335
}
3436

@@ -60,3 +62,5 @@ void DetectRtkArgbControllers(hid_device_info *info, const std::string &name)
6062
}
6163

6264
REGISTER_HID_DETECTOR_PU ("RTL9209", DetectRtkArgbControllers, RTK_ARGB_VID, RTK_ARGB_PID, RTK_HID2SCSI_PG, RTK_HID2SCSI_USAGE);
65+
66+
#endif

0 commit comments

Comments
 (0)