X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/f1405f13797febaa06b86a5c800dce2fcaada45f..11d017427f819fca78cf397629c0b5dc7fbbfe1f:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 0bf6e81..f5df845 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -36,16 +36,18 @@
 #include <usb.h>
 #include <signal.h>
 #include <pthread.h>
+#include <errno.h>
+#include <inttypes.h>
 #include "usb-driver.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
-static int windrvrfd = 0;
-FILE *modulesfp;
+static int windrvrfd = -1;
+FILE *modulesfp = NULL;
 static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static usb_dev_handle *usb_devhandle = NULL;
-static unsigned long card_type;
+static uint32_t card_type;
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
@@ -330,6 +332,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 				it->dwLost, it->fStopped);
 
 				it->fEnableOk = 1;
+				it->fStopped = 0;
 				ints_enabled = 1;
 				pthread_mutex_trylock(&int_wait);
 			}
@@ -351,7 +354,8 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 				it->dwCounter = 0;
 				it->fStopped = 1;
 				ints_enabled = 0;
-				pthread_mutex_unlock(&int_wait);
+				if (pthread_mutex_trylock(&int_wait) == EBUSY)
+					pthread_mutex_unlock(&int_wait);
 #endif
 				DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
 				it->hInterrupt, it->dwOptions,
@@ -707,9 +711,9 @@ int close(int fd) {
 	if (!func)
 		func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
 	
-	if (fd == windrvrfd) {
+	if (fd == windrvrfd && windrvrfd >= 0) {
 		DPRINTF("close windrvrfd\n");
-		windrvrfd = 0;
+		windrvrfd = -1;
 	}
 
 	return (*func) (fd);