X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/5e3d963bcb6112d798f674b876b167c633ff6b59..3eee002c15edabb57e820b2b79d664cacbdbce56:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index f2f8477..18d6331 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -41,15 +41,12 @@
 #include <sys/ioctl.h>
 #include "usb-driver.h"
 #include "config.h"
-#include "parport.h"
-#ifdef JTAGKEY
-#include "jtagkey.h"
-#endif
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 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;
@@ -248,7 +245,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 	switch(request & ~(0xc0000000)) {
 		case VERSION:
 			version = (struct version_struct*)(wdheader->data);
-			strcpy(version->version, "libusb-driver.so $Revision: 1.67 $");
+			strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION);
 			version->versionul = 802;
 			DPRINTF("VERSION\n");
 			break;
@@ -278,12 +275,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 
-#ifdef JTAGKEY
-				if (!config_is_real_pport((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10))
-					ret = jtagkey_open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
-				else
-#endif
-					ret = parport_open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+				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;
 
@@ -566,14 +562,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-
-#ifdef JTAGKEY
-				if (!config_is_real_pport(ppbase / 0x10)) {
-					ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1);
-					break;
-				}
-#endif /* JTAGKEY */
-				ret = pp_transfer(tr, fd, request, ppbase, ecpbase, 1);
+				ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1);
 #endif
 			}
 			break;
@@ -587,13 +576,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-
-#ifdef JTAGKEY
-				if (!config_is_real_pport(ppbase / 0x10)) {
-					ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, num);
-				} else
-#endif /* JTAGKEY */
-					ret = pp_transfer(tr, fd, request, ppbase, ecpbase, num);
+				ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num);
 #endif
 			}
 			break;
@@ -653,12 +636,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-#ifdef JTAGKEY
-				if (cr->hCard == 0xff)
-					jtagkey_close(cr->hCard);
-				else
-#endif
-					parport_close(cr->hCard);
+				pport->close(cr->hCard);
 #endif
 			}
 			break;
@@ -912,6 +890,9 @@ int access(const char *pathname, int mode) {
 
 	if (!func)
 		func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");
+
+	if (!pathname)
+		return -1;
 	
 	if (!strcmp(pathname, "/dev/windrvr6")) {
 		return 0;