Fix problem with ADF-support (hp backend)

backend/hp-handle.c

@@ -426,13 +426,19 @@ sanei_hp_handle_startScan (HpHandle this)
 
     /* HP ScanJet IIp does not support commands ADF scan window */
     /* and unload document. We have to use the usual scan window. */
-    if ( sanei_hp_device_support_get (this->dev->sanedev.name,
-                                      SCL_UNLOAD, &minval, &maxval)
-           != SANE_STATUS_GOOD )
+    /* It turned out that other scanners also do not support unload */
+    /* document, but change document (which is not supported by IIp too) */
+    if (   (sanei_hp_device_support_get (this->dev->sanedev.name,
+                                       SCL_UNLOAD, &minval, &maxval)
+              != SANE_STATUS_GOOD )
+        && (sanei_hp_device_support_get (this->dev->sanedev.name,
+                                       SCL_UNLOAD, &minval, &maxval)
+              != SANE_STATUS_GOOD ) )
     {
 
-      DBG(1, "start: Request for ADF scan without support of unload doc.\n");
-      DBG(1, "       Seems to be a IIp. Use standard scan window command.\n");
+      DBG(1, "start: Request for ADF scan without support of unload doc\n");
+      DBG(1, "       and change doc. Seems to be a IIp.\n");
+      DBG(1, "       Use standard scan window command.\n");
 
       scl = SCL_START_SCAN;
     }

backend/hp.c

@@ -43,9 +43,12 @@
    HP Scanner Control Language (SCL).
 */
 
-static char *hp_backend_version = "0.92";
+static char *hp_backend_version = "0.93";
 /* Changes:
 
+   V 0.93, 04-Dec-2000, PK (peter@kirchgessner.net)
+      - fix problem with ADF-support on ScanJet 6350 (and maybe others)
+
    V 0.92, 03-Oct-2000, Rupert W. Curwen (rcurwen@uk.research.att.com):
       - try to not allocate accessors twice (only for accessors
         that have fixed length)

backend/hp.desc

@@ -10,7 +10,7 @@
 ;
 
 :backend "hp"                     ; name of backend
-:version "0.92"                   ; version of backend
+:version "0.93"                   ; version of backend
 :status :beta                     ; :alpha, :beta, :stable, :new
 :manpage "sane-hp"                ; name of manpage (if it exists)
 :url "http://www.kirchgessner.net/" ; backend's web page