X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/f77690c303b7bd05a04603e6383613020cfe1ce6..6c5c2df75ff018417dd6abb38196d998d5fa5b10:/hmcfgusb.c diff --git a/hmcfgusb.c b/hmcfgusb.c index 9f02480..90d741f 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 @@ -90,7 +98,7 @@ 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; @@ -110,7 +118,7 @@ static libusb_device_handle *hmcfgusb_find() { if (err) continue; - if ((desc.idVendor == ID_VENDOR) && (desc.idProduct == ID_PRODUCT)) { + if ((desc.idVendor == vid) && (desc.idProduct == pid)) { libusb_device *dev = list[i]; err = libusb_open(dev, &devh); @@ -139,13 +147,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) + if (debug) { hexdump(send_data, len, "USB < "); + } + + gettimeofday(&tv_start, NULL); + 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,23 +184,30 @@ 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; } -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; @@ -183,7 +221,7 @@ static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, } 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; @@ -212,12 +250,13 @@ 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; } @@ -225,7 +264,18 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer) if (cb_data && cb_data->cb) { if (debug) hexdump(transfer->buffer, transfer->actual_length, "USB > "); - cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data); + + 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,6 +285,8 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_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; + free(cb_data); } } @@ -244,6 +296,7 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *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; @@ -253,24 +306,36 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data) return NULL; } - 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"); + libusb_exit(NULL); + return NULL; + } + bootloader = 1; } dev = malloc(sizeof(struct hmcfgusb_dev)); if (!dev) { perror("Can't allocate memory for hmcfgusb_dev"); + libusb_close(devh); + libusb_exit(NULL); 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); + libusb_exit(NULL); return NULL; } @@ -280,9 +345,18 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data) cb_data->cb = cb; cb_data->data = data; - dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data); + /* Bootloader can only say ack/nack/done */ + if (dev->bootloader) + dev->transfer = hmcfgusb_prepare_int(devh, hmcfgusb_interrupt, cb_data, 1); + else + 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); + libusb_exit(NULL); return NULL; } @@ -290,6 +364,9 @@ 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); + libusb_close(devh); + libusb_exit(NULL); return NULL; } @@ -300,6 +377,10 @@ 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); + libusb_close(devh); + libusb_exit(NULL); return NULL; } @@ -340,6 +421,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 +441,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; } } @@ -374,6 +459,7 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout) 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) { @@ -405,9 +491,44 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout) errno = quit; } + if (timed_out) + errno = ETIMEDOUT; + 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;