#include <sys/time.h>
#include <libusb-1.0/libusb.h>
+/* Workaround for old libusb-1.0 */
+#ifndef LIBUSB_CALL
+#define LIBUSB_CALL
+#define libusb_handle_events_timeout_completed(ctx, tv, x) libusb_handle_events_timeout(ctx, tv)
+#endif
+
#include "hexdump.h"
#include "hmcfgusb.h"
static int quit = 0;
static int debug = 0;
+static int libusb_initialized = 0;
/* Not in all libusb-1.0 versions, so we have to roll our own :-( */
static char * usb_strerror(int e)
return unknerr;
}
-static libusb_device_handle *hmcfgusb_find() {
+static libusb_device_handle *hmcfgusb_find(int vid, int pid) {
libusb_device_handle *devh = NULL;
libusb_device **list;
ssize_t cnt;
if (err)
continue;
- if ((desc.idVendor == ID_VENDOR) &&
- ((desc.idProduct == ID_PRODUCT) || (desc.idProduct == ID_PRODUCT_BL))) {
+ if ((desc.idVendor == vid) && (desc.idProduct == pid)) {
libusb_device *dev = list[i];
err = libusb_open(dev, &devh);
if (err) {
fprintf(stderr, "Can't open device: %s\n", usb_strerror(err));
+ libusb_free_device_list(list, 1);
return NULL;
}
err = libusb_detach_kernel_driver(devh, INTERFACE);
if ((err != 0) && (err != LIBUSB_ERROR_NOT_FOUND)) {
fprintf(stderr, "Can't detach kernel driver: %s\n", usb_strerror(err));
+ libusb_close(devh);
+ libusb_free_device_list(list, 1);
return NULL;
}
err = libusb_claim_interface(devh, INTERFACE);
if ((err != 0)) {
fprintf(stderr, "Can't claim interface: %s\n", usb_strerror(err));
+ libusb_close(devh);
+ libusb_free_device_list(list, 1);
return NULL;
}
+ libusb_free_device_list(list, 0);
return devh;
}
}
+ libusb_free_device_list(list, 1);
return NULL;
}
memset(out, 0, sizeof(out));
- err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, out, sizeof(out), &cnt, USB_TIMEOUT);
+ err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, out, 0, &cnt, USB_TIMEOUT);
if (err && (!silent)) {
fprintf(stderr, "Can't send null frame: %s\n", usb_strerror(err));
return 0;
return 1;
}
-static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, libusb_transfer_cb_fn cb, void *data)
+static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, libusb_transfer_cb_fn cb, void *data, int in_size)
{
unsigned char *data_buf;
struct libusb_transfer *transfer;
int err;
- data_buf = malloc(ASYNC_SIZE);
+ data_buf = malloc(in_size);
if (!data_buf) {
fprintf(stderr, "Can't allocate memory for data-buffer!\n");
return NULL;
}
libusb_fill_interrupt_transfer(transfer, devh, EP_IN,
- data_buf, ASYNC_SIZE, cb, data, USB_TIMEOUT);
+ data_buf, in_size, cb, data, USB_TIMEOUT);
- transfer->flags = LIBUSB_TRANSFER_SHORT_NOT_OK | LIBUSB_TRANSFER_FREE_BUFFER;
+ transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER;
err = libusb_submit_transfer(transfer);
if (err != 0) {
if (transfer->status != LIBUSB_TRANSFER_COMPLETED) {
if (transfer->status != LIBUSB_TRANSFER_TIMED_OUT) {
- fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
- quit = EIO;
+ if (transfer->status != LIBUSB_TRANSFER_CANCELLED)
+ fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status));
- if (cb_data && cb_data->dev && cb_data->dev->transfer) {
- libusb_free_transfer(cb_data->dev->transfer);
- cb_data->dev->transfer = NULL;
- free(cb_data);
- }
- return;
+ quit = EIO;
+ goto out;
}
} else {
if (cb_data && cb_data->cb) {
if (!cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data)) {
quit = EIO;
-
- if (cb_data && cb_data->dev && cb_data->dev->transfer) {
- libusb_free_transfer(cb_data->dev->transfer);
- cb_data->dev->transfer = NULL;
- free(cb_data);
- }
-
- return;
+ goto out;
}
} else {
hexdump(transfer->buffer, transfer->actual_length, "> ");
err = libusb_submit_transfer(transfer);
if (err != 0) {
fprintf(stderr, "Can't re-submit transfer: %s\n", usb_strerror(err));
- libusb_free_transfer(transfer);
- cb_data->dev->transfer = NULL;
+ goto out;
+ }
+
+ return;
+
+out:
+ libusb_free_transfer(transfer);
+ if (cb_data) {
+ if (cb_data->dev && cb_data->dev->transfer) {
+ cb_data->dev->transfer = NULL;
+ }
free(cb_data);
}
}
const struct libusb_pollfd **usb_pfd = NULL;
struct hmcfgusb_dev *dev = NULL;
struct hmcfgusb_cb_data *cb_data = NULL;
+ int bootloader = 0;
int err;
int i;
- err = libusb_init(NULL);
- if (err != 0) {
- fprintf(stderr, "Can't initialize libusb: %s\n", usb_strerror(err));
- return NULL;
+ if (!libusb_initialized) {
+ err = libusb_init(NULL);
+ if (err != 0) {
+ fprintf(stderr, "Can't initialize libusb: %s\n", usb_strerror(err));
+ return NULL;
+ }
}
+ libusb_initialized = 1;
- devh = hmcfgusb_find();
+ devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT);
if (!devh) {
- fprintf(stderr, "Can't find/open hmcfgusb!\n");
- return NULL;
+ devh = hmcfgusb_find(ID_VENDOR, ID_PRODUCT_BL);
+ if (!devh) {
+ fprintf(stderr, "Can't find/open hmcfgusb!\n");
+#ifdef NEED_LIBUSB_EXIT
+ hmcfgusb_exit();
+#endif
+ return NULL;
+ }
+ bootloader = 1;
}
dev = malloc(sizeof(struct hmcfgusb_dev));
if (!dev) {
perror("Can't allocate memory for hmcfgusb_dev");
+ libusb_close(devh);
+#ifdef NEED_LIBUSB_EXIT
+ hmcfgusb_exit();
+#endif
return NULL;
}
memset(dev, 0, sizeof(struct hmcfgusb_dev));
dev->usb_devh = devh;
+ dev->bootloader = bootloader;
+ dev->opened_at = time(NULL);
cb_data = malloc(sizeof(struct hmcfgusb_cb_data));
if (!cb_data) {
perror("Can't allocate memory for hmcfgusb_cb_data");
free(dev);
+ libusb_close(devh);
+#ifdef NEED_LIBUSB_EXIT
+ hmcfgusb_exit();
+#endif
return NULL;
}
cb_data->cb = cb;
cb_data->data = data;
- dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data);
+ dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data, ASYNC_SIZE);
+
if (!dev->transfer) {
fprintf(stderr, "Can't prepare async device io!\n");
free(dev);
free(cb_data);
+ libusb_close(devh);
+#ifdef NEED_LIBUSB_EXIT
+ hmcfgusb_exit();
+#endif
return NULL;
}
usb_pfd = libusb_get_pollfds(NULL);
if (!usb_pfd) {
fprintf(stderr, "Can't get FDset from libusb!\n");
+ libusb_cancel_transfer(dev->transfer);
+ libusb_handle_events(NULL);
free(dev);
free(cb_data);
+ libusb_close(devh);
+#ifdef NEED_LIBUSB_EXIT
+ hmcfgusb_exit();
+#endif
return NULL;
}
dev->pfd = malloc(dev->n_usb_pfd * sizeof(struct pollfd));
if (!dev->pfd) {
perror("Can't allocate memory for poll-fds");
+ libusb_cancel_transfer(dev->transfer);
+ libusb_handle_events(NULL);
free(dev);
free(cb_data);
+ libusb_close(devh);
+#ifdef NEED_LIBUSB_EXIT
+ hmcfgusb_exit();
+#endif
return NULL;
}
return -1;
} else if (err == 0) {
/* No pending timeout or a sane platform */
- tv.tv_sec = timeout;
} else {
if ((tv.tv_sec == 0) && (tv.tv_usec == 0)) {
usb_event = 1;
- } else if (tv.tv_sec > timeout) {
- tv.tv_sec = timeout;
- tv.tv_usec = 0;
+ } else if ((tv.tv_sec * 1000) < timeout) {
+ timeout = tv.tv_sec * 1000;
}
}
dev->pfd[i].revents = 0;
}
- n = poll(dev->pfd, dev->n_pfd, tv.tv_sec * 1000);
+ n = poll(dev->pfd, dev->n_pfd, timeout);
if (n < 0) {
perror("poll");
errno = 0;
return -1;
}
+void hmcfgusb_enter_bootloader(struct hmcfgusb_dev *dev)
+{
+ uint8_t out[ASYNC_SIZE];
+
+ if (dev->bootloader) {
+ fprintf(stderr, "request for bootloader mode, but device already in bootloader!\n");
+ return;
+ }
+
+ memset(out, 0, sizeof(out));
+ out[0] = 'B';
+ hmcfgusb_send(dev, out, sizeof(out), 1);
+
+ return;
+}
+
+void hmcfgusb_leave_bootloader(struct hmcfgusb_dev *dev)
+{
+ uint8_t out[ASYNC_SIZE];
+
+ if (!dev->bootloader) {
+ fprintf(stderr, "request for leaving bootloader mode, but device already in normal mode!\n");
+ return;
+ }
+
+ memset(out, 0, sizeof(out));
+ out[0] = 'K';
+ hmcfgusb_send(dev, out, sizeof(out), 1);
+
+ return;
+}
+
void hmcfgusb_close(struct hmcfgusb_dev *dev)
{
int err;
if (dev->transfer) {
libusb_cancel_transfer(dev->transfer);
+ libusb_handle_events(NULL);
}
err = libusb_release_interface(dev->usb_devh, INTERFACE);
}
libusb_close(dev->usb_devh);
+#ifdef NEED_LIBUSB_EXIT
+ hmcfgusb_exit();
+#endif
free(dev->pfd);
free(dev);
+}
- libusb_exit(NULL);
+void hmcfgusb_exit(void)
+{
+ if (libusb_initialized) {
+ libusb_exit(NULL);
+ libusb_initialized = 0;
+ }
}
void hmcfgusb_set_debug(int d)
projects / hmcfgusb / blobdiff