unify parallel and jtagkey interface

[usb-driver] / jtagkey.c

diff --git a/jtagkey.c b/jtagkey.c
index 2490b31e3970e6b8805b23ef7d796cd9d07ab9fb..dec0b8127e59d817768893034c84f9ff568b0f3c 100644 (file)
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -2,6 +2,7 @@
 #include <ftdi.h>
 #include <unistd.h>
 #include "usb-driver.h"
 #include <ftdi.h>
 #include <unistd.h>
 #include "usb-driver.h"

+#include "config.h"

 #include "jtagkey.h"
 
 #define USBBUFSIZE 4096
 #include "jtagkey.h"
 
 #define USBBUFSIZE 4096


@@ -10,7 +11,7 @@ static struct ftdi_context ftdic;
 static unsigned int usb_maxlen = 0;
 static unsigned char bitbang_mode;
 
 static unsigned int usb_maxlen = 0;
 static unsigned char bitbang_mode;
 

-int jtagkey_init(unsigned short vid, unsigned short pid) {
+static int jtagkey_init(unsigned short vid, unsigned short pid) {

        int ret = 0;
        unsigned char c;
 
        int ret = 0;
        unsigned char c;
 


@@ -68,10 +69,23 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
        return ret;
 }
 
        return ret;
 }
 

-void jtagkey_close() {
-       ftdi_disable_bitbang(&ftdic);
-       ftdi_usb_close(&ftdic);
-       ftdi_deinit(&ftdic);
+int jtagkey_open(int num) {
+       int ret;
+
+       ret = jtagkey_init(config_usb_vid(num), config_usb_pid(num));
+
+       if (ret >= 0)
+               ret = 0xff;
+
+       return ret;
+}
+
+void jtagkey_close(int handle) {
+       if (handle == 0xff) {
+               ftdi_disable_bitbang(&ftdic);
+               ftdi_usb_close(&ftdic);
+               ftdi_deinit(&ftdic);
+       }

 }
 
 static int jtagkey_set_bbmode(unsigned char mode) {
 }
 
 static int jtagkey_set_bbmode(unsigned char mode) {