rename TRENZ define to FORCE_PC3_IDENT and document how to enable the

define

diff --git a/Makefile b/Makefile
index 3325a89f5b026de9a160f90d68e72b97fbdd92c0..1ce1b06b7aef966bbeb54f08e0c9b940e95a70a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,15 @@
-CFLAGS=-Wall -fPIC
+#Add -DFORCE_PC3_IDENT to CFLAGS to force the identification of
+#a Parallel Cable III
+CFLAGS=-Wall -fPIC #-DFORCE_PC3_IDENT
 
-SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so libusb-driver-trenz.so
+SOBJECTS=libusb-driver.so libusb-driver-DEBUG.so
 
 all: $(SOBJECTS)
 
-libusb-driver.so: usb-driver.c usb-driver.h
+libusb-driver.so: usb-driver.c usb-driver.h Makefile
        gcc $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
 
-libusb-driver-trenz.so: usb-driver.c usb-driver.h
-       gcc -DTRENZ $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
-
-libusb-driver-DEBUG.so: usb-driver.c usb-driver.h
+libusb-driver-DEBUG.so: usb-driver.c usb-driver.h Makefile
        gcc -DDEBUG $(CFLAGS) $< -o $@ -ldl -lusb -lpthread -shared
 
 clean:

diff --git a/README b/README
index fcf211a6450369653ae4ee429d1f8538c18c096e..aa4eefedb363f491bfe71105e07f3bbb3c8f005b 100644 (file)
--- a/README
+++ b/README
@@ -73,8 +73,8 @@ To use the device as an ordinary user, put the user in the group 'lp'
 
 
 If you have an almost compatible cable which works with other software but not
-with Impact, try preloading libusb-driver-trenz.so instead of libusb-driver.so.
-It includes a hack by Stefan Ziegenbalg to force detection of a parallel cable.
+with Impact, try adding -DFORCE_PC3_IDENT to the CFLAGS line in the Makefile.
+This enables a hack by Stefan Ziegenbalg to force detection of a parallel cable.
 
 
 Parallel Cable IV is currently only supported in 'compatibility mode', as no

diff --git a/usb-driver.c b/usb-driver.c
index c497b506a86634edfa46f781c0a809ac0a63ae53..a34e5e45347f3639e83f7ac7e3ae19d9fd0292e7 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -282,7 +282,7 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
                switch(tr->cmdTrans) {
                        case PP_READ:
                                ret = ioctl(parportfd, PPRSTATUS, &val);
-#ifdef TRENZ
+#ifdef FORCE_PC3_IDENT
                                val &= 95;
                                if (last_pp_write & 64)
                                        val |= 32;