GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-08 21:14:14 +00:00
Code Issues Releases Wiki Activity

Fix various libusb warnings and possible bugs on linux build.

Browse Source
This commit is contained in:
Con Kolivas 2013-08-30 00:09:39 +10:00
parent 358afc8450
commit ec4821c11f
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compat/libusb-1.0/libusb/descriptor.c
View File

@ -805,6 +805,7 @@ int API_EXPORTED libusb_parse_bos_descriptor(const void *buf, int len,
struct libusb_bos_descriptor *bos_desc; struct libusb_bos_descriptor *bos_desc;
int i; int i;
len = len;
bos_desc = calloc (1, sizeof (*bos_desc)); bos_desc = calloc (1, sizeof (*bos_desc));
if (!bos_desc) { if (!bos_desc) {
return LIBUSB_ERROR_NO_MEM; return LIBUSB_ERROR_NO_MEM;

2
compat/libusb-1.0/libusb/io.c
View File

@ -1942,7 +1942,7 @@ static int handle_events(struct libusb_context *ctx, struct timeval *tv)
/* fd[1] is always the hotplug pipe */ /* fd[1] is always the hotplug pipe */
if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) && fds[1].revents) { if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) && fds[1].revents) {
libusb_hotplug_message message; libusb_hotplug_message message;
int ret; unsigned int ret;
/* read the message from the hotplug thread */ /* read the message from the hotplug thread */
ret = read(ctx->hotplug_pipe[0], &message, sizeof (message)); ret = read(ctx->hotplug_pipe[0], &message, sizeof (message));

2
compat/libusb-1.0/libusb/os/linux_udev.c
View File

@ -109,7 +109,7 @@ int linux_udev_stop_event_monitor(void)
return LIBUSB_SUCCESS; return LIBUSB_SUCCESS;
} }
static void *linux_udev_event_thread_main(void *arg) static void *linux_udev_event_thread_main(void __attribute__((unused)) *arg)
{ {
struct pollfd fds = {.fd = udev_monitor_fd, struct pollfd fds = {.fd = udev_monitor_fd,
.events = POLLIN}; .events = POLLIN};

28
compat/libusb-1.0/libusb/os/linux_usbfs.c
View File

@ -664,7 +664,7 @@ static int seek_to_next_config(struct libusb_context *ctx, int fd,
if (r < 0) { if (r < 0) {
usbi_err(ctx, "read failed ret=%d errno=%d", r, errno); usbi_err(ctx, "read failed ret=%d errno=%d", r, errno);
return LIBUSB_ERROR_IO; return LIBUSB_ERROR_IO;
} else if (r < sizeof(tmp)) { } else if (r < (ssize_t)sizeof(tmp)) {
usbi_err(ctx, "short descriptor read %d/%d", r, sizeof(tmp)); usbi_err(ctx, "short descriptor read %d/%d", r, sizeof(tmp));
return LIBUSB_ERROR_IO; return LIBUSB_ERROR_IO;
} }
@ -733,7 +733,7 @@ static int sysfs_get_active_config_descriptor(struct libusb_device *dev,
usbi_err(DEVICE_CTX(dev), "read failed, ret=%d errno=%d", usbi_err(DEVICE_CTX(dev), "read failed, ret=%d errno=%d",
fd, errno); fd, errno);
return LIBUSB_ERROR_IO; return LIBUSB_ERROR_IO;
} else if (r < sizeof(tmp)) { } else if (r < (ssize_t)sizeof(tmp)) {
usbi_err(DEVICE_CTX(dev), "short read %d/%d", r, sizeof(tmp)); usbi_err(DEVICE_CTX(dev), "short read %d/%d", r, sizeof(tmp));
return LIBUSB_ERROR_IO; return LIBUSB_ERROR_IO;
} }
@ -763,7 +763,7 @@ static int sysfs_get_active_config_descriptor(struct libusb_device *dev,
} else if (r == 0) { } else if (r == 0) {
usbi_dbg("device is unconfigured"); usbi_dbg("device is unconfigured");
r = LIBUSB_ERROR_NOT_FOUND; r = LIBUSB_ERROR_NOT_FOUND;
} else if (r < len - sizeof(tmp)) { } else if ((size_t)r < len - sizeof(tmp)) {
usbi_err(DEVICE_CTX(dev), "short read %d/%d", r, len); usbi_err(DEVICE_CTX(dev), "short read %d/%d", r, len);
r = LIBUSB_ERROR_IO; r = LIBUSB_ERROR_IO;
} }
@ -779,6 +779,8 @@ int linux_get_device_address (struct libusb_context *ctx, int detached,
uint8_t *busnum, uint8_t *devaddr, uint8_t *busnum, uint8_t *devaddr,
const char *dev_node, const char *sys_name) const char *dev_node, const char *sys_name)
{ {
int retbus, retdev;
usbi_dbg("getting address for device: %s detached: %d", usbi_dbg("getting address for device: %s detached: %d",
sys_name, detached); sys_name, detached);
/* can't use sysfs to read the bus and device number if the /* can't use sysfs to read the bus and device number if the
@ -800,16 +802,16 @@ int linux_get_device_address (struct libusb_context *ctx, int detached,
usbi_dbg("scan %s", sys_name); usbi_dbg("scan %s", sys_name);
*busnum = __read_sysfs_attr(ctx, sys_name, "busnum"); *busnum = retbus = __read_sysfs_attr(ctx, sys_name, "busnum");
if (0 > *busnum) if (retbus < 0)
return *busnum; return retbus;
*devaddr = __read_sysfs_attr(ctx, sys_name, "devnum"); *devaddr = retdev = __read_sysfs_attr(ctx, sys_name, "devnum");
if (0 > *devaddr) if (retdev < 0)
return *devaddr; return retdev;
usbi_dbg("bus=%d dev=%d", *busnum, *devaddr); usbi_dbg("bus=%d dev=%d", *busnum, *devaddr);
if (*busnum > 255 || *devaddr > 255) if (retbus > 255 || retdev > 255)
return LIBUSB_ERROR_INVALID_PARAM; return LIBUSB_ERROR_INVALID_PARAM;
return LIBUSB_SUCCESS; return LIBUSB_SUCCESS;
@ -818,6 +820,7 @@ int linux_get_device_address (struct libusb_context *ctx, int detached,
static int op_get_active_config_descriptor(struct libusb_device *dev, static int op_get_active_config_descriptor(struct libusb_device *dev,
unsigned char *buffer, size_t len, int *host_endian) unsigned char *buffer, size_t len, int *host_endian)
{ {
*host_endian = *host_endian;
if (sysfs_has_descriptors) { if (sysfs_has_descriptors) {
return sysfs_get_active_config_descriptor(dev, buffer, len); return sysfs_get_active_config_descriptor(dev, buffer, len);
} else { } else {
@ -853,7 +856,7 @@ static int get_config_descriptor(struct libusb_context *ctx, int fd,
if (r < 0) { if (r < 0) {
usbi_err(ctx, "read failed ret=%d errno=%d", r, errno); usbi_err(ctx, "read failed ret=%d errno=%d", r, errno);
return LIBUSB_ERROR_IO; return LIBUSB_ERROR_IO;
} else if (r < len) { } else if ((size_t)r < len) {
usbi_err(ctx, "short output read %d/%d", r, len); usbi_err(ctx, "short output read %d/%d", r, len);
return LIBUSB_ERROR_IO; return LIBUSB_ERROR_IO;
} }
@ -868,6 +871,7 @@ static int op_get_config_descriptor(struct libusb_device *dev,
int fd; int fd;
int r; int r;
*host_endian = *host_endian;
/* always read from usbfs: sysfs only has the active descriptor /* always read from usbfs: sysfs only has the active descriptor
* this will involve waking the device up, but oh well! */ * this will involve waking the device up, but oh well! */
@ -1161,7 +1165,7 @@ void linux_hotplug_disconnected(uint8_t busnum, uint8_t devaddr, const char *sys
if (NULL != dev) { if (NULL != dev) {
usbi_disconnect_device (dev); usbi_disconnect_device (dev);
} else { } else {
usbi_err(ctx, "device not found for session %x", busnum << 8 | devaddr); usbi_err(ctx, "device not found for session %x %s", busnum << 8 | devaddr, sys_name);
} }
} }
} }