add other tested software

change some parallel port variables

diff --git a/README b/README
index ae60eebdc5e973a112a752da71c46ad5feaf3d5a..87fe8be309867cd7d781ef56d3be8c0573367a18 100644 (file)
--- a/README
+++ b/README
@@ -11,8 +11,10 @@ the following software:
 
  * ISE Webpack 9.1SP2
  * ISE Webpack 9.1SP1
 
  * ISE Webpack 9.1SP2
  * ISE Webpack 9.1SP1

+ * ISE Webpack 8.2SP3

  * ISE Webpack 8.1SP3
  * ChipScope 9.1.02i
  * ISE Webpack 8.1SP3
  * ChipScope 9.1.02i

+ * EDK 8.2.02i

 
 Build the library by calling `make'.
 
 
 Build the library by calling `make'.
 

diff --git a/usb-driver.c b/usb-driver.c
index 33268f048c7523d7fb2569b4e4c761bceb6eee14..209e1559cc1effd9c11cd2987c9eb294e2ab024a 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -307,8 +307,14 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
                                ret = -1;
                                break;
                }
                                ret = -1;
                                break;
                }

+       } else if ((port == ecpbase + PP_ECP_CFGA) && ecpbase) {
+               DPRINTF("ECP_CFGA port\n");
+       } else if ((port == ecpbase + PP_ECP_CFGB) && ecpbase) {
+               DPRINTF("ECP_CFGB port\n");
+       } else if ((port == ecpbase + PP_ECP_ECR) && ecpbase) {
+               DPRINTF("ECP_ECR port\n");

        } else {
        } else {

-               DPRINTF("access to unsupported address range (probably ECP)!\n");
+               DPRINTF("access to unsupported address range!\n");

                ret = 0;
        }
 
                ret = 0;
        }
 


@@ -390,9 +396,9 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
                                                return ret;
                                        
                                        if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
                                                return ret;
                                        

-                                       if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwBytes) {
+                                       if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr) {

                                                DPRINTF("ECP mode requested\n");
                                                DPRINTF("ECP mode requested\n");

-                                               ecpbase = cr->Card.Item[1].I.IO.dwBytes;
+                                               ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr;

                                                /* TODO: Implement ECP mode */
 #if 0
                                                pmode = IEEE1284_MODE_ECP;
                                                /* TODO: Implement ECP mode */
 #if 0
                                                pmode = IEEE1284_MODE_ECP;

diff --git a/usb-driver.h b/usb-driver.h
index 187be1bb9b6449eb7168b2eba9ebe1519eda6558..3487b7bb631241a5c2c59fe86ac42a8beb4ccf9d 100644 (file)
--- a/usb-driver.h
+++ b/usb-driver.h
@@ -25,6 +25,9 @@
 #define PP_DATA                        0
 #define PP_STATUS              1
 #define PP_CONTROL             2
 #define PP_DATA                        0
 #define PP_STATUS              1
 #define PP_CONTROL             2

+#define PP_ECP_CFGA            0
+#define PP_ECP_CFGB            1
+#define PP_ECP_ECR             2

 #define PP_READ                        10
 #define PP_WRITE               13
 
 #define PP_READ                        10
 #define PP_WRITE               13