X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/813afd1296fd1ead02d4292705831e10dd3fcf5d..d57fdaf62fa1ce7e8573404206903ad281ff889c:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index 955a65b..1a6bb76 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -49,6 +49,7 @@
 #define INTERFACE	0
 
 static int quit = 0;
+static int debug = 0;
 
 /* Not in all libusb-1.0 versions, so we have to roll our own :-( */
 static char * usb_strerror(int e)
@@ -142,13 +143,12 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
 {
 	int err;
 	int cnt;
-	int ret;
 
+	if (debug)
+		hexdump(send_data, len, "USB < ");
 	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));
-		if (err == LIBUSB_ERROR_NO_DEVICE)
-			exit(EXIT_FAILURE);
 		return 0;
 	}
 
@@ -156,13 +156,11 @@ int hmcfgusb_send(struct hmcfgusb_dev *usbdev, unsigned char* send_data, int len
 		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 (err == LIBUSB_ERROR_NO_DEVICE)
-				exit(EXIT_FAILURE);
 			return 0;
 		}
 	}
 
-	return ret;
+	return 1;
 }
 
 static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh, libusb_transfer_cb_fn cb, void *data)
@@ -226,9 +224,11 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 		}
 	} else {
 		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);
 		} else {
-			hexdump(transfer->buffer, transfer->actual_length, "RECV> ");
+			hexdump(transfer->buffer, transfer->actual_length, "> ");
 		}
 	}
 
@@ -317,6 +317,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 
 	dev->n_pfd = dev->n_usb_pfd;
 
+	quit = 0;
+
 	return dev;
 }
 
@@ -370,6 +372,7 @@ 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;
@@ -380,6 +383,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 +401,11 @@ 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;
+	}
 
 	return -1;
 }
@@ -417,7 +424,13 @@ void hmcfgusb_close(struct hmcfgusb_dev *dev)
 	}
 
 	libusb_close(dev->usb_devh);
+	free(dev->pfd);
 	free(dev);
 
 	libusb_exit(NULL);
 }
+
+void hmcfgusb_set_debug(int d)
+{
+	debug = d;
+}