AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

member access tweak

This commit is contained in:
Jack Andersen 2015-08-18 19:47:46 -10:00
parent 2c2991d44e
commit 74181d3b2e
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/inputdev/HIDDeviceUdev.cpp
View File

@ -83,8 +83,8 @@ class HIDDeviceUdev final : public IHIDDevice
/* Get device file */ /* Get device file */
const char* dp = udev_device_get_devnode(udevDev); const char* dp = udev_device_get_devnode(udevDev);
device->m_devFd = open(dp, O_RDWR); int fd = open(dp, O_RDWR);
if (device->m_devFd < 0) if (fd < 0)
{ {
snprintf(errStr, 256, "Unable to open %s@%s: %s\n", snprintf(errStr, 256, "Unable to open %s@%s: %s\n",
device->m_token.getProductName().c_str(), dp, strerror(errno)); device->m_token.getProductName().c_str(), dp, strerror(errno));
@ -94,24 +94,25 @@ class HIDDeviceUdev final : public IHIDDevice
udev_device_unref(udevDev); udev_device_unref(udevDev);
return; return;
} }
device->m_devFd = fd;
usb_device_descriptor devDesc = {}; usb_device_descriptor devDesc = {};
read(device->m_devFd, &devDesc, 1); read(fd, &devDesc, 1);
read(device->m_devFd, &devDesc.bDescriptorType, devDesc.bLength-1); read(fd, &devDesc.bDescriptorType, devDesc.bLength-1);
if (devDesc.bNumConfigurations) if (devDesc.bNumConfigurations)
{ {
usb_config_descriptor confDesc = {}; usb_config_descriptor confDesc = {};
read(device->m_devFd, &confDesc, 1); read(fd, &confDesc, 1);
read(device->m_devFd, &confDesc.bDescriptorType, confDesc.bLength-1); read(fd, &confDesc.bDescriptorType, confDesc.bLength-1);
if (confDesc.bNumInterfaces) if (confDesc.bNumInterfaces)
{ {
usb_interface_descriptor intfDesc = {}; usb_interface_descriptor intfDesc = {};
read(device->m_devFd, &intfDesc, 1); read(fd, &intfDesc, 1);
read(device->m_devFd, &intfDesc.bDescriptorType, intfDesc.bLength-1); read(fd, &intfDesc.bDescriptorType, intfDesc.bLength-1);
for (i=0 ; i<intfDesc.bNumEndpoints+1 ; ++i) for (i=0 ; i<intfDesc.bNumEndpoints+1 ; ++i)
{ {
usb_endpoint_descriptor endpDesc = {}; usb_endpoint_descriptor endpDesc = {};
read(device->m_devFd, &endpDesc, 1); read(fd, &endpDesc, 1);
read(device->m_devFd, &endpDesc.bDescriptorType, endpDesc.bLength-1); read(fd, &endpDesc.bDescriptorType, endpDesc.bLength-1);
if ((endpDesc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) if ((endpDesc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)
{ {
if ((endpDesc.bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) if ((endpDesc.bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN)
@ -129,7 +130,7 @@ class HIDDeviceUdev final : public IHIDDevice
USBDEVFS_DISCONNECT, USBDEVFS_DISCONNECT,
NULL NULL
}; };
ioctl(device->m_devFd, USBDEVFS_IOCTL, &disconnectReq); ioctl(fd, USBDEVFS_IOCTL, &disconnectReq);
/* Return control to main thread */ /* Return control to main thread */
device->m_runningTransferLoop = true; device->m_runningTransferLoop = true;
@ -143,7 +144,7 @@ class HIDDeviceUdev final : public IHIDDevice
device->m_devImp.finalCycle(); device->m_devImp.finalCycle();
/* Cleanup */ /* Cleanup */
close(device->m_devFd); close(fd);
device->m_devFd = 0; device->m_devFd = 0;
udev_device_unref(udevDev); udev_device_unref(udevDev);