RPCS3/hidapi
1
0
Fork 0
mirror of https://github.com/RPCS3/hidapi.git synced 2024-11-27 12:00:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for Feature Reports to OSX version.

Browse Source
This commit is contained in:
Alan Ott 2010-07-05 23:26:18 -04:00
parent 21ad843545
commit 044ddb1295
1 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
mac/hid.c
View File

@ -478,21 +478,12 @@ return_error:
return -1;
}
int HID_API_EXPORT hid_write(int device, const unsigned char *data, size_t length)
static int set_report(struct Device *dev, IOHIDReportType type, const unsigned char *data, size_t length)
{
struct Device *dev = NULL;
const unsigned char *data_to_send;
size_t length_to_send;
IOReturn res;
// Get the handle
if (device < 0 || device >= MAX_DEVICES)
return -1;
if (devices[device].valid == 0)
return -1;
dev = &devices[device];
if (data[0] == 0x0) {
/* Not using numbered Reports.
Don't send the report number. */
@ -507,7 +498,7 @@ int HID_API_EXPORT hid_write(int device, const unsigned char *data, size_t lengt
}
res = IOHIDDeviceSetReport(dev->device_handle,
kIOHIDReportTypeOutput,
type,
data[0], /* Report ID*/
data_to_send, length_to_send);
@ -516,6 +507,21 @@ int HID_API_EXPORT hid_write(int device, const unsigned char *data, size_t lengt
}
else
return -1;
}
int HID_API_EXPORT hid_write(int device, const unsigned char *data, size_t length)
{
struct Device *dev = NULL;
// Get the handle
if (device < 0 || device >= MAX_DEVICES)
return -1;
if (devices[device].valid == 0)
return -1;
dev = &devices[device];
return set_report(dev, kIOHIDReportTypeOutput, data, length);
}
/* Helper function, so that this isn't duplicated in hid_read(). */
@ -591,7 +597,6 @@ int HID_API_EXPORT hid_read(int device, unsigned char *data, size_t length)
int HID_API_EXPORT hid_set_nonblocking(int device, int nonblock)
{
int flags, res;
struct Device *dev = NULL;
// Get the handle
@ -607,6 +612,44 @@ int HID_API_EXPORT hid_set_nonblocking(int device, int nonblock)
return 0;
}
int HID_API_EXPORT hid_send_feature_report(int device, const unsigned char *data, size_t length)
{
struct Device *dev = NULL;
// Get the handle
if (device < 0 || device >= MAX_DEVICES)
return -1;
if (devices[device].valid == 0)
return -1;
dev = &devices[device];
return set_report(dev, kIOHIDReportTypeFeature, data, length);
}
int HID_API_EXPORT hid_get_feature_report(int device, unsigned char *data, size_t length)
{
struct Device *dev = NULL;
CFIndex len = length;
IOReturn res;
// Get the handle
if (device < 0 || device >= MAX_DEVICES)
return -1;
if (devices[device].valid == 0)
return -1;
dev = &devices[device];
res = IOHIDDeviceGetReport(dev->device_handle,
kIOHIDReportTypeFeature,
data[0], /* Report ID */
data, &len);
if (res == kIOReturnSuccess)
return length;
else
return -1;
}
void HID_API_EXPORT hid_close(int device)
{
struct Device *dev = NULL;