begin separating XPCU functions into own file
This commit is contained in:
parent
396647368b
commit
cbfa0ac6c8
4
Makefile
4
Makefile
@ -6,8 +6,8 @@ CFLAGS=-Wall -fPIC -DUSB_DRIVER_VERSION="\"$(shell stat -c '%y' usb-driver.c |cu
|
|||||||
|
|
||||||
LIBS=-ldl -lusb -lpthread
|
LIBS=-ldl -lusb -lpthread
|
||||||
|
|
||||||
SRC=usb-driver.c parport.c config.c jtagmon.c
|
SRC=usb-driver.c xpcu.c parport.c config.c jtagmon.c
|
||||||
HEADER=usb-driver.h parport.h jtagkey.h config.h jtagmon.h
|
HEADER=usb-driver.h xpcu.h parport.h jtagkey.h config.h jtagmon.h
|
||||||
|
|
||||||
ifeq ($(LIBVER),32)
|
ifeq ($(LIBVER),32)
|
||||||
CFLAGS += -m32
|
CFLAGS += -m32
|
||||||
|
269
usb-driver.c
269
usb-driver.c
@ -43,21 +43,18 @@
|
|||||||
#include <bits/wordsize.h>
|
#include <bits/wordsize.h>
|
||||||
#include "usb-driver.h"
|
#include "usb-driver.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "xpcu.h"
|
||||||
|
|
||||||
static int (*ioctl_func) (int, int, void *) = NULL;
|
static int (*ioctl_func) (int, int, void *) = NULL;
|
||||||
static int windrvrfd = -1;
|
static int windrvrfd = -1;
|
||||||
static unsigned long ppbase = 0;
|
static unsigned long ppbase = 0;
|
||||||
static unsigned long ecpbase = 0;
|
static unsigned long ecpbase = 0;
|
||||||
static struct parport_config *pport = NULL;
|
static struct parport_config *pport = NULL;
|
||||||
|
static struct xpcu_s *xpcu = NULL;
|
||||||
static FILE *modulesfp = NULL;
|
static FILE *modulesfp = NULL;
|
||||||
static FILE *baseaddrfp = NULL;
|
static FILE *baseaddrfp = NULL;
|
||||||
static int baseaddrnum = 0;
|
static int baseaddrnum = 0;
|
||||||
static int modules_read = 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 int usbalternate = -1;
|
|
||||||
static unsigned long card_type;
|
static unsigned long card_type;
|
||||||
static int ints_enabled = 0;
|
static int ints_enabled = 0;
|
||||||
static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
|
static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
|
||||||
@ -75,198 +72,6 @@ void hexdump(unsigned char *buf, int len) {
|
|||||||
fprintf(stderr,"\n");
|
fprintf(stderr,"\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int usb_claim(int claim) {
|
|
||||||
int ret = 0;
|
|
||||||
static int claimed = 0;
|
|
||||||
|
|
||||||
if (usbinterface < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (claim) {
|
|
||||||
if (claimed)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
ret = usb_claim_interface(usb_devhandle, usbinterface);
|
|
||||||
if (!ret) {
|
|
||||||
claimed = 1;
|
|
||||||
ret = usb_set_altinterface(usb_devhandle, usbalternate);
|
|
||||||
if (ret)
|
|
||||||
fprintf(stderr, "usb_set_altinterface: %d\n", ret);
|
|
||||||
} else {
|
|
||||||
fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n",
|
|
||||||
usbinterface, ret, usb_strerror());
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (!claimed)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
ret = usb_release_interface(usb_devhandle, usbinterface);
|
|
||||||
if (!ret)
|
|
||||||
claimed = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static 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 header_struct* wdheader = (struct header_struct*)wdioctl;
|
||||||
@ -355,7 +160,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
|
|||||||
#ifndef NO_WINDRVR
|
#ifndef NO_WINDRVR
|
||||||
ret = (*ioctl_func) (fd, request, wdioctl);
|
ret = (*ioctl_func) (fd, request, wdioctl);
|
||||||
#else
|
#else
|
||||||
usb_claim(1);
|
xpcu_claim(xpcu, XPCU_CLAIM);
|
||||||
/* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */
|
/* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */
|
||||||
if (ut->dwPipeNum == 0) { /* control pipe */
|
if (ut->dwPipeNum == 0) { /* control pipe */
|
||||||
int requesttype, request, value, index, size;
|
int requesttype, request, value, index, size;
|
||||||
@ -365,14 +170,14 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
|
|||||||
index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8);
|
index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8);
|
||||||
size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 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(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
|
ret = usb_control_msg(xpcu->handle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
|
||||||
} else {
|
} else {
|
||||||
if (ut->fRead) {
|
if (ut->fRead) {
|
||||||
ret = usb_bulk_read(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
|
ret = usb_bulk_read(xpcu->handle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
|
||||||
} else {
|
} else {
|
||||||
ret = usb_bulk_write(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
|
ret = usb_bulk_write(xpcu->handle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
|
||||||
}
|
}
|
||||||
usb_claim(0);
|
xpcu_claim(xpcu, XPCU_RELEASE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
@ -449,19 +254,19 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
|
|||||||
#ifndef NO_WINDRVR
|
#ifndef NO_WINDRVR
|
||||||
ret = (*ioctl_func) (fd, request, wdioctl);
|
ret = (*ioctl_func) (fd, request, wdioctl);
|
||||||
#else
|
#else
|
||||||
if (usbdevice) {
|
if (xpcu->dev) {
|
||||||
if (!usb_devhandle) {
|
if (!xpcu->handle) {
|
||||||
usb_devhandle = usb_open(usbdevice);
|
xpcu->handle = usb_open(xpcu->dev);
|
||||||
#ifndef NO_USB_RESET
|
#ifndef NO_USB_RESET
|
||||||
if (usb_devhandle) {
|
if (xpcu->handle) {
|
||||||
usb_reset(usb_devhandle);
|
usb_reset(xpcu->handle);
|
||||||
usb_devhandle = usb_open(usbdevice);
|
xpcu->handle = usb_open(xpcu->dev);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
usbinterface = usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
|
xpcu->interface = xpcu->dev->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
|
||||||
usbalternate = usi->dwAlternateSetting;
|
xpcu->alternate = usi->dwAlternateSetting;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
|
DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
|
||||||
@ -483,11 +288,11 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
|
|||||||
|
|
||||||
pSize = ugdd->dwBytes;
|
pSize = ugdd->dwBytes;
|
||||||
if (!ugdd->dwBytes) {
|
if (!ugdd->dwBytes) {
|
||||||
if (usbdevice) {
|
if (xpcu->dev) {
|
||||||
ugdd->dwBytes = usb_deviceinfo(NULL);
|
ugdd->dwBytes = xpcu_deviceinfo(xpcu, NULL);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
usb_deviceinfo((unsigned char*)ugdd->pBuf);
|
xpcu_deviceinfo(xpcu, (unsigned char*)ugdd->pBuf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -553,7 +358,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
|
|||||||
e->matchTables[i].bInterfaceSubClass,
|
e->matchTables[i].bInterfaceSubClass,
|
||||||
e->matchTables[i].bInterfaceProtocol);
|
e->matchTables[i].bInterfaceProtocol);
|
||||||
|
|
||||||
for (bus = busses; bus; bus = bus->next) {
|
for (bus = xpcu->busses; bus; bus = bus->next) {
|
||||||
struct usb_device *dev;
|
struct usb_device *dev;
|
||||||
|
|
||||||
if ((devnum != -1) && (strtol(bus->dirname, NULL, 10) != busnum))
|
if ((devnum != -1) && (strtol(bus->dirname, NULL, 10) != busnum))
|
||||||
@ -583,7 +388,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
|
|||||||
(interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
|
(interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
|
||||||
/* TODO: check interfaceClass! */
|
/* TODO: check interfaceClass! */
|
||||||
DPRINTF("found device with libusb\n");
|
DPRINTF("found device with libusb\n");
|
||||||
usbdevice = dev;
|
xpcu->dev = dev;
|
||||||
card_type = e->dwCardType;
|
card_type = e->dwCardType;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -670,7 +475,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
|
|||||||
#ifndef NO_WINDRVR
|
#ifndef NO_WINDRVR
|
||||||
ret = (*ioctl_func) (fd, request, wdioctl);
|
ret = (*ioctl_func) (fd, request, wdioctl);
|
||||||
#else
|
#else
|
||||||
if (usbdevice) {
|
if (xpcu->dev) {
|
||||||
if (it->dwCounter == 0) {
|
if (it->dwCounter == 0) {
|
||||||
it->dwCounter = 1;
|
it->dwCounter = 1;
|
||||||
} else {
|
} else {
|
||||||
@ -742,17 +547,17 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
|
|||||||
#ifndef NO_WINDRVR
|
#ifndef NO_WINDRVR
|
||||||
ret = (*ioctl_func) (fd, request, wdioctl);
|
ret = (*ioctl_func) (fd, request, wdioctl);
|
||||||
#else
|
#else
|
||||||
if (usbdevice) {
|
if (xpcu->dev) {
|
||||||
struct usb_interface *interface = usbdevice->config->interface;
|
struct usb_interface *interface = xpcu->dev->config->interface;
|
||||||
|
|
||||||
e->dwCardType = card_type;
|
e->dwCardType = card_type;
|
||||||
e->dwAction = 1;
|
e->dwAction = 1;
|
||||||
e->dwEventId = 109;
|
e->dwEventId = 109;
|
||||||
e->u.Usb.dwUniqueID = 110;
|
e->u.Usb.dwUniqueID = 110;
|
||||||
e->matchTables[0].VendorId = usbdevice->descriptor.idVendor;
|
e->matchTables[0].VendorId = xpcu->dev->descriptor.idVendor;
|
||||||
e->matchTables[0].ProductId = usbdevice->descriptor.idProduct;
|
e->matchTables[0].ProductId = xpcu->dev->descriptor.idProduct;
|
||||||
e->matchTables[0].bDeviceClass = usbdevice->descriptor.bDeviceClass;
|
e->matchTables[0].bDeviceClass = xpcu->dev->descriptor.bDeviceClass;
|
||||||
e->matchTables[0].bDeviceSubClass = usbdevice->descriptor.bDeviceSubClass;
|
e->matchTables[0].bDeviceSubClass = xpcu->dev->descriptor.bDeviceSubClass;
|
||||||
e->matchTables[0].bInterfaceClass = interface->altsetting[0].bInterfaceClass;
|
e->matchTables[0].bInterfaceClass = interface->altsetting[0].bInterfaceClass;
|
||||||
e->matchTables[0].bInterfaceSubClass = interface->altsetting[0].bInterfaceSubClass;
|
e->matchTables[0].bInterfaceSubClass = interface->altsetting[0].bInterfaceSubClass;
|
||||||
e->matchTables[0].bInterfaceProtocol = interface->altsetting[0].bInterfaceProtocol;
|
e->matchTables[0].bInterfaceProtocol = interface->altsetting[0].bInterfaceProtocol;
|
||||||
@ -835,13 +640,8 @@ int open (const char *pathname, int flags, ...) {
|
|||||||
#else
|
#else
|
||||||
windrvrfd = fd = (*func) (pathname, flags, mode);
|
windrvrfd = fd = (*func) (pathname, flags, mode);
|
||||||
#endif
|
#endif
|
||||||
if (!busses) {
|
if (!xpcu)
|
||||||
usb_init();
|
xpcu = xpcu_open();
|
||||||
usb_find_busses();
|
|
||||||
usb_find_devices();
|
|
||||||
|
|
||||||
busses = usb_get_busses();
|
|
||||||
}
|
|
||||||
|
|
||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
@ -858,13 +658,14 @@ int close(int fd) {
|
|||||||
if (fd == windrvrfd && windrvrfd >= 0) {
|
if (fd == windrvrfd && windrvrfd >= 0) {
|
||||||
DPRINTF("close windrvrfd\n");
|
DPRINTF("close windrvrfd\n");
|
||||||
|
|
||||||
if (usb_devhandle) {
|
if (xpcu->handle) {
|
||||||
usb_claim(0);
|
xpcu_claim(xpcu, XPCU_RELEASE);
|
||||||
usb_close(usb_devhandle);
|
usb_close(xpcu->handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
usb_devhandle = NULL;
|
xpcu->handle = NULL;
|
||||||
usbinterface = -1;
|
xpcu->interface = -1;
|
||||||
|
xpcu = NULL;
|
||||||
windrvrfd = -1;
|
windrvrfd = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
216
xpcu.c
Normal file
216
xpcu.c
Normal file
@ -0,0 +1,216 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <strings.h>
|
||||||
|
#include <usb.h>
|
||||||
|
#include "xpcu.h"
|
||||||
|
#include "usb-driver.h"
|
||||||
|
|
||||||
|
int xpcu_deviceinfo(struct xpcu_s *xpcu, 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 = xpcu->dev->descriptor.bDescriptorType;
|
||||||
|
udi->Descriptor.bcdUSB = xpcu->dev->descriptor.bcdUSB;
|
||||||
|
udi->Descriptor.bDeviceClass = xpcu->dev->descriptor.bDeviceClass;
|
||||||
|
udi->Descriptor.bDeviceSubClass = xpcu->dev->descriptor.bDeviceSubClass;
|
||||||
|
udi->Descriptor.bDeviceProtocol = xpcu->dev->descriptor.bDeviceProtocol;
|
||||||
|
udi->Descriptor.bMaxPacketSize0 = xpcu->dev->descriptor.bMaxPacketSize0;
|
||||||
|
udi->Descriptor.idVendor = xpcu->dev->descriptor.idVendor;
|
||||||
|
udi->Descriptor.idProduct = xpcu->dev->descriptor.idProduct;
|
||||||
|
udi->Descriptor.bcdDevice = xpcu->dev->descriptor.bcdDevice;
|
||||||
|
udi->Descriptor.iManufacturer = xpcu->dev->descriptor.iManufacturer;
|
||||||
|
udi->Descriptor.iProduct = xpcu->dev->descriptor.iProduct;
|
||||||
|
udi->Descriptor.iSerialNumber = xpcu->dev->descriptor.iSerialNumber;
|
||||||
|
udi->Descriptor.bNumConfigurations = xpcu->dev->descriptor.bNumConfigurations;
|
||||||
|
|
||||||
|
/* TODO: Fix Pipe0! */
|
||||||
|
udi->Pipe0.dwNumber = 0x00;
|
||||||
|
udi->Pipe0.dwMaximumPacketSize = xpcu->dev->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<xpcu->dev->descriptor.bNumConfigurations; i++)
|
||||||
|
{
|
||||||
|
struct usb_config_descriptor *conf_desc = &xpcu->dev->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 = xpcu->dev->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 = &xpcu->dev->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 xpcu_claim(struct xpcu_s *xpcu, int claim) {
|
||||||
|
int ret = 0;
|
||||||
|
static int claimed = 0;
|
||||||
|
|
||||||
|
if (xpcu->interface < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (claim == XPCU_CLAIM) {
|
||||||
|
if (claimed)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
ret = usb_claim_interface(xpcu->handle, xpcu->interface);
|
||||||
|
if (!ret) {
|
||||||
|
claimed = 1;
|
||||||
|
ret = usb_set_altinterface(xpcu->handle, xpcu->alternate);
|
||||||
|
if (ret)
|
||||||
|
fprintf(stderr, "usb_set_altinterface: %d\n", ret);
|
||||||
|
} else {
|
||||||
|
fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n",
|
||||||
|
xpcu->interface, ret, usb_strerror());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (!claimed)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
ret = usb_release_interface(xpcu->handle, xpcu->interface);
|
||||||
|
if (!ret)
|
||||||
|
claimed = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct xpcu_s *xpcu_open(void) {
|
||||||
|
static struct xpcu_s xpcu;
|
||||||
|
|
||||||
|
bzero(&xpcu, sizeof(xpcu));
|
||||||
|
xpcu.interface = -1;
|
||||||
|
xpcu.alternate = -1;
|
||||||
|
|
||||||
|
usb_init();
|
||||||
|
usb_find_busses();
|
||||||
|
usb_find_devices();
|
||||||
|
|
||||||
|
xpcu.busses = usb_get_busses();
|
||||||
|
|
||||||
|
return &xpcu;
|
||||||
|
}
|
14
xpcu.h
Normal file
14
xpcu.h
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
#define XPCU_CLAIM 1
|
||||||
|
#define XPCU_RELEASE 0
|
||||||
|
|
||||||
|
struct xpcu_s {
|
||||||
|
struct usb_device *dev;
|
||||||
|
usb_dev_handle *handle;
|
||||||
|
struct usb_bus *busses;
|
||||||
|
int interface;
|
||||||
|
int alternate;
|
||||||
|
};
|
||||||
|
|
||||||
|
int __attribute__ ((visibility ("hidden"))) xpcu_deviceinfo(struct xpcu_s *xpcu, unsigned char *buf);
|
||||||
|
int __attribute__ ((visibility ("hidden"))) xpcu_claim(struct xpcu_s *xpcu, int claim);
|
||||||
|
struct xpcu_s __attribute__ ((visibility ("hidden"))) *xpcu_open(void);
|
Reference in New Issue
Block a user