X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/1e79d00a9f4c2f059c8bd2dc22e601c4ed4065d6..cda220240e89e21e8b7dd76ab6b6a56000ce20e6:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 0857a4b..c90410a 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -32,6 +32,12 @@
 #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"
 
@@ -92,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;
@@ -112,8 +118,7 @@ static libusb_device_handle *hmcfgusb_find() {
 		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);
@@ -150,7 +155,7 @@ int hmcfgusb_send_null_frame(struct hmcfgusb_dev *usbdev, int silent)
 
 	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;
@@ -196,13 +201,13 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
 	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;
@@ -216,9 +221,9 @@ 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;
+	transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER;
 
 	err = libusb_submit_transfer(transfer);
 	if (err != 0) {
@@ -291,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;
 
@@ -300,25 +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;
 	}
 
@@ -328,11 +345,14 @@ 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);
+	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;
 	}
 
@@ -341,6 +361,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 		fprintf(stderr, "Can't get FDset from libusb!\n");
 		free(dev);
 		free(cb_data);
+		libusb_close(devh);
+		libusb_exit(NULL);
 		return NULL;
 	}
 
@@ -353,6 +375,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 		perror("Can't allocate memory for poll-fds");
 		free(dev);
 		free(cb_data);
+		libusb_close(devh);
+		libusb_exit(NULL);
 		return NULL;
 	}
 
@@ -469,6 +493,38 @@ int hmcfgusb_poll(struct hmcfgusb_dev *dev, int timeout)
 	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;