X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/f92c0fbce992d7d2c975bf8072a0cb6558ff97f7..8af4d9103d2006a929cf9048835a4dcfcf6e344d:/xpcu.c

diff --git a/xpcu.c b/xpcu.c
index f92173a..719829b 100644
--- a/xpcu.c
+++ b/xpcu.c
@@ -5,10 +5,12 @@
 #include <strings.h>
 #include <usb.h>
 #include <errno.h>
+#include <pthread.h>
 #include "usb-driver.h"
 #include "xpcu.h"
 
 static struct usb_bus *busses = NULL;
+static pthread_mutex_t dummy_interrupt = PTHREAD_MUTEX_INITIALIZER;
 
 int xpcu_deviceinfo(struct xpcu_s *xpcu, struct usb_get_device_data *ugdd) {
 	int i,j,k,l;
@@ -19,6 +21,9 @@ int xpcu_deviceinfo(struct xpcu_s *xpcu, struct usb_get_device_data *ugdd) {
 
 	if (ugdd->dwUniqueID != (unsigned long)xpcu)
 		return -ENODEV;
+	
+	if (!xpcu)
+		return -ENODEV;
 
 	if (ugdd->dwBytes)
 		buf = ugdd->pBuf;
@@ -174,7 +179,9 @@ int xpcu_deviceinfo(struct xpcu_s *xpcu, struct usb_get_device_data *ugdd) {
 		}
 	}
 
-	return len;
+	ugdd->dwBytes = len;
+
+	return 0;
 }
 
 static int xpcu_claim(struct xpcu_s *xpcu, int claim) {
@@ -215,6 +222,9 @@ int xpcu_transfer(struct xpcu_s *xpcu, struct usb_transfer *ut) {
 
 	if (ut->dwUniqueID != (unsigned long)xpcu)
 		return -ENODEV;
+	
+	if (!xpcu)
+		return -ENODEV;
 
 	xpcu_claim(xpcu, XPCU_CLAIM);
 	/* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */
@@ -225,7 +235,7 @@ int xpcu_transfer(struct xpcu_s *xpcu, struct usb_transfer *ut) {
 		value = ut->SetupPacket[2] | (ut->SetupPacket[3] << 8);
 		index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8);
 		size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 8);
-		DPRINTF("requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
+		DPRINTF("-> requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
 		ret = usb_control_msg(xpcu->handle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
 	} else {
 		if (ut->fRead) {
@@ -246,9 +256,12 @@ int xpcu_transfer(struct xpcu_s *xpcu, struct usb_transfer *ut) {
 	return ret;
 }
 
-void xpcu_set_interface(struct xpcu_s *xpcu, struct usb_set_interface *usi) {
+int xpcu_set_interface(struct xpcu_s *xpcu, struct usb_set_interface *usi) {
 	if (usi->dwUniqueID != (unsigned long)xpcu)
-		return;
+		return -ENODEV;
+	
+	if (!xpcu)
+		return -ENODEV;
 
 	if (xpcu->dev) {
 		if (!xpcu->handle) {
@@ -264,6 +277,8 @@ void xpcu_set_interface(struct xpcu_s *xpcu, struct usb_set_interface *usi) {
 		xpcu->interface = xpcu->dev->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
 		xpcu->alternate = usi->dwAlternateSetting;
 	}
+
+	return 0;
 }
 
 static void xpcu_init(void) {
@@ -286,9 +301,6 @@ struct xpcu_s *xpcu_find(struct event *e) {
 	int i;
 
 	bzero(&xpcu, sizeof(xpcu));
-	xpcu.interface = -1;
-	xpcu.alternate = -1;
-
 	xpcu_init();
 
 	devpos = getenv("XILINX_USB_DEV");
@@ -363,8 +375,13 @@ struct xpcu_s *xpcu_find(struct event *e) {
 									(interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
 								/* TODO: check interfaceClass! */
 								DPRINTF("found device with libusb\n");
+
+								xpcu.interface = -1;
+								xpcu.alternate = -1;
 								xpcu.dev = dev;
 								xpcu.card_type = e->dwCardType;
+								pthread_mutex_init(&xpcu.interrupt, NULL);
+								e->handle = (unsigned long)&xpcu;
 							}
 						}
 					}
@@ -373,13 +390,15 @@ struct xpcu_s *xpcu_find(struct event *e) {
 		}
 	}
 
-	if (!xpcu.dev)
+	if (!xpcu.dev) {
+		e->handle = 0;
 		return NULL;
+	}
 
 	return &xpcu;
 }
 
-void xpcu_found(struct xpcu_s *xpcu, struct event *e) {
+int xpcu_found(struct xpcu_s *xpcu, struct event *e) {
 	if (e->handle && e->handle == (unsigned long)xpcu && xpcu->dev) {
 		struct usb_interface *interface = xpcu->dev->config->interface;
 
@@ -395,11 +414,16 @@ void xpcu_found(struct xpcu_s *xpcu, struct event *e) {
 		e->matchTables[0].bInterfaceSubClass = interface->altsetting[0].bInterfaceSubClass;
 		e->matchTables[0].bInterfaceProtocol = interface->altsetting[0].bInterfaceProtocol;
 	}
+
+	return 0;
 }
 
-void xpcu_close(struct xpcu_s *xpcu, struct event *e) {
+int xpcu_close(struct xpcu_s *xpcu, struct event *e) {
 	if (e->handle != (unsigned long)xpcu)
-		return;
+		return -ENODEV;
+	
+	if (!xpcu)
+		return -ENODEV;
 
 	if(xpcu) {
 		if (xpcu->handle) {
@@ -412,4 +436,48 @@ void xpcu_close(struct xpcu_s *xpcu, struct event *e) {
 		xpcu->alternate = -1;
 		busses = NULL;
 	}
+
+	return 0;
+}
+
+int xpcu_int_state(struct xpcu_s *xpcu, struct interrupt *it, int enable) {
+	static pthread_mutex_t *interrupt = &dummy_interrupt;
+
+	if (it->hInterrupt != (unsigned long)xpcu)
+		return -ENODEV;
+	
+	if (xpcu)
+		interrupt = &xpcu->interrupt;
+	
+	if (enable == ENABLE_INTERRUPT) {
+		it->fEnableOk = 1;
+		it->fStopped = 0;
+		pthread_mutex_trylock(interrupt);
+	} else {
+		it->dwCounter = 0;
+		it->fStopped = 1;
+		if (pthread_mutex_trylock(interrupt) == EBUSY)
+			pthread_mutex_unlock(interrupt);
+	}
+
+	return 0;
+}
+
+int xpcu_int_wait(struct xpcu_s *xpcu, struct interrupt *it) {
+	if (it->hInterrupt != (unsigned long)xpcu)
+		return -ENODEV;
+	
+	if (xpcu) {
+		if (it->dwCounter == 0) {
+			it->dwCounter = 1;
+		} else {
+			pthread_mutex_lock(&xpcu->interrupt);
+			pthread_mutex_unlock(&xpcu->interrupt);
+		}
+	} else {
+		pthread_mutex_lock(&dummy_interrupt);
+		pthread_mutex_unlock(&dummy_interrupt);
+	}
+
+	return 0;
 }