diff options
Diffstat (limited to 'linux/cusblinux.c')
| -rw-r--r-- | linux/cusblinux.c | 144 |
1 files changed, 93 insertions, 51 deletions
diff --git a/linux/cusblinux.c b/linux/cusblinux.c index 5e4886c..8b15d4e 100644 --- a/linux/cusblinux.c +++ b/linux/cusblinux.c @@ -20,6 +20,7 @@ int CUSBCloseHandle(CPhidgetHandle phid) { int ret = 0; int result = EPHIDGET_OK; + if (!phid) return EPHIDGET_INVALIDARG; @@ -130,53 +131,60 @@ int CUSBSendPacket(CPhidgetHandle phid, unsigned char *buffer) { } int CUSBSetLabel(CPhidgetHandle phid, char *buffer) { - int BytesWritten = 0; - int size = buffer[0]; - - if(size>22) return EPHIDGET_INVALID; - - if (!phid) - return EPHIDGET_INVALIDARG; - - if (!CPhidget_statusFlagIsSet(phid->status, PHIDGET_ATTACHED_FLAG) - && !CPhidget_statusFlagIsSet(phid->status, PHIDGET_ATTACHING_FLAG)) - return EPHIDGET_NOTATTACHED; - - if (phid->deviceHandle == NULL) + if(deviceSupportsGeneralUSBProtocol(phid)) { - LOG(PHIDGET_LOG_WARNING,"Handle for writing is not valid"); - return EPHIDGET_UNEXPECTED; + return CPhidgetGPP_setLabel(phid, buffer); } - - BytesWritten = usb_control_msg(phid->deviceHandle, - USB_ENDPOINT_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE, - USB_REQ_SET_DESCRIPTOR, - 0x0304, /* value */ - 0x0409, /* index*/ - (char *)buffer, - size, /* size */ - 500); /* FIXME? timeout */ - - if(BytesWritten < 0) + else { - switch(BytesWritten) + int BytesWritten = 0; + int size = buffer[0]; + + if(size>22) return EPHIDGET_INVALID; + + if (!phid) + return EPHIDGET_INVALIDARG; + + if (!CPhidget_statusFlagIsSet(phid->status, PHIDGET_ATTACHED_FLAG) + && !CPhidget_statusFlagIsSet(phid->status, PHIDGET_ATTACHING_FLAG)) + return EPHIDGET_NOTATTACHED; + + if (phid->deviceHandle == NULL) { - case -ETIMEDOUT: //important case? - default: - LOG(PHIDGET_LOG_INFO, "usb_control_msg failed with error code: %d \"%s\"", BytesWritten, strerror(-BytesWritten)); - return EPHIDGET_UNSUPPORTED; + LOG(PHIDGET_LOG_WARNING,"Handle for writing is not valid"); + return EPHIDGET_UNEXPECTED; + } + + BytesWritten = usb_control_msg(phid->deviceHandle, + USB_ENDPOINT_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE, + USB_REQ_SET_DESCRIPTOR, + 0x0304, /* value */ + 0x0409, /* index*/ + (char *)buffer, + size, /* size */ + 500); /* FIXME? timeout */ + + if(BytesWritten < 0) + { + switch(BytesWritten) + { + case -ETIMEDOUT: //important case? + default: + LOG(PHIDGET_LOG_INFO, "usb_control_msg failed with error code: %d \"%s\"", BytesWritten, strerror(-BytesWritten)); + return EPHIDGET_UNSUPPORTED; + } } - } - if (BytesWritten != size) - { - LOG(PHIDGET_LOG_WARNING,"Failure in CUSBSetLabel - Report Length" - ": %d, bytes written: %d", - size, (int)BytesWritten); - return EPHIDGET_UNEXPECTED; + if (BytesWritten != size) + { + LOG(PHIDGET_LOG_WARNING,"Failure in CUSBSetLabel - Report Length" + ": %d, bytes written: %d", + size, (int)BytesWritten); + return EPHIDGET_UNEXPECTED; + } + + return EPHIDGET_OK; } - - return EPHIDGET_OK; } /* Buffer should be at least 8 bytes long */ @@ -258,24 +266,32 @@ static int getLabelString(CPhidgetHandle phid, struct usb_dev_handle *udev) { int len = 0; char labelBuf[22]; + struct usb_device *dev; memset(labelBuf, 0, sizeof(labelBuf)); - //Note that this returns the whole descriptor, including the length and type bytes - len = usb_get_string(udev, 4, 0, (char *)labelBuf, 22); + dev = usb_device(udev); - if(len < 0) + if(dev->descriptor.iSerialNumber == 3) { - switch(len) + //Note that this returns the whole descriptor, including the length and type bytes + len = usb_get_string(udev, 4, 0, (char *)labelBuf, 22); + + if(len < 0) { - case -ETIMEDOUT: //important case? - default: - LOG(PHIDGET_LOG_INFO, "usb_get_string_simple failed in CUSBGetDeviceCapabilities with error code: %d \"%s\" while reading label - this probably just means the device doesn't support labels, so this is fine.", len, strerror(-len)); + switch(len) + { + case -ETIMEDOUT: //important case? + default: + LOG(PHIDGET_LOG_INFO, "usb_get_string_simple failed in CUSBGetDeviceCapabilities with error code: %d \"%s\" while reading label - this probably just means the device doesn't support labels, so this is fine.", len, strerror(-len)); + } + phid->label[0]='\0'; + return EPHIDGET_OK; } - phid->label[0]='\0'; - return EPHIDGET_OK; + else + return decodeLabelString(labelBuf, phid->label, phid->serialNumber); } - else - return decodeLabelString(labelBuf, phid->label, phid->serialNumber); + phid->label[0]='\0'; + return EPHIDGET_OK; } int CUSBRefreshLabelString(CPhidgetHandle phid) @@ -504,6 +520,19 @@ int CUSBBuildList(CPhidgetList **curList) { getLabelString(phid, udev); } } + if (dev->descriptor.iProduct) { + if((ret = usb_get_string_simple(udev, dev->descriptor.iProduct, phid->usbProduct, sizeof(phid->usbProduct))) < 0) + { + LOG(PHIDGET_LOG_ERROR, "usb_get_string_simple failed with error code: %d \"%s\"", ret, strerror(-ret)); + LOG(PHIDGET_LOG_INFO, "This usually means you need to run as root"); + if((ret = usb_close(udev)) < 0) + { + LOG(PHIDGET_LOG_ERROR, "usb_close failed with error code: %d \"%s\"", ret, strerror(-ret)); + } + free(phid); + goto next; + } + } phid->specificDevice = TRUE; phid->attr = Phid_Device_Def[i].pdd_attr; @@ -592,6 +621,19 @@ int CUSBOpenHandle(CPhidgetHandle phid) serial = atol(string); } } + if (dev->descriptor.iProduct) { + if((ret = usb_get_string_simple(udev, dev->descriptor.iProduct, phid->usbProduct, sizeof(phid->usbProduct))) < 0) + { + LOG(PHIDGET_LOG_ERROR, "usb_get_string_simple failed with error code: %d \"%s\"", ret, strerror(-ret)); + LOG(PHIDGET_LOG_INFO, "This usually means you need to run as root"); + if((ret = usb_close(udev)) < 0) + { + LOG(PHIDGET_LOG_ERROR, "usb_close failed with error code: %d \"%s\"", ret, strerror(-ret)); + } + free(phid); + goto next; + } + } if (serial == phid->serialNumber) { /* On Linux, the HID driver likes to claim Phidgets - we can disconnect it here. Maybe the user has installed the kernel drivers for the interface kit or servo - disconnect them too (does this work) |