Skip to content

Commit

Permalink
Implement hid_write_control, so we can use HidD_SetOutputReport on wi…
Browse files Browse the repository at this point in the history
…n, all others are just a wrapper until tested
  • Loading branch information
jarveson authored and Megamouse committed Jan 1, 2022
1 parent 0ec60c0 commit 8027ddf
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 0 deletions.
5 changes: 5 additions & 0 deletions hidapi/hidapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,11 @@ extern "C" {
*/
HID_API_EXPORT const char* HID_API_CALL hid_version_str(void);

/** RPCS3 EDIT: This attempts to write the output on the 'control' channel
Otherwise it's the exact same as hid_write
*/
int HID_API_EXPORT HID_API_CALL hid_write_control(hid_device *device, const unsigned char *data, size_t length);

#ifdef __cplusplus
}
#endif
Expand Down
5 changes: 5 additions & 0 deletions libusb/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,11 @@ hid_device * HID_API_EXPORT hid_open_path(const char *path)
}
}

int HID_API_EXPORT hid_write_control(hid_device *dev, const unsigned char *data, size_t length)
{
//RPCS3 TODO: Test if this needs to be changed for control if we ever use it
return hid_write(dev, data, length);
}

HID_API_EXPORT hid_device * HID_API_CALL hid_libusb_wrap_sys_device(intptr_t sys_dev, int interface_num)
{
Expand Down
6 changes: 6 additions & 0 deletions linux/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,12 @@ int HID_API_EXPORT hid_write(hid_device *dev, const unsigned char *data, size_t
return bytes_written;
}

int HID_API_EXPORT hid_write_control(hid_device *dev, const unsigned char *data, size_t length)
{
//RPCS3 TODO: Test if this needs to be changed for control if we ever use it
return hid_write(dev, data, length);
}


int HID_API_EXPORT hid_read_timeout(hid_device *dev, unsigned char *data, size_t length, int milliseconds)
{
Expand Down
6 changes: 6 additions & 0 deletions mac/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,12 @@ static int get_report(hid_device *dev, IOHIDReportType type, unsigned char *data
return -1;
}

int HID_API_EXPORT hid_write_control(hid_device *dev, const unsigned char *data, size_t length)
{
//RPCS3 TODO: Test if this needs to be changed for control on mac if we ever use it
return hid_write(dev, data, length);
}

int HID_API_EXPORT hid_write(hid_device *dev, const unsigned char *data, size_t length)
{
return set_report(dev, kIOHIDReportTypeOutput, data, length);
Expand Down
17 changes: 17 additions & 0 deletions windows/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ static struct hid_api_version api_version = {
typedef BOOLEAN (__stdcall *HidD_FreePreparsedData_)(PHIDP_PREPARSED_DATA preparsed_data);
typedef NTSTATUS (__stdcall *HidP_GetCaps_)(PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *caps);
typedef BOOLEAN (__stdcall *HidD_SetNumInputBuffers_)(HANDLE handle, ULONG number_buffers);
typedef BOOLEAN(__stdcall *HidD_SetOutputReport_)(HANDLE handle, PVOID data, ULONG length);

static HidD_GetHidGuid_ HidD_GetHidGuid;
static HidD_GetAttributes_ HidD_GetAttributes;
Expand All @@ -139,6 +140,7 @@ static struct hid_api_version api_version = {
static HidD_FreePreparsedData_ HidD_FreePreparsedData;
static HidP_GetCaps_ HidP_GetCaps;
static HidD_SetNumInputBuffers_ HidD_SetNumInputBuffers;
static HidD_SetOutputReport_ HidD_SetOutputReport;

static HMODULE lib_handle = NULL;
static BOOLEAN initialized = FALSE;
Expand Down Expand Up @@ -278,6 +280,7 @@ static int lookup_functions()
RESOLVE(HidD_FreePreparsedData);
RESOLVE(HidP_GetCaps);
RESOLVE(HidD_SetNumInputBuffers);
RESOLVE(HidD_SetOutputReport);
#undef RESOLVE
#if defined(__GNUC__)
# pragma GCC diagnostic pop
Expand Down Expand Up @@ -917,6 +920,20 @@ int HID_API_EXPORT HID_API_CALL hid_write(hid_device *dev, const unsigned char *
return function_result;
}

int HID_API_EXPORT HID_API_CALL hid_write_control(hid_device *dev, const unsigned char *data, size_t length)
{
DWORD bytes_written = length;
BOOL res;

res = HidD_SetOutputReport(dev->device_handle, (PVOID)data, (ULONG)length);

if (!res) {
register_error(dev, "SetOutputReport");
bytes_written = -1;
}

return length;
}

int HID_API_EXPORT HID_API_CALL hid_read_timeout(hid_device *dev, unsigned char *data, size_t length, int milliseconds)
{
Expand Down

0 comments on commit 8027ddf

Please sign in to comment.