X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/f92c0fbce992d7d2c975bf8072a0cb6558ff97f7..0a2341bb36399a74ee540d75de1e63e1b4960f99:/xpcu.c diff --git a/xpcu.c b/xpcu.c index f92173a..93d0424 100644 --- a/xpcu.c +++ b/xpcu.c @@ -5,19 +5,31 @@ #include #include #include +#include #include "usb-driver.h" #include "xpcu.h" +struct xpcu_s { + struct usb_device *dev; + usb_dev_handle *handle; + int interface; + int alternate; + unsigned long card_type; + pthread_mutex_t interrupt; +}; + 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 xpcu_deviceinfo(struct usb_get_device_data *ugdd) { + struct xpcu_s *xpcu = (struct xpcu_s*)ugdd->dwUniqueID; int i,j,k,l; int len = 0; unsigned char *buf = NULL; WDU_CONFIGURATION **pConfigs, **pActiveConfig; WDU_INTERFACE **pActiveInterface; - if (ugdd->dwUniqueID != (unsigned long)xpcu) + if (!xpcu) return -ENODEV; if (ugdd->dwBytes) @@ -174,7 +186,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) { @@ -210,10 +224,11 @@ static int xpcu_claim(struct xpcu_s *xpcu, int claim) { return ret; } -int xpcu_transfer(struct xpcu_s *xpcu, struct usb_transfer *ut) { +int xpcu_transfer(struct usb_transfer *ut) { + struct xpcu_s *xpcu = (struct xpcu_s*)ut->dwUniqueID; int ret = 0; - if (ut->dwUniqueID != (unsigned long)xpcu) + if (!xpcu) return -ENODEV; xpcu_claim(xpcu, XPCU_CLAIM); @@ -225,7 +240,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 +261,11 @@ 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) { - if (usi->dwUniqueID != (unsigned long)xpcu) - return; +int xpcu_set_interface(struct usb_set_interface *usi) { + struct xpcu_s *xpcu = (struct xpcu_s*)usi->dwUniqueID; + + if (!xpcu) + return -ENODEV; if (xpcu->dev) { if (!xpcu->handle) { @@ -264,6 +281,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) { @@ -275,20 +294,18 @@ static void xpcu_init(void) { usb_find_devices(); busses = usb_get_busses(); + + pthread_mutex_init(&dummy_interrupt, NULL); } -struct xpcu_s *xpcu_find(struct event *e) { - static struct xpcu_s xpcu; +int xpcu_find(struct event *e) { + struct xpcu_s *xpcu = NULL; char* devpos; struct usb_bus *bus; int busnum = -1, devnum = -1; int i; - bzero(&xpcu, sizeof(xpcu)); - xpcu.interface = -1; - xpcu.alternate = -1; - xpcu_init(); devpos = getenv("XILINX_USB_DEV"); @@ -363,8 +380,18 @@ 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.dev = dev; - xpcu.card_type = e->dwCardType; + + xpcu = malloc(sizeof(struct xpcu_s)); + if (!xpcu) + return -ENOMEM; + + bzero(xpcu, sizeof(struct xpcu_s)); + 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,14 +400,15 @@ struct xpcu_s *xpcu_find(struct event *e) { } } - if (!xpcu.dev) - return NULL; + e->handle = (unsigned long)xpcu; - return &xpcu; + return 0; } -void xpcu_found(struct xpcu_s *xpcu, struct event *e) { - if (e->handle && e->handle == (unsigned long)xpcu && xpcu->dev) { +int xpcu_found(struct event *e) { + struct xpcu_s *xpcu = (struct xpcu_s*)e->handle; + + if (xpcu && xpcu->dev) { struct usb_interface *interface = xpcu->dev->config->interface; e->dwCardType = xpcu->card_type; @@ -395,11 +423,15 @@ 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) { - if (e->handle != (unsigned long)xpcu) - return; +int xpcu_close(struct event *e) { + struct xpcu_s *xpcu = (struct xpcu_s*)e->handle; + + if (!xpcu) + return -ENODEV; if(xpcu) { if (xpcu->handle) { @@ -407,9 +439,51 @@ void xpcu_close(struct xpcu_s *xpcu, struct event *e) { usb_close(xpcu->handle); } - xpcu->handle = NULL; - xpcu->interface = -1; - xpcu->alternate = -1; busses = NULL; + free(xpcu); + } + + return 0; +} + +int xpcu_int_state(struct interrupt *it, int enable) { + struct xpcu_s *xpcu = (struct xpcu_s*)it->hInterrupt; + pthread_mutex_t *interrupt = &dummy_interrupt; + + 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 interrupt *it) { + struct xpcu_s *xpcu = (struct xpcu_s*)it->hInterrupt; + + 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; }