#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"
#define ID_VENDOR 0x1b1f
#define ID_PRODUCT 0xc00f
+#define ID_PRODUCT_BL 0xc010
/* TODO: dynamic */
#define ASYNC_SIZE 0x0040
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)) {
+ if ((desc.idVendor == vid) && (desc.idProduct == pid)) {
libusb_device *dev = list[i];
err = libusb_open(dev, &devh);
return NULL;
}
-int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev)
+int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev, int silent)
{
int err;
int cnt;
+ unsigned char out[0x40];
- err = libusb_interrupt_transfer(usbdev->usb_devh, EP_OUT, NULL, 0, &cnt, USB_TIMEOUT);
- if (err) {
- fprintf(stderr, "Can't send data: %s\n", usb_strerror(err));
+ 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;
}
}
if (done) {
- if (!hmcfgusb_send_null_frame(usbdev)) {
+ if (!hmcfgusb_send_null_frame(usbdev, 0)) {
return 0;
}
}
msec = ((tv_end.tv_sec-tv_start.tv_sec)*1000)+((tv_end.tv_usec-tv_start.tv_usec)/1000);
if (msec > 100) {
- if (debug)
- fprintf(stderr, "usb-transfer took more than 100ms (%dms), this can lead to timing problems!\n", msec);
+ 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;
}
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: %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) {
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;
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;
}
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);
+ libusb_exit(NULL);
return NULL;
}
fprintf(stderr, "Can't get FDset from libusb!\n");
free(dev);
free(cb_data);
+ libusb_close(devh);
+ libusb_exit(NULL);
return NULL;
}
perror("Can't allocate memory for poll-fds");
free(dev);
free(cb_data);
+ libusb_close(devh);
+ libusb_exit(NULL);
return NULL;
}
{
struct timeval tv;
int usb_event = 0;
+ int timed_out = 0;
int i;
int n;
int fd_n;
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 * 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;
} 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) {
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;
projects / hmcfgusb / blobdiff