jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified detector blocks for HID

Browse source
This commit is contained in:
Dmitry K 2023-07-12 14:49:27 +00:00 • committed by Adam Honse
parent edea9f6bec
commit 0714920a9a
2 changed files with 60 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

104
ResourceManager.cpp
View file

@ -37,6 +37,24 @@ const hidapi_wrapper default_wrapper =
(hidapi_wrapper_error) hid_error (hidapi_wrapper_error) hid_error
}; };
bool BasicHIDBlock::compare(hid_device_info* info)
{
return ( (vid == info->vendor_id)
&& (pid == info->product_id)
#ifdef USE_HID_USAGE
&& ( (usage_page == HID_USAGE_PAGE_ANY)
|| (usage_page == info->usage_page) )
&& ( (usage == HID_USAGE_ANY)
|| (usage == info->usage) )
&& ( (interface == HID_INTERFACE_ANY)
|| (interface == info->interface_number ) )
#else
&& ( (interface == HID_INTERFACE_ANY)
|| (interface == info->interface_number ) )
#endif
);
}
ResourceManager* ResourceManager::instance; ResourceManager* ResourceManager::instance;
using namespace std::chrono_literals; using namespace std::chrono_literals;
@ -270,7 +288,8 @@ void ResourceManager::RegisterHIDDeviceDetector(std::string name,
HIDDeviceDetectorBlock block; HIDDeviceDetectorBlock block;
block.name = name; block.name = name;
block.address = (vid << 16) | pid; block.vid = vid;
block.pid = pid;
block.function = detector; block.function = detector;
block.interface = interface; block.interface = interface;
block.usage_page = usage_page; block.usage_page = usage_page;
@ -290,7 +309,8 @@ void ResourceManager::RegisterHIDWrappedDeviceDetector(std::string name,
HIDWrappedDeviceDetectorBlock block; HIDWrappedDeviceDetectorBlock block;
block.name = name; block.name = name;
block.address = (vid << 16) | pid; block.vid = vid;
block.pid = pid;
block.function = detector; block.function = detector;
block.interface = interface; block.interface = interface;
block.usage_page = usage_page; block.usage_page = usage_page;
@ -1051,31 +1071,19 @@ void ResourceManager::DetectDevicesThreadFunction()
\*-----------------------------------------------------------------------------*/ \*-----------------------------------------------------------------------------*/
for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_device_detectors.size() && detection_is_required.load(); hid_detector_idx++) for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_device_detectors.size() && detection_is_required.load(); hid_detector_idx++)
{ {
hid_devices = hid_enumerate(hid_device_detectors[hid_detector_idx].address >> 16, hid_device_detectors[hid_detector_idx].address & 0x0000FFFF); HIDDeviceDetectorBlock & detector = hid_device_detectors[hid_detector_idx];
hid_devices = hid_enumerate(detector.vid, detector.pid);
LOG_VERBOSE("Trying to run detector for [%s] (for 0x%08hx)", hid_device_detectors[hid_detector_idx].name.c_str(), hid_device_detectors[hid_detector_idx].address); LOG_VERBOSE("Trying to run detector for [%s] (for %04x:%04x)", detector.name.c_str(), detector.vid, detector.pid);
current_hid_device = hid_devices; current_hid_device = hid_devices;
while(current_hid_device) while(current_hid_device)
{ {
unsigned int addr = (current_hid_device->vendor_id << 16) | current_hid_device->product_id;
if(( ( hid_device_detectors[hid_detector_idx].address == addr ) ) if(detector.compare(current_hid_device))
#ifdef USE_HID_USAGE
&& ( ( hid_device_detectors[hid_detector_idx].usage_page == HID_USAGE_PAGE_ANY )
|| ( hid_device_detectors[hid_detector_idx].usage_page == current_hid_device->usage_page ) )
&& ( ( hid_device_detectors[hid_detector_idx].usage == HID_USAGE_ANY )
|| ( hid_device_detectors[hid_detector_idx].usage == current_hid_device->usage ) )
&& ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY )
|| ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) )
#else
&& ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY )
|| ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) )
#endif
)
{ {
detection_string = hid_device_detectors[hid_detector_idx].name.c_str(); detection_string = detector.name.c_str();
/*-------------------------------------------------*\ /*-------------------------------------------------*\
| Check if this detector is enabled or needs to be | | Check if this detector is enabled or needs to be |
@ -1093,7 +1101,7 @@ void ResourceManager::DetectDevicesThreadFunction()
{ {
DetectionProgressChanged(); DetectionProgressChanged();
hid_device_detectors[hid_detector_idx].function(current_hid_device, hid_device_detectors[hid_detector_idx].name); detector.function(current_hid_device, hid_device_detectors[hid_detector_idx].name);
LOG_TRACE("[%s] detection end", detection_string); LOG_TRACE("[%s] detection end", detection_string);
} }
@ -1124,29 +1132,16 @@ void ResourceManager::DetectDevicesThreadFunction()
detection_string = ""; detection_string = "";
DetectionProgressChanged(); DetectionProgressChanged();
unsigned int addr = (current_hid_device->vendor_id << 16) | current_hid_device->product_id;
/*-----------------------------------------------------------------------------*\ /*-----------------------------------------------------------------------------*\
| Loop through all available detectors. If all required information matches, | | Loop through all available detectors. If all required information matches, |
| run the detector | | run the detector |
\*-----------------------------------------------------------------------------*/ \*-----------------------------------------------------------------------------*/
for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_device_detectors.size() && detection_is_required.load(); hid_detector_idx++) for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_device_detectors.size() && detection_is_required.load(); hid_detector_idx++)
{ {
if(( ( hid_device_detectors[hid_detector_idx].address == addr ) ) HIDDeviceDetectorBlock & detector = hid_device_detectors[hid_detector_idx];
#ifdef USE_HID_USAGE if(detector.compare(current_hid_device))
&& ( ( hid_device_detectors[hid_detector_idx].usage_page == HID_USAGE_PAGE_ANY )
|| ( hid_device_detectors[hid_detector_idx].usage_page == current_hid_device->usage_page ) )
&& ( ( hid_device_detectors[hid_detector_idx].usage == HID_USAGE_ANY )
|| ( hid_device_detectors[hid_detector_idx].usage == current_hid_device->usage ) )
&& ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY )
|| ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) )
#else
&& ( ( hid_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY )
|| ( hid_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) )
#endif
)
{ {
detection_string = hid_device_detectors[hid_detector_idx].name.c_str(); detection_string = detector.name.c_str();
/*-------------------------------------------------*\ /*-------------------------------------------------*\
| Check if this detector is enabled or needs to be | | Check if this detector is enabled or needs to be |
@ -1164,7 +1159,7 @@ void ResourceManager::DetectDevicesThreadFunction()
{ {
DetectionProgressChanged(); DetectionProgressChanged();
hid_device_detectors[hid_detector_idx].function(current_hid_device, hid_device_detectors[hid_detector_idx].name); detector.function(current_hid_device, hid_device_detectors[hid_detector_idx].name);
} }
} }
} }
@ -1175,21 +1170,10 @@ void ResourceManager::DetectDevicesThreadFunction()
\*-----------------------------------------------------------------------------*/ \*-----------------------------------------------------------------------------*/
for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_wrapped_device_detectors.size() && detection_is_required.load(); hid_detector_idx++) for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_wrapped_device_detectors.size() && detection_is_required.load(); hid_detector_idx++)
{ {
if(( ( hid_wrapped_device_detectors[hid_detector_idx].address == addr ) ) HIDWrappedDeviceDetectorBlock & detector = hid_wrapped_device_detectors[hid_detector_idx];
#ifdef USE_HID_USAGE if(detector.compare(current_hid_device))
&& ( ( hid_wrapped_device_detectors[hid_detector_idx].usage_page == HID_USAGE_PAGE_ANY )
|| ( hid_wrapped_device_detectors[hid_detector_idx].usage_page == current_hid_device->usage_page ) )
&& ( ( hid_wrapped_device_detectors[hid_detector_idx].usage == HID_USAGE_ANY )
|| ( hid_wrapped_device_detectors[hid_detector_idx].usage == current_hid_device->usage ) )
&& ( ( hid_wrapped_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY )
|| ( hid_wrapped_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) )
#else
&& ( ( hid_wrapped_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY )
|| ( hid_wrapped_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) )
#endif
)
{ {
detection_string = hid_wrapped_device_detectors[hid_detector_idx].name.c_str(); detection_string = detector.name.c_str();
/*-------------------------------------------------*\ /*-------------------------------------------------*\
| Check if this detector is enabled or needs to be | | Check if this detector is enabled or needs to be |
@ -1207,7 +1191,7 @@ void ResourceManager::DetectDevicesThreadFunction()
{ {
DetectionProgressChanged(); DetectionProgressChanged();
hid_wrapped_device_detectors[hid_detector_idx].function(default_wrapper, current_hid_device, hid_wrapped_device_detectors[hid_detector_idx].name); detector.function(default_wrapper, current_hid_device, hid_wrapped_device_detectors[hid_detector_idx].name);
} }
} }
} }
@ -1293,24 +1277,16 @@ void ResourceManager::DetectDevicesThreadFunction()
detection_string = ""; detection_string = "";
DetectionProgressChanged(); DetectionProgressChanged();
unsigned int addr = (current_hid_device->vendor_id << 16) | current_hid_device->product_id;
/*-----------------------------------------------------------------------------*\ /*-----------------------------------------------------------------------------*\
| Loop through all available wrapped HID detectors. If all required | | Loop through all available wrapped HID detectors. If all required |
| information matches, run the detector | | information matches, run the detector |
\*-----------------------------------------------------------------------------*/ \*-----------------------------------------------------------------------------*/
for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_wrapped_device_detectors.size() && detection_is_required.load(); hid_detector_idx++) for(unsigned int hid_detector_idx = 0; hid_detector_idx < hid_wrapped_device_detectors.size() && detection_is_required.load(); hid_detector_idx++)
{ {
if(( ( hid_wrapped_device_detectors[hid_detector_idx].address == addr ) ) HIDWrappedDeviceDetectorBlock & detector = hid_wrapped_device_detectors[hid_detector_idx];
&& ( ( hid_wrapped_device_detectors[hid_detector_idx].usage_page == HID_USAGE_PAGE_ANY ) if(detector.compare(current_hid_device))
|| ( hid_wrapped_device_detectors[hid_detector_idx].usage_page == current_hid_device->usage_page ) )
&& ( ( hid_wrapped_device_detectors[hid_detector_idx].usage == HID_USAGE_ANY )
|| ( hid_wrapped_device_detectors[hid_detector_idx].usage == current_hid_device->usage ) )
&& ( ( hid_wrapped_device_detectors[hid_detector_idx].interface == HID_INTERFACE_ANY )
|| ( hid_wrapped_device_detectors[hid_detector_idx].interface == current_hid_device->interface_number ) )
)
{ {
detection_string = hid_wrapped_device_detectors[hid_detector_idx].name.c_str(); detection_string = detector.name.c_str();
/*-------------------------------------------------*\ /*-------------------------------------------------*\
| Check if this detector is enabled or needs to be | | Check if this detector is enabled or needs to be |
@ -1328,7 +1304,7 @@ void ResourceManager::DetectDevicesThreadFunction()
{ {
DetectionProgressChanged(); DetectionProgressChanged();
hid_wrapped_device_detectors[hid_detector_idx].function(wrapper, current_hid_device, hid_wrapped_device_detectors[hid_detector_idx].name); detector.function(wrapper, current_hid_device, detector.name);
} }
} }
} }

35
ResourceManager.h
View file

@ -43,25 +43,30 @@ typedef std::function<void(hidapi_wrapper wrapper, hid_device_info*, const std::
typedef std::function<void()> DynamicDetectorFunction; typedef std::function<void()> DynamicDetectorFunction;
typedef std::function<void()> PreDetectionHookFunction; typedef std::function<void()> PreDetectionHookFunction;
typedef struct class BasicHIDBlock
{ {
std::string name; public:
HIDDeviceDetectorFunction function; std::string name;
unsigned int address; uint16_t vid;
int interface; uint16_t pid;
int usage_page; int interface;
int usage; int usage_page;
} HIDDeviceDetectorBlock; int usage;
typedef struct bool compare(hid_device_info* info);
};
class HIDDeviceDetectorBlock : public BasicHIDBlock
{ {
std::string name; public:
HIDDeviceDetectorFunction function;
};
class HIDWrappedDeviceDetectorBlock : public BasicHIDBlock
{
public:
HIDWrappedDeviceDetectorFunction function; HIDWrappedDeviceDetectorFunction function;
unsigned int address; };
int interface;
int usage_page;
int usage;
} HIDWrappedDeviceDetectorBlock;
typedef struct typedef struct
{ {