jackcartersmith/xilinx-usb-driver
Archived
1
0
Fork 0
Code Releases Activity

parallel cable transfer cleanup

Browse Source
This commit is contained in:
michael 2007-03-17 00:43:00 +00:00
parent ae413cee9c
commit 28e7c3682e
1 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usb-driver.c
View File

@ -239,6 +239,7 @@ int usb_deviceinfo(unsigned char *buf) {
int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wdioctl) { int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wdioctl) {
int ret = 0; int ret = 0;
unsigned long port = (unsigned long)tr->dwPort;
unsigned char val; unsigned char val;
DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n", DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
@ -258,8 +259,7 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
if (parportfd < 0) if (parportfd < 0)
return ret; return ret;
switch((unsigned long)tr->dwPort - ppbase) { if (port == ppbase + PP_DATA) {
case PP_DATA:
DPRINTF("data port\n"); DPRINTF("data port\n");
switch(tr->cmdTrans) { switch(tr->cmdTrans) {
case PP_READ: case PP_READ:
@ -275,9 +275,7 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
ret = -1; ret = -1;
break; break;
} }
break; } else if (port == ppbase + PP_STATUS) {
case PP_STATUS:
DPRINTF("status port\n"); DPRINTF("status port\n");
switch(tr->cmdTrans) { switch(tr->cmdTrans) {
case PP_READ: case PP_READ:
@ -293,9 +291,7 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
ret = -1; ret = -1;
break; break;
} }
break; } else if (port == ppbase + PP_CONTROL) {
case PP_CONTROL:
DPRINTF("control port\n"); DPRINTF("control port\n");
switch(tr->cmdTrans) { switch(tr->cmdTrans) {
case PP_READ: case PP_READ:
@ -311,12 +307,9 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
ret = -1; ret = -1;
break; break;
} }
break; } else {
default:
DPRINTF("access to unsupported address range (probably ECP)!\n"); DPRINTF("access to unsupported address range (probably ECP)!\n");
ret = 0; ret = 0;
break;
} }
tr->Data.Byte = val; tr->Data.Byte = val;