FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hidapi'

Browse Source
This commit is contained in:
Jef Driesen 2017-08-18 23:16:26 +02:00
commit db0e1691cc
3 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/descriptor.c
View File

@ -23,9 +23,9 @@
#include "config.h" #include "config.h"
#endif #endif
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(HAVE_HIDAPI)
#define USBHID #define USBHID
#elif defined(HAVE_HIDAPI) #elif defined(HAVE_LIBUSB) && !defined(__APPLE__)
#define USBHID #define USBHID
#endif #endif

70
src/usbhid.c
View File

@ -25,14 +25,20 @@
#include <stdlib.h> #include <stdlib.h>
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(HAVE_HIDAPI)
#define USE_HIDAPI
#define USBHID #define USBHID
#elif defined(HAVE_LIBUSB) && !defined(__APPLE__)
#define USE_LIBUSB
#define USBHID
#endif
#if defined(USE_LIBUSB)
#ifdef _WIN32 #ifdef _WIN32
#define NOGDI #define NOGDI
#endif #endif
#include <libusb-1.0/libusb.h> #include <libusb-1.0/libusb.h>
#elif defined(HAVE_HIDAPI) #elif defined(USE_HIDAPI)
#define USBHID
#include <hidapi/hidapi.h> #include <hidapi/hidapi.h>
#endif #endif
@ -44,20 +50,20 @@ struct dc_usbhid_t {
/* Library context. */ /* Library context. */
dc_context_t *context; dc_context_t *context;
/* Internal state. */ /* Internal state. */
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(USE_LIBUSB)
libusb_context *ctx; libusb_context *ctx;
libusb_device_handle *handle; libusb_device_handle *handle;
int interface; int interface;
unsigned char endpoint_in; unsigned char endpoint_in;
unsigned char endpoint_out; unsigned char endpoint_out;
unsigned int timeout; unsigned int timeout;
#elif defined(HAVE_HIDAPI) #elif defined(USE_HIDAPI)
hid_device *handle; hid_device *handle;
int timeout; int timeout;
#endif #endif
}; };
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(USE_LIBUSB)
static dc_status_t static dc_status_t
syserror(int errcode) syserror(int errcode)
{ {
@ -103,7 +109,7 @@ dc_usbhid_open (dc_usbhid_t **out, dc_context_t *context, unsigned int vid, unsi
// Library context. // Library context.
usbhid->context = context; usbhid->context = context;
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(USE_LIBUSB)
struct libusb_device **devices = NULL; struct libusb_device **devices = NULL;
struct libusb_config_descriptor *config = NULL; struct libusb_config_descriptor *config = NULL;
@ -235,7 +241,7 @@ dc_usbhid_open (dc_usbhid_t **out, dc_context_t *context, unsigned int vid, unsi
libusb_free_config_descriptor (config); libusb_free_config_descriptor (config);
libusb_free_device_list (devices, 1); libusb_free_device_list (devices, 1);
#elif defined(HAVE_HIDAPI) #elif defined(USE_HIDAPI)
// Initialize the hidapi library. // Initialize the hidapi library.
rc = hid_init(); rc = hid_init();
@ -260,7 +266,7 @@ dc_usbhid_open (dc_usbhid_t **out, dc_context_t *context, unsigned int vid, unsi
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(USE_LIBUSB)
error_usb_close: error_usb_close:
libusb_close (usbhid->handle); libusb_close (usbhid->handle);
error_usb_free_config: error_usb_free_config:
@ -269,7 +275,7 @@ error_usb_free_list:
libusb_free_device_list (devices, 1); libusb_free_device_list (devices, 1);
error_usb_exit: error_usb_exit:
libusb_exit (usbhid->ctx); libusb_exit (usbhid->ctx);
#elif defined(HAVE_HIDAPI) #elif defined(USE_HIDAPI)
error_hid_exit: error_hid_exit:
hid_exit (); hid_exit ();
#endif #endif
@ -290,11 +296,11 @@ dc_usbhid_close (dc_usbhid_t *usbhid)
if (usbhid == NULL) if (usbhid == NULL)
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(USE_LIBUSB)
libusb_release_interface (usbhid->handle, usbhid->interface); libusb_release_interface (usbhid->handle, usbhid->interface);
libusb_close (usbhid->handle); libusb_close (usbhid->handle);
libusb_exit (usbhid->ctx); libusb_exit (usbhid->ctx);
#elif defined(HAVE_HIDAPI) #elif defined(USE_HIDAPI)
hid_close(usbhid->handle); hid_close(usbhid->handle);
hid_exit(); hid_exit();
#endif #endif
@ -315,7 +321,7 @@ dc_usbhid_set_timeout (dc_usbhid_t *usbhid, int timeout)
INFO (usbhid->context, "Timeout: value=%i", timeout); INFO (usbhid->context, "Timeout: value=%i", timeout);
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(USE_LIBUSB)
if (timeout < 0) { if (timeout < 0) {
usbhid->timeout = 0; usbhid->timeout = 0;
} else if (timeout == 0) { } else if (timeout == 0) {
@ -323,7 +329,7 @@ dc_usbhid_set_timeout (dc_usbhid_t *usbhid, int timeout)
} else { } else {
usbhid->timeout = timeout; usbhid->timeout = timeout;
} }
#elif defined(HAVE_HIDAPI) #elif defined(USE_HIDAPI)
if (timeout < 0) { if (timeout < 0) {
usbhid->timeout = -1; usbhid->timeout = -1;
} else { } else {
@ -349,7 +355,7 @@ dc_usbhid_read (dc_usbhid_t *usbhid, void *data, size_t size, size_t *actual)
goto out_invalidargs; goto out_invalidargs;
} }
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) #if defined(USE_LIBUSB)
int rc = libusb_interrupt_transfer (usbhid->handle, usbhid->endpoint_in, data, size, &nbytes, usbhid->timeout); int rc = libusb_interrupt_transfer (usbhid->handle, usbhid->endpoint_in, data, size, &nbytes, usbhid->timeout);
if (rc != LIBUSB_SUCCESS) { if (rc != LIBUSB_SUCCESS) {
ERROR (usbhid->context, "Usb read interrupt transfer failed (%s).", ERROR (usbhid->context, "Usb read interrupt transfer failed (%s).",
@ -357,11 +363,12 @@ dc_usbhid_read (dc_usbhid_t *usbhid, void *data, size_t size, size_t *actual)
status = syserror (rc); status = syserror (rc);
goto out; goto out;
} }
#elif defined(HAVE_HIDAPI) #elif defined(USE_HIDAPI)
nbytes = hid_read_timeout(usbhid->handle, data, size, usbhid->timeout); nbytes = hid_read_timeout(usbhid->handle, data, size, usbhid->timeout);
if (nbytes < 0) { if (nbytes < 0) {
ERROR (usbhid->context, "Usb read interrupt transfer failed."); ERROR (usbhid->context, "Usb read interrupt transfer failed.");
status = DC_STATUS_IO; status = DC_STATUS_IO;
nbytes = 0;
goto out; goto out;
} }
#endif #endif
@ -391,21 +398,46 @@ dc_usbhid_write (dc_usbhid_t *usbhid, const void *data, size_t size, size_t *act
goto out_invalidargs; goto out_invalidargs;
} }
#if defined(HAVE_LIBUSB) && !defined(__APPLE__) if (size == 0) {
int rc = libusb_interrupt_transfer (usbhid->handle, usbhid->endpoint_out, (void *) data, size, &nbytes, 0); goto out;
}
#if defined(USE_LIBUSB)
const unsigned char *buffer = (const unsigned char *) data;
size_t length = size;
// Skip a report id of zero.
unsigned char report = buffer[0];
if (report == 0) {
buffer++;
length--;
}
int rc = libusb_interrupt_transfer (usbhid->handle, usbhid->endpoint_out, (void *) buffer, length, &nbytes, 0);
if (rc != LIBUSB_SUCCESS) { if (rc != LIBUSB_SUCCESS) {
ERROR (usbhid->context, "Usb write interrupt transfer failed (%s).", ERROR (usbhid->context, "Usb write interrupt transfer failed (%s).",
libusb_error_name (rc)); libusb_error_name (rc));
status = syserror (rc); status = syserror (rc);
goto out; goto out;
} }
#elif defined(HAVE_HIDAPI)
if (report == 0) {
nbytes++;
}
#elif defined(USE_HIDAPI)
nbytes = hid_write(usbhid->handle, data, size); nbytes = hid_write(usbhid->handle, data, size);
if (nbytes < 0) { if (nbytes < 0) {
ERROR (usbhid->context, "Usb write interrupt transfer failed."); ERROR (usbhid->context, "Usb write interrupt transfer failed.");
status = DC_STATUS_IO; status = DC_STATUS_IO;
nbytes = 0;
goto out; goto out;
} }
#ifdef _WIN32
if (nbytes > size) {
nbytes = size;
}
#endif
#endif #endif
out: out:

9
src/uwatec_g2.c
View File

@ -110,16 +110,17 @@ uwatec_g2_transfer (uwatec_g2_device_t *device, const unsigned char command[], u
dc_status_t status = DC_STATUS_SUCCESS; dc_status_t status = DC_STATUS_SUCCESS;
size_t transferred = 0; size_t transferred = 0;
if (csize >= PACKET_SIZE) { if (csize + 2 > PACKET_SIZE) {
ERROR (device->base.context, "command too big (%d)", csize); ERROR (device->base.context, "command too big (%d)", csize);
return DC_STATUS_INVALIDARGS; return DC_STATUS_INVALIDARGS;
} }
HEXDUMP (device->base.context, DC_LOGLEVEL_DEBUG, "cmd", command, csize); HEXDUMP (device->base.context, DC_LOGLEVEL_DEBUG, "cmd", command, csize);
buf[0] = csize; buf[0] = 0;
memcpy(buf + 1, command, csize); buf[1] = csize;
status = dc_usbhid_write (device->usbhid, buf, csize + 1, &transferred); memcpy(buf + 2, command, csize);
status = dc_usbhid_write (device->usbhid, buf, csize + 2, &transferred);
if (status != DC_STATUS_SUCCESS) { if (status != DC_STATUS_SUCCESS) {
ERROR (device->base.context, "Failed to send the command."); ERROR (device->base.context, "Failed to send the command.");
return status; return status;