From a4129edb6953a5ba57b3803daaf0363b29f05b71 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 15 Oct 2013 01:50:00 +0200 Subject: [PATCH] libusb-compat: use libusb 1.0 native error codes --- libnfc/buses/usbbus.c | 84 ++++++++++--------------------------- libnfc/buses/usbbus.h | 12 ++---- libnfc/drivers/acr122_usb.c | 5 +-- libnfc/drivers/pn53x_usb.c | 7 ++-- 4 files changed, 31 insertions(+), 77 deletions(-) diff --git a/libnfc/buses/usbbus.c b/libnfc/buses/usbbus.c index 5c7dd20..ad77db2 100644 --- a/libnfc/buses/usbbus.c +++ b/libnfc/buses/usbbus.c @@ -35,7 +35,6 @@ #endif // HAVE_CONFIG_H #include -#include #include #include #include "usbbus.h" @@ -43,8 +42,6 @@ #define LOG_CATEGORY "libnfc.buses.usbbus" #define LOG_GROUP NFC_LOG_GROUP_DRIVER -#define compat_err(e) -(errno=libusb_to_errno(e)) - /* * This file embeds partially libusb-compat-0.1 by: * Copyright (C) 2008 Daniel Drake @@ -84,40 +81,6 @@ static libusb_context *ctx = NULL; struct usbbus_bus *usb_busses = NULL; -static int libusb_to_errno(int result) -{ - switch (result) { - case LIBUSB_SUCCESS: - return 0; - case LIBUSB_ERROR_IO: - return EIO; - case LIBUSB_ERROR_INVALID_PARAM: - return EINVAL; - case LIBUSB_ERROR_ACCESS: - return EACCES; - case LIBUSB_ERROR_NO_DEVICE: - return ENXIO; - case LIBUSB_ERROR_NOT_FOUND: - return ENOENT; - case LIBUSB_ERROR_BUSY: - return EBUSY; - case LIBUSB_ERROR_TIMEOUT: - return ETIMEDOUT; - case LIBUSB_ERROR_OVERFLOW: - return EOVERFLOW; - case LIBUSB_ERROR_PIPE: - return EPIPE; - case LIBUSB_ERROR_INTERRUPTED: - return EINTR; - case LIBUSB_ERROR_NO_MEM: - return ENOMEM; - case LIBUSB_ERROR_NOT_SUPPORTED: - return ENOSYS; - default: - return ERANGE; - } -} - static void _usb_finalize(void) { if (ctx) { @@ -150,7 +113,7 @@ static int find_busses(struct usbbus_bus **ret) r = libusb_get_device_list(ctx, &dev_list); if (r < 0) { - return compat_err(r); + return r; } if (r == 0) { @@ -204,7 +167,7 @@ err: free(bus); bus = tbus; } - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; } static int usb_find_busses(void) @@ -307,7 +270,7 @@ err: free(dev); dev = tdev; } - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; } static void clear_endpoint_descriptor(struct usbbus_endpoint_descriptor *ep) @@ -366,7 +329,7 @@ static int copy_endpoint_descriptor(struct usbbus_endpoint_descriptor *dest, if (src->extra_length) { dest->extra = malloc(src->extra_length); if (!dest->extra) - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; memcpy(dest->extra, src->extra, src->extra_length); } @@ -383,7 +346,7 @@ static int copy_interface_descriptor(struct usbbus_interface_descriptor *dest, memcpy(dest, src, USBBUS_DT_INTERFACE_SIZE); dest->endpoint = malloc(alloc_size); if (!dest->endpoint) - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; memset(dest->endpoint, 0, alloc_size); for (i = 0; i < num_endpoints; i++) { @@ -399,7 +362,7 @@ static int copy_interface_descriptor(struct usbbus_interface_descriptor *dest, dest->extra = malloc(src->extra_length); if (!dest->extra) { clear_interface_descriptor(dest); - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; } memcpy(dest->extra, src->extra, src->extra_length); } @@ -418,7 +381,7 @@ static int copy_interface(struct usbbus_interface *dest, dest->num_altsetting = num_altsetting; dest->altsetting = malloc(alloc_size); if (!dest->altsetting) - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; memset(dest->altsetting, 0, alloc_size); for (i = 0; i < num_altsetting; i++) { @@ -443,7 +406,7 @@ static int copy_config_descriptor(struct usbbus_config_descriptor *dest, memcpy(dest, src, USBBUS_DT_CONFIG_SIZE); dest->interface = malloc(alloc_size); if (!dest->interface) - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; memset(dest->interface, 0, alloc_size); for (i = 0; i < num_interfaces; i++) { @@ -459,7 +422,7 @@ static int copy_config_descriptor(struct usbbus_config_descriptor *dest, dest->extra = malloc(src->extra_length); if (!dest->extra) { clear_config_descriptor(dest); - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; } memcpy(dest->extra, src->extra, src->extra_length); } @@ -479,14 +442,14 @@ static int initialize_device(struct usbbus_device *dev) r = libusb_get_device_descriptor(newlib_dev, (struct libusb_device_descriptor *) &dev->descriptor); if (r < 0) { - return compat_err(r); + return r; } num_configurations = dev->descriptor.bNumConfigurations; alloc_size = sizeof(struct usbbus_config_descriptor) * num_configurations; dev->config = malloc(alloc_size); if (!dev->config) - return -ENOMEM; + return LIBUSB_ERROR_NO_MEM; memset(dev->config, 0, alloc_size); for (i = 0; i < num_configurations; i++) { @@ -495,7 +458,7 @@ static int initialize_device(struct usbbus_device *dev) if (r < 0) { clear_device(dev); free(dev->config); - return compat_err(r); + return r; } r = copy_config_descriptor(dev->config + i, newlib_config); libusb_free_config_descriptor(newlib_config); @@ -533,7 +496,7 @@ static int usb_find_devices(void) dev_list_len = libusb_get_device_list(ctx, &dev_list); if (dev_list_len < 0) - return compat_err(dev_list_len); + return dev_list_len; for (bus = usb_busses; bus; bus = bus->next) { int r; @@ -636,7 +599,6 @@ usbbus_device_handle *usbbus_open(struct usbbus_device *dev) usbbus_device_handle *udev; r = libusb_open((libusb_device *) dev->dev, (libusb_device_handle **)&udev); if (r < 0) { - errno = libusb_to_errno(r); return NULL; } return (usbbus_device_handle *)udev; @@ -649,7 +611,7 @@ void usbbus_close(usbbus_device_handle *dev) int usbbus_set_configuration(usbbus_device_handle *dev, int configuration) { - return compat_err(libusb_set_configuration((libusb_device_handle *)dev, configuration)); + return libusb_set_configuration((libusb_device_handle *)dev, configuration); } int usbbus_get_string_simple(usbbus_device_handle *dev, int index, char *buf, size_t buflen) @@ -671,7 +633,7 @@ static int usbbus_bulk_io(usbbus_device_handle *dev, int ep, unsigned char *byte if (r == 0 || (r == LIBUSB_ERROR_TIMEOUT && actual_length > 0)) return actual_length; - return compat_err(r); + return r; } int usbbus_bulk_read(usbbus_device_handle *dev, int ep, char *bytes, int size, int timeout) @@ -686,17 +648,12 @@ int usbbus_bulk_write(usbbus_device_handle *dev, int ep, const char *bytes, int int usbbus_claim_interface(usbbus_device_handle *dev, int interface) { - int r; - r = libusb_claim_interface((libusb_device_handle *)dev, interface); - if (r == 0) { - return 0; - } - return compat_err(r); + return libusb_claim_interface((libusb_device_handle *)dev, interface); } int usbbus_release_interface(usbbus_device_handle *dev, int interface) { - return compat_err(libusb_release_interface((libusb_device_handle *)dev, interface)); + return libusb_release_interface((libusb_device_handle *)dev, interface); } int usbbus_set_interface_alt_setting(usbbus_device_handle *dev, int interface, int alternate) @@ -706,7 +663,12 @@ int usbbus_set_interface_alt_setting(usbbus_device_handle *dev, int interface, i int usbbus_reset(usbbus_device_handle *dev) { - return compat_err(libusb_reset_device((libusb_device_handle *)dev)); + return libusb_reset_device((libusb_device_handle *)dev); +} + +const char * usbbus_strerror(int errcode) +{ + return libusb_strerror((enum libusb_error)errcode); } struct usbbus_bus *usbbus_get_busses(void) diff --git a/libnfc/buses/usbbus.h b/libnfc/buses/usbbus.h index b105a1c..8a642e3 100644 --- a/libnfc/buses/usbbus.h +++ b/libnfc/buses/usbbus.h @@ -36,15 +36,8 @@ #include #include -#ifndef _WIN32 -// Under POSIX system, we use libusb (>= 0.1.12) -#define USBBUS_TIMEDOUT ETIMEDOUT -#define usbbus_strerror( X ) strerror(-X) -#else -// Under Windows we use libusb-win32 (>= 1.2.5) -#define USBBUS_TIMEDOUT 116 -#define usbbus_strerror( X ) usb_strerror() -#endif +#define USBBUS_ERROR_ACCESS -3 +#define USBBUS_ERROR_TIMEOUT -7 int usbbus_prepare(void); @@ -176,6 +169,7 @@ int usbbus_claim_interface(usbbus_device_handle *dev, int interface); int usbbus_release_interface(usbbus_device_handle *dev, int interface); int usbbus_set_interface_alt_setting(usbbus_device_handle *dev, int interface, int alternate); int usbbus_reset(usbbus_device_handle *dev); +const char * usbbus_strerror(int errcode); struct usbbus_bus *usbbus_get_busses(void); #endif // __NFC_BUS_USB_H__ diff --git a/libnfc/drivers/acr122_usb.c b/libnfc/drivers/acr122_usb.c index cf61b31..a2472e9 100644 --- a/libnfc/drivers/acr122_usb.c +++ b/libnfc/drivers/acr122_usb.c @@ -58,7 +58,6 @@ Thanks to d18c7db and Okko for example code #include #include #include -#include #include #include @@ -222,7 +221,7 @@ acr122_usb_bulk_read(struct acr122_usb_data *data, uint8_t abtRx[], const size_t if (res > 0) { LOG_HEX(NFC_LOG_GROUP_COM, "RX", abtRx, res); } else if (res < 0) { - if (res != -USBBUS_TIMEDOUT) { + if (res != USBBUS_ERROR_TIMEOUT) { res = NFC_EIO; log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "Unable to read from USB (%s)", usbbus_strerror(res)); } else { @@ -244,7 +243,7 @@ acr122_usb_bulk_write(struct acr122_usb_data *data, uint8_t abtTx[], const size_ } } else if (res < 0) { log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "Unable to write to USB (%s)", usbbus_strerror(res)); - if (res == -USBBUS_TIMEDOUT) { + if (res == USBBUS_ERROR_TIMEOUT) { res = NFC_ETIMEOUT; } else { res = NFC_EIO; diff --git a/libnfc/drivers/pn53x_usb.c b/libnfc/drivers/pn53x_usb.c index f039045..87db2d8 100644 --- a/libnfc/drivers/pn53x_usb.c +++ b/libnfc/drivers/pn53x_usb.c @@ -41,7 +41,6 @@ Thanks to d18c7db and Okko for example code #include #include #include -#include #include #include @@ -94,7 +93,7 @@ pn53x_usb_bulk_read(struct pn53x_usb_data *data, uint8_t abtRx[], const size_t s if (res > 0) { LOG_HEX(NFC_LOG_GROUP_COM, "RX", abtRx, res); } else if (res < 0) { - if (res != -USBBUS_TIMEDOUT) + if (res != USBBUS_ERROR_TIMEOUT) log_put(NFC_LOG_GROUP_COM, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "Unable to read from USB (%s)", usbbus_strerror(res)); } return res; @@ -309,7 +308,7 @@ pn53x_usb_open(const nfc_context *context, const nfc_connstring connstring) int res = usbbus_set_configuration(data.pudh, 1); if (res < 0) { log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "Unable to set USB configuration (%s)", usbbus_strerror(res)); - if (EPERM == -res) { + if (res == USBBUS_ERROR_ACCESS) { log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_INFO, "Warning: Please double check USB permissions for device %04x:%04x", dev->descriptor.idVendor, dev->descriptor.idProduct); } usbbus_close(data.pudh); @@ -497,7 +496,7 @@ read: res = pn53x_usb_bulk_read(DRIVER_DATA(pnd), abtRxBuf, sizeof(abtRxBuf), usbbus_timeout); - if (res == -USBBUS_TIMEDOUT) { + if (res == USBBUS_ERROR_TIMEOUT) { if (DRIVER_DATA(pnd)->abort_flag) { DRIVER_DATA(pnd)->abort_flag = false; pn53x_usb_ack(pnd);