config parser to associate ftdi2232 devices with parallel port

diff --git a/config.c b/config.c
index 02c056d299ff92416a408f67f8401129e008d045..e09d5ca8989a96ffc50be23c7f5edb7ddb3f3658 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>

+#include <string.h>

 #include "usb-driver.h"
 #include "parport.h"
 #ifdef JTAGKEY
 #include "usb-driver.h"
 #include "parport.h"
 #ifdef JTAGKEY


@@ -8,11 +9,19 @@
 #endif
 #include "config.h"
 
 #endif
 #include "config.h"
 

+#define LINELEN 1024
+
+#define PARSEERROR fprintf(stderr,"LIBUSB-DRIVER WARNING: Invalid config statement at line %d\n", line)
+

 static struct parport_config pp_config[4];
 
 static void read_config() {
        int i;
 static struct parport_config pp_config[4];
 
 static void read_config() {
        int i;

+       int line, len, num;

        static int config_read = 0;
        static int config_read = 0;

+       FILE *cfg;
+       char buf[LINELEN], *pbuf;
+       unsigned short vid, pid;

 
        if (config_read)
                return;
 
        if (config_read)
                return;


@@ -28,14 +37,144 @@ static void read_config() {
                pp_config[i].transfer = parport_transfer;
        }
 
                pp_config[i].transfer = parport_transfer;
        }
 

+       snprintf(buf, sizeof(buf), "%s/.libusb-driverrc", getenv("HOME"));
+
+       cfg = fopen(buf, "r");
+       if (cfg) {

 #ifdef JTAGKEY
 #ifdef JTAGKEY

-       pp_config[3].real = 0;
-       pp_config[3].usb_vid = 0x0403;
-       pp_config[3].usb_pid = 0xcff8;
-       pp_config[3].open = jtagkey_open;
-       pp_config[3].close = jtagkey_close;
-       pp_config[3].transfer = jtagkey_transfer;
+               line = 0;
+               do {
+                       pbuf = fgets(buf, sizeof(buf), cfg);
+                       if (!pbuf)
+                               break;
+
+                       line++;
+
+                       len = strlen(buf);
+
+                       if (len > 0 && buf[len-1] == '\n') {
+                               buf[len-1] = '\0';
+                               len--;
+                       }
+                       if (len > 0 && buf[len-1] == '\r') {
+                               buf[len-1] = '\0';
+                               len--;
+                       }
+                       
+                       for (i = 0; i < len; i++) {
+                               if (buf[i] != ' ' && buf[i] != '\t')
+                                       break;
+                       }
+
+                       if (buf[i] == '#' || buf[i] == ';' || buf[i] == '\0')
+                               continue;
+
+                       if (!strncasecmp(buf+i, "LPT", 3)) {
+                               unsigned char equal_seen = 0;
+
+                               i += 3;
+                               pbuf = buf+i;
+                               for (; i < len; i++) {
+                                       if (buf[i] == ' ' || buf[i] == '\t' || buf[i] == '=') {
+                                               if (buf[i] == '=')
+                                                       equal_seen = 1;
+
+                                               buf[i] = '\0';
+                                               i++;
+                                               break;
+                                       }
+                               }
+
+                               if (*pbuf == '\0') {
+                                       PARSEERROR;
+                                       continue;
+                               }
+
+                               num = 0;
+                               num = strtol(pbuf, NULL, 10);
+                               if (num < 1) {
+                                       PARSEERROR;
+                                       continue;
+                               }
+                               num--;
+
+                               for (; (i < len) && (!equal_seen) ; i++) {
+                                       if (buf[i] == '=') {
+                                               equal_seen = 1;
+                                               i++;
+                                               break;
+                                       } else if (buf[i] != ' ' && buf[i] != '\t') {
+                                               break;
+                                       }
+                               }
+
+                               if (!equal_seen) {
+                                       PARSEERROR;
+                                       continue;
+                               }
+
+                               for (; i < len; i++) {
+                                       if (buf[i] != ' ' && buf[i] != '\t')
+                                               break;
+                               }
+
+                               if (strncasecmp(buf+i, "FTDI:", 5)) {
+                                       PARSEERROR;
+                                       continue;
+                               }
+
+                               i += 5;
+                               pbuf = buf + i;
+
+                               for (; i < len; i++) {
+                                       if (buf[i] == ':')
+                                               break;
+                               }
+
+                               if (buf[i] != ':') {
+                                       PARSEERROR;
+                                       continue;
+                               }
+
+                               buf[i] = '\0';
+
+                               vid = 0;
+                               vid = strtol(pbuf, NULL, 16);
+                               if (!num) {
+                                       PARSEERROR;
+                                       continue;
+                               }
+
+                               i++;
+                               pbuf = buf + i;
+
+                               for (; i < len; i++) {
+                                       if (buf[i] == ' ' || buf[i] == '\t')
+                                               break;
+                               }
+
+                               pid = 0;
+                               pid = strtol(pbuf, NULL, 16);
+                               if (!num) {
+                                       PARSEERROR;
+                                       continue;
+                               }
+
+                               pp_config[num].real = 0;
+                               pp_config[num].usb_vid = vid;
+                               pp_config[num].usb_pid = pid;
+                               pp_config[num].open = jtagkey_open;
+                               pp_config[num].close = jtagkey_close;
+                               pp_config[num].transfer = jtagkey_transfer;
+                       } else {
+                               PARSEERROR;
+                       }
+               } while (pbuf);
+#else
+               fprintf(stderr,"libusb-driver not compiled with FTDI2232-support, config file ignored!\n");

 #endif
 #endif

+               fclose(cfg);
+       }

 }
 
 struct parport_config *config_get(int num) {
 }
 
 struct parport_config *config_get(int num) {

diff --git a/libusb-driverrc b/libusb-driverrc
new file mode 100644 (file)
index 0000000..98d0e31
--- /dev/null
+++ b/libusb-driverrc
@@ -0,0 +1,6 @@
+# Copy this file to ~/.libusb-driverrc if you want to use FTDI2232 cables
+# All parallel ports not defined in this file are mapped to real ports on the
+# system
+
+# Amontec Jtagkey
+LPT2 = FTDI:0403:cff8

diff --git a/usb-driver.c b/usb-driver.c
index 513fc3e41c5ec9c97123a44f17b65f6188ab86d3..b230afadc917a73ee45741c1faeca029c8975d26 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -245,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);
        switch(request & ~(0xc0000000)) {
                case VERSION:
                        version = (struct version_struct*)(wdheader->data);

-                       strcpy(version->version, "libusb-driver.so $Revision: 1.68 $");
+                       strcpy(version->version, "libusb-driver.so $Revision: 1.69 $");

                        version->versionul = 802;
                        DPRINTF("VERSION\n");
                        break;
                        version->versionul = 802;
                        DPRINTF("VERSION\n");
                        break;


@@ -276,6 +276,9 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #else
 
                                pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
 #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;
                                ret = pport->open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
 
                                ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;