#include <stdio.h>
#include <usb.h>
#include <signal.h>
-#include <pthread.h>
#include <errno.h>
#include <inttypes.h>
#include <sys/ioctl.h>
static FILE *baseaddrfp = NULL;
static int baseaddrnum = 0;
static int modules_read = 0;
-static unsigned long card_type;
-static int ints_enabled = 0;
-static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
#define NO_WINDRVR 1
{
struct card_register* cr = (struct card_register*)(wdheader->data);
- DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+ DPRINTF("-> Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
cr->Card.dwItems,
(unsigned long)cr->Card.Item[0].I.IO.dwAddr,
cr->Card.Item[0].I.IO.dwBytes,
cr->Card.Item[0].I.IO.dwBar);
- DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+ DPRINTF("-> Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
cr->Card.dwItems,
(unsigned long)cr->Card.Item[1].I.IO.dwAddr,
cr->Card.Item[1].I.IO.dwBytes,
cr->hCard = 0;
}
#endif
- DPRINTF("hCard: %lu\n", cr->hCard);
+ DPRINTF("<-hCard: %lu\n", cr->hCard);
}
break;
case USB_TRANSFER:
- DPRINTF("in USB_TRANSFER");
+ DPRINTF("USB_TRANSFER\n");
{
struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
#ifdef DEBUG
- DPRINTF(" unique: %lu, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n",
+ DPRINTF("-> unique: 0x%lx, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n",
ut->dwUniqueID, ut->dwPipeNum, ut->fRead,
ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
if (ut->dwPipeNum == 0) {
- DPRINTF("setup packet: ");
+ DPRINTF("-> setup packet: ");
hexdump(ut->SetupPacket, 8);
}
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- xpcu_transfer(xpcu, ut);
+ ret = xpcu_transfer(xpcu, ut);
#endif
#ifdef DEBUG
DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
if (ut->fRead && ut->dwBytesTransferred)
{
- DPRINTF("Read: ");
+ DPRINTF("<- Read: ");
hexdump(ut->pBuffer, ut->dwBytesTransferred);
}
#endif
{
struct interrupt *it = (struct interrupt*)(wdheader->data);
- DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+ DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
it->hInterrupt, it->dwOptions,
it->dwCmds, it->fEnableOk, it->dwCounter,
it->dwLost, it->fStopped);
- it->fEnableOk = 1;
- it->fStopped = 0;
- ints_enabled = 1;
- pthread_mutex_trylock(&int_wait);
+#ifndef NO_WINDRVR
+ ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+ ret = xpcu_int_state(xpcu, it, ENABLE_INTERRUPT);
+#endif
+
+ DPRINTF("<- Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+ it->hInterrupt, it->dwOptions,
+ it->dwCmds, it->fEnableOk, it->dwCounter,
+ it->dwLost, it->fStopped);
}
break;
{
struct interrupt *it = (struct interrupt*)(wdheader->data);
- DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+ DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
it->hInterrupt, it->dwOptions,
it->dwCmds, it->fEnableOk, it->dwCounter,
it->dwLost, it->fStopped);
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- it->dwCounter = 0;
- it->fStopped = 1;
- ints_enabled = 0;
- if (pthread_mutex_trylock(&int_wait) == EBUSY)
- pthread_mutex_unlock(&int_wait);
+ ret = xpcu_int_state(xpcu, it, DISABLE_INTERRUPT);
#endif
- DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+ DPRINTF("<- Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
it->hInterrupt, it->dwOptions,
it->dwCmds, it->fEnableOk, it->dwCounter,
it->dwLost, it->fStopped);
{
struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
- DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
+ DPRINTF("-> unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
usi->dwUniqueID, usi->dwInterfaceNum,
usi->dwAlternateSetting, usi->dwOptions);
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- if (xpcu->dev) {
- if (!xpcu->handle) {
- xpcu->handle = usb_open(xpcu->dev);
-#ifndef NO_USB_RESET
- if (xpcu->handle) {
- usb_reset(xpcu->handle);
- xpcu->handle = usb_open(xpcu->dev);
- }
-#endif
- }
-
- xpcu->interface = xpcu->dev->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
- xpcu->alternate = usi->dwAlternateSetting;
- }
+ ret = xpcu_set_interface(xpcu, usi);
#endif
- DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
+ DPRINTF("<- unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
usi->dwUniqueID, usi->dwInterfaceNum,
usi->dwAlternateSetting, usi->dwOptions);
}
DPRINTF("USB_GET_DEVICE_DATA\n");
{
struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
- int pSize;
- DPRINTF("unique: %lu, bytes: %lu, options: %lx\n",
+ DPRINTF("-> unique: 0x%lx, bytes: %lu, options: %lx\n",
ugdd->dwUniqueID, ugdd->dwBytes,
ugdd->dwOptions);
- pSize = ugdd->dwBytes;
- if (!ugdd->dwBytes) {
- if (xpcu->dev) {
- ugdd->dwBytes = xpcu_deviceinfo(xpcu, NULL);
- }
- } else {
- xpcu_deviceinfo(xpcu, (unsigned char*)ugdd->pBuf);
- }
+ ret = xpcu_deviceinfo(xpcu, ugdd);
+
}
break;
DPRINTF("EVENT_REGISTER\n");
{
struct event *e = (struct event*)(wdheader->data);
- struct usb_bus *bus;
- char* devpos;
- int busnum = -1, devnum = -1;
+#ifdef DEBUG
int i;
+#endif
- DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n",
+ DPRINTF("-> handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
e->handle, e->dwAction,
e->dwStatus, e->dwEventId, e->dwCardType,
e->hKernelPlugIn, e->dwOptions,
e->u.Usb.dwUniqueID, e->dwEventVer,
e->dwNumMatchTables);
- devpos = getenv("XILINX_USB_DEV");
- if (devpos != NULL) {
- int j;
- char *devstr = NULL, *remainder;
-
- DPRINTF("XILINX_USB_DEV=%s\n", devpos);
-
- for (j = 0; j < strlen(devpos) && devpos[j] != 0; j++) {
- if (devpos[j] == ':') {
- devpos[j] = 0;
- devstr = &(devpos[j+1]);
- }
- }
-
- if (devstr && strlen(devstr) > 0) {
- busnum = strtol(devpos, &remainder, 10);
- if (devpos == remainder) {
- busnum = -1;
- } else {
- devnum = strtol(devstr, &remainder, 10);
- if (devstr == remainder) {
- busnum = -1;
- devnum = -1;
- } else {
- fprintf(stderr,"Using XILINX platform cable USB at %03d:%03d\n",
- busnum, devnum);
- }
- }
- }
- }
-
- for (i = 0; i < e->dwNumMatchTables; i++) {
-
- DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
- e->matchTables[i].VendorId,
- e->matchTables[i].ProductId,
- e->matchTables[i].bDeviceClass,
- e->matchTables[i].bDeviceSubClass,
- e->matchTables[i].bInterfaceClass,
- e->matchTables[i].bInterfaceSubClass,
- e->matchTables[i].bInterfaceProtocol);
-
- for (bus = xpcu->busses; bus; bus = bus->next) {
- struct usb_device *dev;
-
- if ((devnum != -1) && (strtol(bus->dirname, NULL, 10) != busnum))
- continue;
-
- for (dev = bus->devices; dev; dev = dev->next) {
- struct usb_device_descriptor *desc = &(dev->descriptor);
-
- if((desc->idVendor == e->matchTables[i].VendorId) &&
- (desc->idProduct == e->matchTables[i].ProductId) &&
- (desc->bDeviceClass == e->matchTables[i].bDeviceClass) &&
- (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass) &&
- ((devnum == -1) || (strtol(dev->filename, NULL, 10) == devnum)) ) {
- int ac;
- for (ac = 0; ac < desc->bNumConfigurations; ac++) {
- struct usb_interface *interface = dev->config[ac].interface;
- int ai;
-
- for (ai = 0; ai < interface->num_altsetting; ai++) {
-
- DPRINTF("intclass: %x, intsubclass: %x, intproto: %x\n",
- interface->altsetting[i].bInterfaceClass,
- interface->altsetting[i].bInterfaceSubClass,
- interface->altsetting[i].bInterfaceProtocol);
-
- if ((interface->altsetting[ai].bInterfaceSubClass == e->matchTables[i].bInterfaceSubClass) &&
- (interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
- /* TODO: check interfaceClass! */
- DPRINTF("found device with libusb\n");
- xpcu->dev = dev;
- card_type = e->dwCardType;
- }
- }
- }
- }
- }
- }
- }
-
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- e->handle++;
+ xpcu = xpcu_find(e);
#endif
#ifdef DEBUG
- DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n",
+ DPRINTF("<- handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
e->handle, e->dwAction,
e->dwStatus, e->dwEventId, e->dwCardType,
e->hKernelPlugIn, e->dwOptions,
break;
case EVENT_UNREGISTER:
- DPRINTF("EVENT_UNREGISTER\n");
+ {
+ struct event *e = (struct event*)(wdheader->data);
+
+ DPRINTF("EVENT_UNREGISTER\n");
#ifndef NO_WINDRVR
- ret = (*ioctl_func) (fd, request, wdioctl);
+ ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+ ret = xpcu_close(xpcu, e);
#endif
+ }
break;
case INT_WAIT:
{
struct interrupt *it = (struct interrupt*)(wdheader->data);
- DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+ DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
it->hInterrupt, it->dwOptions,
it->dwCmds, it->fEnableOk, it->dwCounter,
it->dwLost, it->fStopped);
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- if (xpcu->dev) {
- if (it->dwCounter == 0) {
- it->dwCounter = 1;
- } else {
- pthread_mutex_lock(&int_wait);
- pthread_mutex_unlock(&int_wait);
- }
- } else {
- pthread_mutex_lock(&int_wait);
- pthread_mutex_unlock(&int_wait);
- }
+ ret = xpcu_int_wait(xpcu, it);
#endif
- DPRINTF("INT_WAIT_RETURN: Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+ DPRINTF("<- INT_WAIT_RETURN: Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
it->hInterrupt, it->dwOptions, it->dwCmds,
it->fEnableOk, it->dwCounter, it->dwLost,
it->fStopped);
{
struct card_register* cr = (struct card_register*)(wdheader->data);
- DPRINTF("Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+ DPRINTF("-> Addr: 0x%lx, bytes: %lu, bar: %lu\n",
(unsigned long)cr->Card.Item[0].I.IO.dwAddr,
cr->Card.Item[0].I.IO.dwBytes,
cr->Card.Item[0].I.IO.dwBar);
- DPRINTF("hCard: %lu\n", cr->hCard);
+ DPRINTF("-> hCard: %lu\n", cr->hCard);
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#ifdef DEBUG
int i;
- DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n",
+ DPRINTF("-> handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
e->handle, e->dwAction, e->dwStatus,
e->dwEventId, e->dwCardType, e->hKernelPlugIn,
e->dwOptions, e->u.Usb.deviceId.dwVendorId,
e->dwNumMatchTables);
for (i = 0; i < e->dwNumMatchTables; i++)
- DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
+ DPRINTF("-> match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
e->matchTables[i].VendorId,
e->matchTables[i].ProductId,
e->matchTables[i].bDeviceClass,
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- if (xpcu->dev) {
- struct usb_interface *interface = xpcu->dev->config->interface;
-
- e->dwCardType = card_type;
- e->dwAction = 1;
- e->dwEventId = 109;
- e->u.Usb.dwUniqueID = 110;
- e->matchTables[0].VendorId = xpcu->dev->descriptor.idVendor;
- e->matchTables[0].ProductId = xpcu->dev->descriptor.idProduct;
- e->matchTables[0].bDeviceClass = xpcu->dev->descriptor.bDeviceClass;
- e->matchTables[0].bDeviceSubClass = xpcu->dev->descriptor.bDeviceSubClass;
- e->matchTables[0].bInterfaceClass = interface->altsetting[0].bInterfaceClass;
- e->matchTables[0].bInterfaceSubClass = interface->altsetting[0].bInterfaceSubClass;
- e->matchTables[0].bInterfaceProtocol = interface->altsetting[0].bInterfaceProtocol;
- }
+ ret = xpcu_found(xpcu, e);
#endif
#ifdef DEBUG
- DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n",
+ DPRINTF("<- handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
e->handle, e->dwAction, e->dwStatus,
e->dwEventId, e->dwCardType, e->hKernelPlugIn,
e->dwOptions, e->u.Usb.deviceId.dwVendorId,
e->dwNumMatchTables);
for (i = 0; i < e->dwNumMatchTables; i++)
- DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
+ DPRINTF("<- match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
e->matchTables[i].VendorId,
e->matchTables[i].ProductId,
e->matchTables[i].bDeviceClass,
#else
windrvrfd = fd = (*func) (pathname, flags, mode);
#endif
- if (!xpcu)
- xpcu = xpcu_open();
return fd;
}
if (fd == windrvrfd && windrvrfd >= 0) {
DPRINTF("close windrvrfd\n");
- if (xpcu->handle) {
- xpcu_claim(xpcu, XPCU_RELEASE);
- usb_close(xpcu->handle);
- }
-
- xpcu->handle = NULL;
- xpcu->interface = -1;
xpcu = NULL;
windrvrfd = -1;
}
projects / usb-driver / blobdiff