- initial ECP support

- version number and status update
	- made safe-auto the default for port access

ChangeLog

@@ -1,3 +1,10 @@
+2004-02-20  Stéphane Voltz <svoltz@wanadoo.fr>
+
+	* backend/umax_pp_low.h backend/umax_pp_low.c backend/umax_pp.conf
+	  backend/umax_pp.c tools/umax_pp.c: added initial ECP support for
+	   scanner, laid groundwork for 610P support.
+
+	* backend/mustek_pp_ccd300.c: forgot parameters to wait_bank_change
 2004-02-14  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* doc/descriptions/unsupported.desc: Added HP ScanJet 4670 and

backend/umax_pp.c

@@ -102,8 +102,8 @@
  *  see Changelog
  */
 
-#define UMAX_PP_BUILD	13
+#define UMAX_PP_BUILD	14
-#define UMAX_PP_STATE	"stable"
+#define UMAX_PP_STATE	"dev"
 
 static int num_devices = 0;
 static Umax_PP_Descriptor *devlist = NULL;

backend/umax_pp.conf

@@ -12,7 +12,7 @@ option buffer 2097152
 #
 # the value 'auto' will make the backend find the correct value
 # by itself, it will scan  ppdev, ppi device, then hardware address
-# 'safe-auto' will do the same but wn't do direct hardware access
+# 'safe-auto' will do the same but won't do direct hardware access
 # on linux systems, you may provide the device name of the ppdev character 
 # device : /dev/parport0, /dev/parport1, ......
 #
@@ -22,9 +22,8 @@ option buffer 2097152
 # Possible hardware addresses are 0x378 (lp0)
 # 0x278 (lp2) and 0x3c8 (lp1)
 #
-# default is ppdev since major use of the backend is for linux
 
-port /dev/parport0
+port safe-auto
 
 # the following options are local to this scanner
 # brightness for red channel, if not given, will be automatically computed
@@ -60,6 +59,6 @@ port /dev/parport0
 #
 # by default, no model, we rely on autodetection
 # in case you have black or 'inverted' scans, 
-# you may prevent detection by providing the
+# you may override detection by providing the
 # model number
 #option astra 1220

backend/umax_pp_low.h

@@ -88,9 +88,10 @@ extern void sanei_umax_pp_setauto (int mode);
 
 #define MOTOR_BIT     0x40
 
-#define UMAX_PP_PARPORT_SPP 0x01
+#define UMAX_PP_PARPORT_PS2      0x01
-#define UMAX_PP_PARPORT_EPP 0x02
+#define UMAX_PP_PARPORT_EPP      0x02
-#define UMAX_PP_PARPORT_ECP 0x04
+#define UMAX_PP_PARPORT_EPP_HALF 0x04
+#define UMAX_PP_PARPORT_ECP      0x08
 
 #endif
 

tools/umax_pp.c

@@ -367,7 +367,7 @@ main (int argc, char **argv)
     }
   if (trace)
     {
-      printf ("UMAX 1220P scanning program version 4.1 starting ...\n");
+      printf ("UMAX 1220P scanning program version 5.0 starting ...\n");
 #ifdef HAVE_LINUX_PPDEV_H
       printf ("ppdev character device built-in.\n");
 #endif