#include <errno.h>
#include <inttypes.h>
#include <sys/ioctl.h>
-#include <linux/parport.h>
-#include <linux/ppdev.h>
+#include <sys/utsname.h>
+#include <bits/wordsize.h>
#include "usb-driver.h"
-#ifdef JTAGKEY
-#include "jtagkey.h"
-#endif
+#include "config.h"
+#include "xpcu.h"
static int (*ioctl_func) (int, int, void *) = NULL;
static int windrvrfd = -1;
-static int parportfd = -1;
static unsigned long ppbase = 0;
static unsigned long ecpbase = 0;
-FILE *modulesfp = NULL;
-FILE *baseaddrfp = NULL;
-int baseaddrnum = 0;
+static struct parport_config *pport = NULL;
+static struct xpcu_s *xpcu = NULL;
+static FILE *modulesfp = NULL;
+static FILE *baseaddrfp = NULL;
+static 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
-#ifdef DEBUG
void hexdump(unsigned char *buf, int len) {
int i;
}
fprintf(stderr,"\n");
}
-#endif
-
-int usb_deviceinfo(unsigned char *buf) {
- int i,j,k,l;
- int len = 0;
- WDU_CONFIGURATION **pConfigs, **pActiveConfig;
- WDU_INTERFACE **pActiveInterface;
-
- if (buf) {
- struct usb_device_info *udi = (struct usb_device_info*)(buf+len);
-
- udi->Descriptor.bLength = sizeof(WDU_DEVICE_DESCRIPTOR);
- udi->Descriptor.bDescriptorType = usbdevice->descriptor.bDescriptorType;
- udi->Descriptor.bcdUSB = usbdevice->descriptor.bcdUSB;
- udi->Descriptor.bDeviceClass = usbdevice->descriptor.bDeviceClass;
- udi->Descriptor.bDeviceSubClass = usbdevice->descriptor.bDeviceSubClass;
- udi->Descriptor.bDeviceProtocol = usbdevice->descriptor.bDeviceProtocol;
- udi->Descriptor.bMaxPacketSize0 = usbdevice->descriptor.bMaxPacketSize0;
- udi->Descriptor.idVendor = usbdevice->descriptor.idVendor;
- udi->Descriptor.idProduct = usbdevice->descriptor.idProduct;
- udi->Descriptor.bcdDevice = usbdevice->descriptor.bcdDevice;
- udi->Descriptor.iManufacturer = usbdevice->descriptor.iManufacturer;
- udi->Descriptor.iProduct = usbdevice->descriptor.iProduct;
- udi->Descriptor.iSerialNumber = usbdevice->descriptor.iSerialNumber;
- udi->Descriptor.bNumConfigurations = usbdevice->descriptor.bNumConfigurations;
-
- /* TODO: Fix Pipe0! */
- udi->Pipe0.dwNumber = 0x00;
- udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0;
- udi->Pipe0.type = 0;
- udi->Pipe0.direction = WDU_DIR_IN_OUT;
- udi->Pipe0.dwInterval = 0;
-
- pConfigs = &(udi->pConfigs);
- pActiveConfig = &(udi->pActiveConfig);
- pActiveInterface = &(udi->pActiveInterface[0]);
- }
-
- len = sizeof(struct usb_device_info);
-
- for (i=0; i<usbdevice->descriptor.bNumConfigurations; i++)
- {
- struct usb_config_descriptor *conf_desc = &usbdevice->config[i];
- WDU_INTERFACE **pInterfaces;
- WDU_ALTERNATE_SETTING **pAlternateSettings[conf_desc->bNumInterfaces];
- WDU_ALTERNATE_SETTING **pActiveAltSetting[conf_desc->bNumInterfaces];
-
- if (buf) {
- WDU_CONFIGURATION *cfg = (WDU_CONFIGURATION*)(buf+len);
-
- *pConfigs = cfg;
- *pActiveConfig = cfg;
-
- cfg->Descriptor.bLength = conf_desc->bLength;
- cfg->Descriptor.bDescriptorType = conf_desc->bDescriptorType;
- cfg->Descriptor.wTotalLength = conf_desc->wTotalLength;
- cfg->Descriptor.bNumInterfaces = conf_desc->bNumInterfaces;
- cfg->Descriptor.bConfigurationValue = conf_desc->bConfigurationValue;
- cfg->Descriptor.iConfiguration = conf_desc->iConfiguration;
- cfg->Descriptor.bmAttributes = conf_desc->bmAttributes;
- cfg->Descriptor.MaxPower = conf_desc->MaxPower;
-
- cfg->dwNumInterfaces = conf_desc->bNumInterfaces;
-
- pInterfaces = &(cfg->pInterfaces);
- }
- len += sizeof(WDU_CONFIGURATION);
-
- if (buf) {
- *pInterfaces = (WDU_INTERFACE*)(buf+len);
- for (j=0; j<conf_desc->bNumInterfaces; j++) {
- WDU_INTERFACE *iface = (WDU_INTERFACE*)(buf+len);
-
- pActiveInterface[j] = iface;
-
- pAlternateSettings[j] = &(iface->pAlternateSettings);
- iface->dwNumAltSettings = usbdevice->config[i].interface[j].num_altsetting;
- pActiveAltSetting[j] = &(iface->pActiveAltSetting);
-
- len += sizeof(WDU_INTERFACE);
- }
- } else {
- len += sizeof(WDU_INTERFACE) * conf_desc->bNumInterfaces;
- }
-
- for (j=0; j<conf_desc->bNumInterfaces; j++)
- {
- struct usb_interface *interface = &usbdevice->config[i].interface[j];
-
- if (buf) {
- *pAlternateSettings[j] = (WDU_ALTERNATE_SETTING*)(buf+len);
- /* FIXME: */
- *pActiveAltSetting[j] = (WDU_ALTERNATE_SETTING*)(buf+len);
- }
-
- for(k=0; k<interface->num_altsetting; k++)
- {
- unsigned char bNumEndpoints = interface->altsetting[k].bNumEndpoints;
- WDU_ENDPOINT_DESCRIPTOR **pEndpointDescriptors;
- WDU_PIPE_INFO **pPipes;
-
- if (buf) {
- WDU_ALTERNATE_SETTING *altset = (WDU_ALTERNATE_SETTING*)(buf+len);
-
- altset->Descriptor.bLength = interface->altsetting[k].bLength;
- altset->Descriptor.bDescriptorType = interface->altsetting[k].bDescriptorType;
- altset->Descriptor.bInterfaceNumber = interface->altsetting[k].bInterfaceNumber;
- altset->Descriptor.bAlternateSetting = interface->altsetting[k].bAlternateSetting;
- altset->Descriptor.bNumEndpoints = interface->altsetting[k].bNumEndpoints;
- altset->Descriptor.bInterfaceClass = interface->altsetting[k].bInterfaceClass;
- altset->Descriptor.bInterfaceSubClass = interface->altsetting[k].bInterfaceSubClass;
- altset->Descriptor.bInterfaceProtocol = interface->altsetting[k].bInterfaceProtocol;
- altset->Descriptor.iInterface = interface->altsetting[k].iInterface;
- pEndpointDescriptors = &(altset->pEndpointDescriptors);
- pPipes = &(altset->pPipes);
-
- }
- len +=sizeof(WDU_ALTERNATE_SETTING);
-
- if (buf) {
- *pEndpointDescriptors = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len);
- for (l = 0; l < bNumEndpoints; l++) {
- WDU_ENDPOINT_DESCRIPTOR *ed = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len);
-
- ed->bLength = interface->altsetting[k].endpoint[l].bLength;
- ed->bDescriptorType = interface->altsetting[k].endpoint[l].bDescriptorType;
- ed->bEndpointAddress = interface->altsetting[k].endpoint[l].bEndpointAddress;
- ed->bmAttributes = interface->altsetting[k].endpoint[l].bmAttributes;
- ed->wMaxPacketSize = interface->altsetting[k].endpoint[l].wMaxPacketSize;
- ed->bInterval = interface->altsetting[k].endpoint[l].bInterval;
-
- len += sizeof(WDU_ENDPOINT_DESCRIPTOR);
- }
-
- *pPipes = (WDU_PIPE_INFO*)(buf+len);
- for (l = 0; l < bNumEndpoints; l++) {
- WDU_PIPE_INFO *pi = (WDU_PIPE_INFO*)(buf+len);
-
- pi->dwNumber = interface->altsetting[k].endpoint[l].bEndpointAddress;
- pi->dwMaximumPacketSize = WDU_GET_MAX_PACKET_SIZE(interface->altsetting[k].endpoint[l].wMaxPacketSize);
- pi->type = interface->altsetting[k].endpoint[l].bmAttributes & USB_ENDPOINT_TYPE_MASK;
- if (pi->type == PIPE_TYPE_CONTROL)
- pi->direction = WDU_DIR_IN_OUT;
- else
- {
- pi->direction = interface->altsetting[k].endpoint[l].bEndpointAddress & USB_ENDPOINT_DIR_MASK ? WDU_DIR_IN : WDU_DIR_OUT;
- }
-
- pi->dwInterval = interface->altsetting[k].endpoint[l].bInterval;
-
- len += sizeof(WDU_PIPE_INFO);
- }
- } else {
- len +=(sizeof(WDU_ENDPOINT_DESCRIPTOR)+sizeof(WDU_PIPE_INFO))*bNumEndpoints;
- }
- }
- }
- }
-
- return len;
-}
-
-int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request) {
- int ret = 0;
- unsigned long port = (unsigned long)tr->dwPort;
- unsigned char val;
- static unsigned char last_pp_write = 0;
-
- DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
- (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes,
- tr->fAutoinc, tr->dwOptions);
-
- val = tr->Data.Byte;
-
-#ifdef DEBUG
- if (tr->cmdTrans == 13)
- DPRINTF("write byte: %d\n", val);
-#endif
-
- if (parportfd < 0)
- return ret;
-
- if (port == ppbase + PP_DATA) {
- DPRINTF("data port\n");
- switch(tr->cmdTrans) {
- case PP_READ:
- ret = 0; /* We don't support reading of the data port */
- break;
-
- case PP_WRITE:
- ret = ioctl(parportfd, PPWDATA, &val);
- last_pp_write = val;
- break;
-
- default:
- fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
- ret = -1;
- break;
- }
- } else if (port == ppbase + PP_STATUS) {
- DPRINTF("status port (last write: %d)\n", last_pp_write);
- switch(tr->cmdTrans) {
- case PP_READ:
- ret = ioctl(parportfd, PPRSTATUS, &val);
-#ifdef FORCE_PC3_IDENT
- val &= 0x5f;
- if (last_pp_write & 0x40)
- val |= 0x20;
- else
- val |= 0x80;
-#endif
- break;
-
- case PP_WRITE:
- ret = 0; /* Status Port is readonly */
- break;
-
- default:
- fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
- ret = -1;
- break;
- }
- } else if (port == ppbase + PP_CONTROL) {
- DPRINTF("control port\n");
- switch(tr->cmdTrans) {
- case PP_READ:
- ret = ioctl(parportfd, PPRCONTROL, &val);
- break;
-
- case PP_WRITE:
- ret = ioctl(parportfd, PPWCONTROL, &val);
- break;
-
- default:
- fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
- ret = -1;
- break;
- }
- } else if ((port == ecpbase + PP_ECP_CFGA) && ecpbase) {
- DPRINTF("ECP_CFGA port\n");
- } else if ((port == ecpbase + PP_ECP_CFGB) && ecpbase) {
- DPRINTF("ECP_CFGB port\n");
- } else if ((port == ecpbase + PP_ECP_ECR) && ecpbase) {
- DPRINTF("ECP_ECR port\n");
- } else {
- DPRINTF("access to unsupported address range!\n");
- ret = 0;
- }
- tr->Data.Byte = val;
-
- DPRINTF("dwPortReturn: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
- (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes,
- tr->fAutoinc, tr->dwOptions);
-#ifdef DEBUG
- if (tr->cmdTrans == 10)
- DPRINTF("read byte: %d\n", tr->Data.Byte);
-#endif
-
- return ret;
-}
-int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
+static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
struct header_struct* wdheader = (struct header_struct*)wdioctl;
struct version_struct *version;
int ret = 0;
switch(request & ~(0xc0000000)) {
case VERSION:
version = (struct version_struct*)(wdheader->data);
- strcpy(version->version, "libusb-driver.so $Revision: 1.63 $");
+ strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION);
version->versionul = 802;
DPRINTF("VERSION\n");
break;
DPRINTF("CARD_REGISTER\n");
{
struct card_register* cr = (struct card_register*)(wdheader->data);
- char ppdev[32];
DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
cr->Card.dwItems,
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
-
- /* FIXME: Ugly hack which maps amontec JtagKey to 4. parallel port */
-#ifdef JTAGKEY
- if ((unsigned long)cr->Card.Item[0].I.IO.dwAddr == 0x30) {
- ret=jtagkey_init(0x0403, 0xcff8); /* I need a config file... */
- cr->hCard = 0xff;
- ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
- if (ret < 0)
- cr->hCard = 0;
+ pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+ if (!pport)
break;
- }
-#endif
- if (parportfd < 0) {
- snprintf(ppdev, sizeof(ppdev), "/dev/parport%lu",
- (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
- DPRINTF("opening %s\n", ppdev);
- parportfd = open(ppdev, O_RDWR|O_EXCL);
-
- if (parportfd < 0)
- fprintf(stderr,"Can't open %s: %s\n", ppdev, strerror(errno));
- }
- if (parportfd >= 0) {
- int pmode;
-
- if (ioctl(parportfd, PPCLAIM) == -1)
- return ret;
-
- ecpbase = 0;
- pmode = IEEE1284_MODE_COMPAT;
- if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
- return ret;
-
- if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr) {
- DPRINTF("ECP mode requested\n");
- ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr;
- /* TODO: Implement ECP mode */
-#if 0
- pmode = IEEE1284_MODE_ECP;
-
- if (ioctl(parportfd, PPNEGOT, &pmode) == -1) {
- ecpbase = 0;
- pmode = IEEE1284_MODE_COMPAT;
- if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
- return ret;
- }
-#endif
- }
-
- cr->hCard = parportfd;
- }
+ ret = pport->open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
- if (ret < 0)
+
+ 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);
}
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);
+ if (ut->dwPipeNum == 0) {
+ DPRINTF("setup packet: ");
+ hexdump(ut->SetupPacket, 8);
+ }
if (!ut->fRead && ut->dwBufferSize)
{
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- /* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */
- if (ut->dwPipeNum == 0) { /* control pipe */
- int requesttype, request, value, index, size;
- requesttype = ut->SetupPacket[0];
- request = ut->SetupPacket[1];
- 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);
- ret = usb_control_msg(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
- } else {
- if (ut->fRead) {
- ret = usb_bulk_read(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
-
- } else {
- ret = usb_bulk_write(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
- }
- }
-
- if (ret < 0) {
- fprintf(stderr, "usb_transfer: %d (%s)\n", ret, usb_strerror());
- } else {
- ut->dwBytesTransferred = ret;
- ret = 0;
- }
+ xpcu_transfer(xpcu, ut);
#endif
#ifdef DEBUG
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- if (usbdevice) {
- if (!usb_devhandle)
- usb_devhandle = usb_open(usbdevice);
-
- /* FIXME: Select right interface! */
- ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
- if (!ret) {
- 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);
- } else {
- 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());
- }
- }
+ xpcu_set_interface(xpcu, usi);
#endif
DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
usi->dwUniqueID, usi->dwInterfaceNum,
pSize = ugdd->dwBytes;
if (!ugdd->dwBytes) {
- if (usbdevice) {
- ugdd->dwBytes = usb_deviceinfo(NULL);
+ if (xpcu->dev) {
+ ugdd->dwBytes = xpcu_deviceinfo(xpcu, NULL);
}
} else {
- usb_deviceinfo((unsigned char*)ugdd->pBuf);
+ xpcu_deviceinfo(xpcu, (unsigned char*)ugdd->pBuf);
}
}
break;
{
struct event *e = (struct event*)(wdheader->data);
struct usb_bus *bus;
+ char* devpos;
+ int busnum = -1, devnum = -1;
int i;
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->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].bInterfaceSubClass,
e->matchTables[i].bInterfaceProtocol);
- for (bus = busses; bus; bus = bus->next) {
+ 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)) {
+ (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;
(interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
/* TODO: check interfaceClass! */
DPRINTF("found device with libusb\n");
- usbdevice = dev;
+ xpcu->dev = dev;
card_type = e->dwCardType;
}
}
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
-
-#ifdef JTAGKEY
- if (ppbase == 0x30) {
- ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1);
- break;
- }
-#endif /* JTAGKEY */
- ret = pp_transfer(tr, fd, request);
+ ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1);
#endif
}
break;
{
WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
unsigned long num = wdheader->size/sizeof(WD_TRANSFER);
- int i;
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
-
-#ifdef JTAGKEY
- /* FIXME: Config file and mor intelligent mapping! */
- if (ppbase == 0x30) {
- ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, num);
- break;
- }
-#endif /* JTAGKEY */
-
- for (i = 0; i < num; i++) {
- DPRINTF("Transfer %d:\n", i+1);
- ret = pp_transfer(tr + i, fd, request);
- }
+ ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num);
#endif
}
break;
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- if (usbdevice) {
+ if (xpcu->dev) {
if (it->dwCounter == 0) {
it->dwCounter = 1;
} else {
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- if (parportfd == cr->hCard && parportfd >= 0) {
- ioctl(parportfd, PPRELEASE);
- close(parportfd);
- parportfd = -1;
- }
+ if (pport)
+ pport->close(cr->hCard);
+
+ pport = NULL;
#endif
}
break;
#ifndef NO_WINDRVR
ret = (*ioctl_func) (fd, request, wdioctl);
#else
- if (usbdevice) {
- struct usb_interface *interface = usbdevice->config->interface;
+ 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 = usbdevice->descriptor.idVendor;
- e->matchTables[0].ProductId = usbdevice->descriptor.idProduct;
- e->matchTables[0].bDeviceClass = usbdevice->descriptor.bDeviceClass;
- e->matchTables[0].bDeviceSubClass = usbdevice->descriptor.bDeviceSubClass;
+ 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;
#else
windrvrfd = fd = (*func) (pathname, flags, mode);
#endif
- if (!busses) {
- usb_init();
- usb_find_busses();
- usb_find_devices();
-
- busses = usb_get_busses();
- }
+ if (!xpcu)
+ xpcu = xpcu_open();
return fd;
}
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);
+ if (xpcu)
+ xpcu_close(xpcu);
- usb_devhandle = NULL;
- usbinterface = -1;
+ xpcu = NULL;
windrvrfd = -1;
}
if (!func)
func = (FILE* (*) (const char*, const char*)) dlsym(RTLD_NEXT, "fopen");
-#ifdef JTAGKEY
- /* FIXME: Hack for parport mapping */
- if (!strcmp(path, "/proc/sys/dev/parport/parport3/base-addr")) {
- ret = (*func) ("/dev/null", mode);
- } else
-#endif
- ret = (*func) (path, mode);
+ 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")) {
DPRINTF("opening /proc/modules\n");
modules_read = 0;
#endif
}
-
- if (ret) {
- 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);
- baseaddrfp = ret;
- baseaddrnum = i;
- }
- }
- }
return ret;
}
if (!func)
func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");
-
- if (!strcmp(pathname, "/dev/windrvr6")) {
+
+ if (pathname && !strcmp(pathname, "/dev/windrvr6")) {
return 0;
} else {
return (*func)(pathname, mode);
}
}
+
+#if __WORDSIZE == 32
+int uname (struct utsname *__name) {
+ static int (*func) (struct utsname*);
+ int ret;
+
+ if (!func)
+ func = (int (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname");
+
+ ret = (*func)(__name);
+
+ if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) {
+ strcpy(__name->machine, "i686");
+ }
+
+ return ret;
+}
+#endif
projects / usb-driver / blobdiff