From 80f5fd846a28e44baf8d2043df67c8e4b18a3472 Mon Sep 17 00:00:00 2001 From: pavel Date: Sat, 28 Mar 2015 01:10:15 +0300 Subject: [PATCH] Fixed libusb01.c (renamed err constants) --- commandline/hiddata_libusb01.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/commandline/hiddata_libusb01.c b/commandline/hiddata_libusb01.c index 4ed5ed8..1cc8b73 100644 --- a/commandline/hiddata_libusb01.c +++ b/commandline/hiddata_libusb01.c @@ -55,7 +55,7 @@ int usbhidEnumDevices(int vendor, int product, struct usb_bus *bus; struct usb_device *dev; usb_dev_handle *handle = NULL; - int errorCode = USBOPEN_ERR_NOTFOUND; + int errorCode = USBHID_ERR_NOTFOUND; static int didUsbInit = 0; if(!didUsbInit){ @@ -69,7 +69,7 @@ int usbhidEnumDevices(int vendor, int product, if (dev->descriptor.idVendor == vendor && dev->descriptor.idProduct == product) { handle = usb_open(dev); /* we need to open the device in order to query strings */ if ( !handle ) { - errorCode = USBOPEN_ERR_ACCESS; + errorCode = USBHID_ERR_ACCESS; fprintf(stderr, "Warning: cannot open USB device: %s\n", usb_strerror()); continue; } @@ -129,7 +129,7 @@ int usbhidGetVendorString(USBDEVHANDLE usbh, char *buffer, int len) int len2 = usbhidGetStringAscii(usbDevHandle(usbh), usbDevStruct(usbh)->descriptor.iManufacturer, buffer, len); if (len2 < 0) { fprintf(stderr, "Warning: cannot query vendor for device\n"); - return USBOPEN_ERR_IO; + return USBHID_ERR_IO; } return 0; } @@ -139,7 +139,7 @@ int usbhidGetProductString(USBDEVHANDLE usbh, char *buffer, int len) int len2 = usbhidGetStringAscii(usbDevHandle(usbh), usbDevStruct(usbh)->descriptor.iProduct, buffer, len); if (len2 < 0) { fprintf(stderr, "Warning: cannot query product for device\n"); - return USBOPEN_ERR_IO; + return USBHID_ERR_IO; } return 0; } @@ -161,7 +161,7 @@ int usbhidSetReport(USBDEVHANDLE usbh, char *buffer, int len) if (bytesSent != len) { if (bytesSent < 0) fprintf(stderr, "Error sending message: %s\n", usb_strerror()); - return USBOPEN_ERR_IO; + return USBHID_ERR_IO; } return 0; } @@ -181,7 +181,7 @@ int bytesReceived, maxLen = *len; 0, buffer, maxLen, A_REPORT_REQUEST_TIMEOUT); if(bytesReceived < 0){ fprintf(stderr, "Error sending message: %s\n", usb_strerror()); - return USBOPEN_ERR_IO; + return USBHID_ERR_IO; } *len = bytesReceived; if (!usesReportIDs(usbh)) { -- 2.25.1