-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+/* libusb/ppdev connector for XILINX impact
+ *
+ * Copyright (c) 2007 Michael Gernoth <michael@gernoth.net>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
#define _GNU_SOURCE 1
-#if defined(RTLD_NEXT)
-#define REAL_LIBC RTLD_NEXT
-#else
-#define REAL_LIBC ((void *) -1L)
-#endif
-
#include <dlfcn.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <usb.h>
#include <signal.h>
-#include "xilinx.h"
+#include <pthread.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <sys/ioctl.h>
+#include "usb-driver.h"
+#include "config.h"
static int (*ioctl_func) (int, int, void *) = NULL;
-static int windrvrfd = 0;
-FILE *modulesfp;
+static int windrvrfd = -1;
+static unsigned long ppbase = 0;
+static unsigned long ecpbase = 0;
+static struct parport_config *pport = NULL;
+FILE *modulesfp = NULL;
+FILE *baseaddrfp = NULL;
+int baseaddrnum = 0;
static int modules_read = 0;
static struct usb_bus *busses = NULL;
static struct usb_device *usbdevice;
static usb_dev_handle *usb_devhandle = NULL;
+static int usbinterface = -1;
static unsigned long card_type;
static int ints_enabled = 0;
+static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
#define NO_WINDRVR 1
-#undef DEBUG
void hexdump(unsigned char *buf, int len) {
int i;
if ((i % 16) == 15)
fprintf(stderr,"\n");
}
+ fprintf(stderr,"\n");
}
int usb_deviceinfo(unsigned char *buf) {
udi->Pipe0.dwNumber = 0x00;
udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0;
udi->Pipe0.type = 0;
- udi->Pipe0.direction = 3;
+ udi->Pipe0.direction = WDU_DIR_IN_OUT;
udi->Pipe0.dwInterval = 0;
pConfigs = &(udi->pConfigs);
return (*ioctl_func) (fd, request, wdioctl);
}
- switch(request) {
+ switch(request & ~(0xc0000000)) {
case VERSION:
version = (struct version_struct*)(wdheader->data);
- strcpy(version->version, "WinDriver no more");
- version->versionul = 999;
-#ifdef DEBUG
- fprintf(stderr,"faking VERSION\n");
-#endif
+ strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION);
+ version->versionul = 802;
+ DPRINTF("VERSION\n");
break;
case LICENSE:
-#ifdef DEBUG
- fprintf(stderr,"faking LICENSE\n");
-#endif
+ DPRINTF("LICENSE\n");
break;
+ case CARD_REGISTER_OLD:
case CARD_REGISTER:
+ DPRINTF("CARD_REGISTER\n");
{
- //struct card_register* cr = (struct card_register*)(wdheader->data);
- /* Todo: LPT-Port already in use */
- }
-#ifdef DEBUG
- fprintf(stderr,"faking CARD_REGISTER\n");
+ struct card_register* cr = (struct card_register*)(wdheader->data);
+
+ 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",
+ cr->Card.dwItems,
+ (unsigned long)cr->Card.Item[1].I.IO.dwAddr,
+ cr->Card.Item[1].I.IO.dwBytes,
+ cr->Card.Item[1].I.IO.dwBar);
+#ifndef NO_WINDRVR
+ ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+
+ pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+ if (!pport)
+ break;
+
+ ret = pport->open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+
+ ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
+
+ if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr)
+ ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr;
+
+ if (ret >= 0) {
+ cr->hCard = ret;
+ } else {
+ cr->hCard = 0;
+ }
#endif
+ DPRINTF("hCard: %lu\n", cr->hCard);
+ }
break;
case USB_TRANSFER:
-#ifdef DEBUG
- fprintf(stderr,"in USB_TRANSFER");
-#endif
+ DPRINTF("in USB_TRANSFER");
{
struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
#ifdef DEBUG
- fprintf(stderr," unique: %lu, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n", ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
- fprintf(stderr,"setup packet: ");
+ DPRINTF(" unique: %lu, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n",
+ ut->dwUniqueID, ut->dwPipeNum, ut->fRead,
+ ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
+ DPRINTF("setup packet: ");
hexdump(ut->SetupPacket, 8);
- fprintf(stderr,"\n");
if (!ut->fRead && ut->dwBufferSize)
{
hexdump(ut->pBuffer, ut->dwBufferSize);
- fprintf(stderr,"\n");
}
#endif
value = ut->SetupPacket[2] | (ut->SetupPacket[3] << 8);
index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8);
size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 8);
-#ifdef DEBUG
- fprintf(stderr, "requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
-#endif
+ DPRINTF("requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
ret = usb_control_msg(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
} else {
if (ut->fRead) {
#endif
#ifdef DEBUG
- fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
+ DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
if (ut->fRead && ut->dwBytesTransferred)
{
- fprintf(stderr,"Read: ");
+ DPRINTF("Read: ");
hexdump(ut->pBuffer, ut->dwBytesTransferred);
- fprintf(stderr,"\n");
}
#endif
}
break;
+ case INT_ENABLE_OLD:
case INT_ENABLE:
-#ifdef DEBUG
- fprintf(stderr,"INT_ENABLE\n");
-#endif
+ DPRINTF("INT_ENABLE\n");
{
struct interrupt *it = (struct interrupt*)(wdheader->data);
-#ifdef DEBUG
- fprintf(stderr,"Handle: %lu, 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);
-#endif
+ DPRINTF("Handle: %lu, 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;
- //ret = (*ioctl_func) (fd, request, wdioctl);
+ pthread_mutex_trylock(&int_wait);
}
break;
case INT_DISABLE:
-#ifdef DEBUG
- fprintf(stderr,"INT_DISABLE\n");
-#endif
+ DPRINTF("INT_DISABLE\n");
{
struct interrupt *it = (struct interrupt*)(wdheader->data);
-#ifdef DEBUG
- fprintf(stderr,"Handle: %lu, 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);
-#endif
+ DPRINTF("Handle: %lu, 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);
#endif
-#ifdef DEBUG
- fprintf(stderr,"Handle: %lu, 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);
-#endif
+ DPRINTF("Handle: %lu, 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;
case USB_SET_INTERFACE:
-#ifdef DEBUG
- fprintf(stderr,"USB_SET_INTERFACE\n");
-#endif
+ DPRINTF("USB_SET_INTERFACE\n");
{
struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
-#ifdef DEBUG
- fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
-#endif
+ DPRINTF("unique: %lu, 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
/* FIXME: Select right interface! */
ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
if (!ret) {
- //ret = usb_set_configuration(usb_devhandle, usbdevice->config[0].bConfigurationValue);
if(!ret) {
+ usbinterface = usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
if (ret)
fprintf(stderr, "usb_set_altinterface: %d\n", ret);
fprintf(stderr, "usb_set_configuration: %d (%s)\n", ret, usb_strerror());
}
} else {
- fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n", usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber, ret, usb_strerror());
+ fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n",
+ usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber,
+ ret, usb_strerror());
}
}
#endif
-#ifdef DEBUG
- fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
-#endif
+ DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
+ usi->dwUniqueID, usi->dwInterfaceNum,
+ usi->dwAlternateSetting, usi->dwOptions);
}
break;
+ case USB_GET_DEVICE_DATA_OLD:
case USB_GET_DEVICE_DATA:
-#ifdef DEBUG
- fprintf(stderr,"faking USB_GET_DEVICE_DATA\n");
-#endif
+ DPRINTF("USB_GET_DEVICE_DATA\n");
{
struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
int pSize;
-#ifdef DEBUG
- fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions);
-#endif
+ DPRINTF("unique: %lu, bytes: %lu, options: %lx\n",
+ ugdd->dwUniqueID, ugdd->dwBytes,
+ ugdd->dwOptions);
+
pSize = ugdd->dwBytes;
- //ret = (*ioctl_func) (fd, request, wdioctl);
if (!ugdd->dwBytes) {
if (usbdevice) {
ugdd->dwBytes = usb_deviceinfo(NULL);
}
break;
+ case EVENT_REGISTER_OLD:
case EVENT_REGISTER:
-#ifdef DEBUG
- fprintf(stderr,"EVENT_REGISTER\n");
-#endif
+ DPRINTF("EVENT_REGISTER\n");
{
struct event *e = (struct event*)(wdheader->data);
struct usb_bus *bus;
+ char* devpos;
+ int busnum = -1, devnum = -1;
int i;
-#ifdef DEBUG
- fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, 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->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
-#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",
+ e->handle, e->dwAction,
+ e->dwStatus, e->dwEventId, e->dwCardType,
+ e->hKernelPlugIn, e->dwOptions,
+ e->u.Usb.deviceId.dwVendorId,
+ e->u.Usb.deviceId.dwProductId,
+ 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++) {
-#ifdef DEBUG
- fprintf(stderr,"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);
-#endif
+
+ 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 = 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)) {
+ (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass) &&
+ ((devnum == -1) || (dev->devnum == 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++) {
-#ifdef DEBUG
- fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol);
-#endif
+
+ 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! */
-#ifdef DEBUG
- fprintf(stderr,"!!!FOUND DEVICE WITH LIBUSB!!!\n");
-#endif
+ DPRINTF("found device with libusb\n");
usbdevice = dev;
card_type = e->dwCardType;
}
#endif
#ifdef DEBUG
- fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, 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->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+ 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",
+ e->handle, e->dwAction,
+ e->dwStatus, e->dwEventId, e->dwCardType,
+ e->hKernelPlugIn, e->dwOptions,
+ e->u.Usb.deviceId.dwVendorId,
+ e->u.Usb.deviceId.dwProductId,
+ e->u.Usb.dwUniqueID, e->dwEventVer,
+ e->dwNumMatchTables);
+
for (i = 0; i < e->dwNumMatchTables; i++)
- fprintf(stderr,"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);
+ 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);
#endif
}
break;
+ case TRANSFER_OLD:
case TRANSFER:
- fprintf(stderr,"TRANSFER\n");
+ DPRINTF("TRANSFER\n");
+ {
+ WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
+
#ifndef NO_WINDRVR
- ret = (*ioctl_func) (fd, request, wdioctl);
+ ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+ ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1);
#endif
+ }
break;
- case EVENT_UNREGISTER:
-#ifdef DEBUG
- fprintf(stderr,"EVENT_UNREGISTER\n");
+ case MULTI_TRANSFER_OLD:
+ case MULTI_TRANSFER:
+ DPRINTF("MULTI_TRANSFER\n");
+ {
+ WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
+ unsigned long num = wdheader->size/sizeof(WD_TRANSFER);
+#ifndef NO_WINDRVR
+ ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+ ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num);
#endif
+ }
+ break;
+
+ case EVENT_UNREGISTER:
+ DPRINTF("EVENT_UNREGISTER\n");
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#endif
break;
case INT_WAIT:
-#ifdef DEBUG
- fprintf(stderr,"INT_WAIT\n");
-#endif
+ DPRINTF("INT_WAIT\n");
{
struct interrupt *it = (struct interrupt*)(wdheader->data);
-#ifdef DEBUG
- fprintf(stderr,"Handle: %lu, 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);
-#endif
+ DPRINTF("Handle: %lu, 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);
if (it->dwCounter == 0) {
it->dwCounter = 1;
} else {
- while(ints_enabled) {sleep(1);}
+ pthread_mutex_lock(&int_wait);
+ pthread_mutex_unlock(&int_wait);
}
} else {
- while(ints_enabled) {sleep(1);}
+ pthread_mutex_lock(&int_wait);
+ pthread_mutex_unlock(&int_wait);
}
#endif
-#ifdef DEBUG
- fprintf(stderr,"INT_WAIT_RETURN: Handle: %lu, 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);
-#endif
+ DPRINTF("INT_WAIT_RETURN: Handle: %lu, 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;
case CARD_UNREGISTER:
- fprintf(stderr,"CARD_UNREGISTER\n");
+ DPRINTF("CARD_UNREGISTER\n");
+ {
+ struct card_register* cr = (struct card_register*)(wdheader->data);
+
+ 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);
+
#ifndef NO_WINDRVR
- ret = (*ioctl_func) (fd, request, wdioctl);
+ ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+ if (pport)
+ pport->close(cr->hCard);
+
+ pport = NULL;
#endif
+ }
break;
case EVENT_PULL:
-#ifdef DEBUG
- fprintf(stderr,"EVENT_PULL\n");
-#endif
+ DPRINTF("EVENT_PULL\n");
{
struct event *e = (struct event*)(wdheader->data);
#ifdef DEBUG
int i;
- fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, 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->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+ 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",
+ e->handle, e->dwAction, e->dwStatus,
+ e->dwEventId, e->dwCardType, e->hKernelPlugIn,
+ e->dwOptions, e->u.Usb.deviceId.dwVendorId,
+ e->u.Usb.deviceId.dwProductId,
+ e->u.Usb.dwUniqueID, e->dwEventVer,
+ e->dwNumMatchTables);
+
for (i = 0; i < e->dwNumMatchTables; i++)
- fprintf(stderr,"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);
+ 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);
#endif
#ifndef NO_WINDRVR
#endif
#ifdef DEBUG
- fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, 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->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+ 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",
+ e->handle, e->dwAction, e->dwStatus,
+ e->dwEventId, e->dwCardType, e->hKernelPlugIn,
+ e->dwOptions, e->u.Usb.deviceId.dwVendorId,
+ e->u.Usb.deviceId.dwProductId,
+ e->u.Usb.dwUniqueID, e->dwEventVer,
+ e->dwNumMatchTables);
+
for (i = 0; i < e->dwNumMatchTables; i++)
- fprintf(stderr,"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);
+ 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);
#endif
}
return ret;
}
-int ioctl(int fd, int request, ...)
-{
+int ioctl(int fd, unsigned long int request, ...) {
va_list args;
void *argp;
int ret;
if (!ioctl_func)
- ioctl_func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl");
+ ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl");
va_start (args, request);
argp = va_arg (args, void *);
return ret;
}
-typedef int (*open_funcptr_t) (const char *, int, mode_t);
-
-int open (const char *pathname, int flags, ...)
-{
- static open_funcptr_t func = NULL;
+int open (const char *pathname, int flags, ...) {
+ static int (*func) (const char *, int, mode_t) = NULL;
mode_t mode = 0;
va_list args;
int fd;
if (!func)
- func = (open_funcptr_t) dlsym (REAL_LIBC, "open");
+ func = (int (*) (const char *, int, mode_t)) dlsym (RTLD_NEXT, "open");
if (flags & O_CREAT) {
va_start(args, flags);
}
if (!strcmp (pathname, "/dev/windrvr6")) {
-#ifdef DEBUG
- fprintf(stderr,"opening windrvr6\n");
-#endif
+ DPRINTF("opening windrvr6\n");
#ifdef NO_WINDRVR
windrvrfd = fd = (*func) ("/dev/null", flags, mode);
#else
static int (*func) (int) = NULL;
if (!func)
- func = (int (*) (int)) dlsym(REAL_LIBC, "close");
+ func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
- if (fd == windrvrfd) {
-#ifdef DEBUG
- fprintf(stderr,"close windrvrfd\n");
-#endif
- windrvrfd = 0;
+ if (fd == windrvrfd && windrvrfd >= 0) {
+ DPRINTF("close windrvrfd\n");
+ if (usbinterface >= 0)
+ usb_release_interface(usb_devhandle, usbinterface);
+
+ if (usb_devhandle)
+ usb_close(usb_devhandle);
+
+ usb_devhandle = NULL;
+ usbinterface = -1;
+ windrvrfd = -1;
}
return (*func) (fd);
FILE *fopen(const char *path, const char *mode) {
FILE *ret;
static FILE* (*func) (const char*, const char*) = NULL;
+ char buf[256];
+ int i;
if (!func)
- func = (FILE* (*) (const char*, const char*)) dlsym(REAL_LIBC, "fopen");
+ func = (FILE* (*) (const char*, const char*)) dlsym(RTLD_NEXT, "fopen");
+
+ for (i = 0; i < 4; i++) {
+ snprintf(buf, sizeof(buf), "/proc/sys/dev/parport/parport%d/base-addr", i);
+ if (!strcmp(path, buf)) {
+ DPRINTF("open base-addr of parport%d\n", i);
+ if (config_is_real_pport(i)) {
+ ret = (*func) (path, mode);
+ } else {
+ ret = (*func) ("/dev/null", mode);
+ }
+
+ if (ret) {
+ baseaddrfp = ret;
+ baseaddrnum = i;
+ }
+
+ return ret;
+ }
+ }
ret = (*func) (path, mode);
- if (!strcmp (path, "/proc/modules")) {
-#ifdef DEBUG
- fprintf(stderr,"opening /proc/modules\n");
-#endif
+ if (!strcmp(path, "/proc/modules")) {
+ DPRINTF("opening /proc/modules\n");
#ifdef NO_WINDRVR
modulesfp = ret;
modules_read = 0;
char *fgets(char *s, int size, FILE *stream) {
static char* (*func) (char*, int, FILE*) = NULL;
- const char modules[] = "windrvr6 160960 0 - Live 0xf98b0000\n";
+ const char modules[][256] = {"windrvr6 1 0 - Live 0xdeadbeef\n", "parport_pc 1 0 - Live 0xdeadbeef\n"};
+ char buf[256];
char *ret = NULL;
if (!func)
- func = (char* (*) (char*, int, FILE*)) dlsym(REAL_LIBC, "fgets");
+ func = (char* (*) (char*, int, FILE*)) dlsym(RTLD_NEXT, "fgets");
if (modulesfp == stream) {
- if (!modules_read) {
- strcpy(s, modules);
+ if (modules_read < sizeof(modules) / sizeof(modules[0])) {
+ strcpy(s, modules[modules_read]);
ret = s;
- modules_read = 1;
+ modules_read++;
}
+ } else if (baseaddrfp == stream) {
+ snprintf(s, sizeof(buf), "%d\t%d\n",
+ (baseaddrnum) * 0x10,
+ ((baseaddrnum) * 0x10) + 0x400);
+ ret = s;
} else {
ret = (*func)(s,size,stream);
}
static int (*func) (FILE*) = NULL;
if (!func)
- func = (int (*) (FILE*)) dlsym(REAL_LIBC, "fclose");
+ func = (int (*) (FILE*)) dlsym(RTLD_NEXT, "fclose");
if (fp == modulesfp) {
modulesfp = NULL;
}
+
+ if (fp == baseaddrfp) {
+ baseaddrfp = NULL;
+ }
return (*func)(fp);
}
-#endif
+
+int access(const char *pathname, int mode) {
+ static int (*func) (const char*, int);
+
+ if (!func)
+ func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");
+
+ if (pathname && !strcmp(pathname, "/dev/windrvr6")) {
+ return 0;
+ } else {
+ return (*func)(pathname, mode);
+ }
+}
projects / usb-driver / blobdiff