X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/e0a7146e36c5087367c9ef96a812e4fa48d98234..37c97e62a5a0ae846b3823005e08ad6b4743764e:/hmcfgusb.c diff --git a/hmcfgusb.c b/hmcfgusb.c index a73cd65..d3bec90 100644 --- a/hmcfgusb.c +++ b/hmcfgusb.c @@ -29,8 +29,15 @@ #include #include #include +#include #include +/* 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" @@ -38,6 +45,7 @@ #define ID_VENDOR 0x1b1f #define ID_PRODUCT 0xc00f +#define ID_PRODUCT_BL 0xc010 /* TODO: dynamic */ #define ASYNC_SIZE 0x0040 @@ -49,7 +57,7 @@ #define INTERFACE 0 static int quit = 0; -static int debug = 1; +static int debug = 0; /* Not in all libusb-1.0 versions, so we have to roll our own :-( */ static char * usb_strerror(int e) @@ -110,7 +118,8 @@ static libusb_device_handle *hmcfgusb_find() { if (err) continue; - if ((desc.idVendor == ID_VENDOR) && (desc.idProduct == ID_PRODUCT)) { + if ((desc.idVendor == ID_VENDOR) && + ((desc.idProduct == ID_PRODUCT) || (desc.idProduct == ID_PRODUCT_BL))) { libusb_device *dev = list[i]; err = libusb_open(dev, &devh); @@ -139,13 +148,36 @@ static libusb_device_handle *hmcfgusb_find() { return NULL; } +int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev, int silent) +{ + int err; + int cnt; + unsigned char out[0x40]; + + memset(out, 0, sizeof(out)); + + 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; +} + int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len, int done) { int err; int cnt; + struct timeval tv_start, tv_end; + int msec; + + if (debug) { + hexdump(send_data, len, "USB < "); + } + + gettimeofday(&tv_start, NULL); - if (debug) - hexdump(send_data, len, "< "); err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, send_data, len, &cnt, USB_TIMEOUT); if (err) { fprintf(stderr, "Can't send data: %s\n", usb_strerror(err)); @@ -153,13 +185,20 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len } if (done) { - err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, send_data, 0, &cnt, USB_TIMEOUT); - if (err) { - fprintf(stderr, "Can't send data: %s\n", usb_strerror(err)); + if (!hmcfgusb_send_null_frame(usbdev, 0)) { return 0; } } + gettimeofday(&tv_end, NULL); + msec = ((tv_end.tv_sec-tv_start.tv_sec)*1000)+((tv_end.tv_usec-tv_start.tv_usec)/1000); + + if (msec > 100) { + fprintf(stderr, "usb-transfer took more than 100ms (%dms), this may lead to timing problems!\n", msec); + } else if (debug) { + fprintf(stderr, "usb-transfer took %dms!\n", msec); + } + return 1; } @@ -191,7 +230,6 @@ static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, if (err != 0) { fprintf(stderr, "Can't submit transfer: %s\n", usb_strerror(err)); libusb_free_transfer(transfer); - free(data_buf); return NULL; } @@ -213,20 +251,32 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer) if (transfer->status != LIBUSB_TRANSFER_COMPLETED) { if (transfer->status != LIBUSB_TRANSFER_TIMED_OUT) { - fprintf(stderr, "Interrupt transfer not completed: %d!\n", transfer->status); + fprintf(stderr, "Interrupt transfer not completed: %s!\n", usb_strerror(transfer->status)); 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; } } else { if (cb_data && cb_data->cb) { if (debug) - hexdump(transfer->buffer, transfer->actual_length, "> "); - cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data); + hexdump(transfer->buffer, transfer->actual_length, "USB > "); + + 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; + } } else { hexdump(transfer->buffer, transfer->actual_length, "> "); } @@ -235,8 +285,9 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer) err = libusb_submit_transfer(transfer); if (err != 0) { fprintf(stderr, "Can't re-submit transfer: %s\n", usb_strerror(err)); - free(transfer->buffer); libusb_free_transfer(transfer); + cb_data->dev->transfer = NULL; + free(cb_data); } } @@ -273,6 +324,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data) cb_data = malloc(sizeof(struct hmcfgusb_cb_data)); if (!cb_data) { perror("Can't allocate memory for hmcfgusb_cb_data"); + free(dev); return NULL; } @@ -285,6 +337,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data) dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data); if (!dev->transfer) { fprintf(stderr, "Can't prepare async device io!\n"); + free(dev); + free(cb_data); return NULL; } @@ -292,6 +346,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data) if (!usb_pfd) { fprintf(stderr, "Can't get FDset from libusb!\n"); free(dev); + free(cb_data); return NULL; } @@ -302,6 +357,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data) dev->pfd = malloc(dev->n_usb_pfd * sizeof(struct pollfd)); if (!dev->pfd) { perror("Can't allocate memory for poll-fds"); + free(dev); + free(cb_data); return NULL; } @@ -317,6 +374,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data) dev->n_pfd = dev->n_usb_pfd; + quit = 0; + return dev; } @@ -340,6 +399,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout) { struct timeval tv; int usb_event = 0; + int timed_out = 0; int i; int n; int fd_n; @@ -359,6 +419,9 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int 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; } } @@ -370,9 +433,11 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout) n = poll(dev->pfd, dev->n_pfd, tv.tv_sec * 1000); if (n < 0) { perror("poll"); + errno = 0; return -1; } else if (n == 0) { usb_event = 1; + timed_out = 1; } else { for (fd_n = 0; fd_n < dev->n_pfd; fd_n++) { if (dev->pfd[fd_n].revents) { @@ -380,6 +445,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout) usb_event = 1; break; } else { + errno = 0; return dev->pfd[fd_n].fd; } } @@ -397,8 +463,14 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout) } } - if (quit) + errno = 0; + if (quit) { + fprintf(stderr, "closing device-connection due to error %d\n", quit); errno = quit; + } + + if (timed_out) + errno = ETIMEDOUT; return -1; } @@ -422,3 +494,8 @@ void hmcfgusb_close(struct hmcfgusb_dev *dev) libusb_exit(NULL); } + +void hmcfgusb_set_debug(int d) +{ + debug = d; +}