* backend/canon_dr.[ch], backend/canon_dr.conf.in: backend v24

- fix DR-2510C duplex deinterlacing code
- rewrite sane_read helpers to read until EOF
- update sane_start for scanners that dont use object_position
- dont call sanei_usb_clear_halt() if device is not open
- increase default buffer size to 4 megs
- set buffermode on by default
- hide modes and resolutions that DR-2510C lies about
- read_panel() logs front-end access to sensors instead of timing
- rewrite do_usb_cmd() to use remainder from RS info
* doc/desciptions/canon_dr.desc: backend v24, update DR-2510C comment

ChangeLog

@@ -1,5 +1,18 @@
-2009-03-06 Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
-	* backend/pixma_bjnp.c 
+2009-04-05  m. allan noah <kitno455 a t gmail d o t com>
+	* backend/canon_dr.[ch], backend/canon_dr.conf.in: backend v24
+	- fix DR-2510C duplex deinterlacing code
+	- rewrite sane_read helpers to read until EOF
+	- update sane_start for scanners that dont use object_position
+	- dont call sanei_usb_clear_halt() if device is not open
+	- increase default buffer size to 4 megs
+	- set buffermode on by default
+	- hide modes and resolutions that DR-2510C lies about
+	- read_panel() logs front-end access to sensors instead of timing
+	- rewrite do_usb_cmd() to use remainder from RS info
+	* doc/desciptions/canon_dr.desc: backend v24, update DR-2510C comment
+
+2009-03-31 Louis Lagendijk  <llagendijk-guest at users.alioth.debian.org>
+	* backend/pixma_bjnp.c:
 	- silenced some debug statements during scanner detections
 	- increased timeouts to 20 seconds as 10 seconds is apparently
 	- not enough for the combination of a Mac and an MX850.

backend/canon_dr.conf.in

@@ -15,8 +15,8 @@
 
 #######################################################################
 # Set data buffer size, in bytes. The value ranges from 4096 - infinity
-# but you may have scanning problems with a value larger than default (64k)
-#option buffer-size 65536
+# large values may cause timeouts, small causes slow scans. 4MB default
+#option buffer-size 4194304
 
 #######################################################################
 # Most scanners dont pad their reads

backend/canon_dr.h

@@ -148,6 +148,7 @@ struct scanner
   int rgb_format;       /* meaning unknown */
   int padding;          /* meaning unknown */
 
+  int always_op;        /* send object pos between pages */
   int invert_tly;       /* weird bug in some smaller scanners */
   int unknown_byte2;    /* weird byte, required, meaning unknown */
   int padded_read;      /* some machines need extra 12 bytes on reads */
@@ -262,9 +263,13 @@ struct scanner
   int reading;
   int cancelled;
   int side;
+  int prev_page;
   int jpeg_stage;
   int jpeg_ff_offset;
 
+  /* scanner done yet? */
+  int eof_rx[2];
+
   /* total to read/write */
   int bytes_tot[2];
 
@@ -285,7 +290,6 @@ struct scanner
   /* --------------------------------------------------------------------- */
   /* values used to hold hardware or control panel status                  */
 
-  time_t last_panel;
   int panel_start;
   int panel_stop;
   int panel_new_file;
@@ -293,6 +297,9 @@ struct scanner
   int panel_bypass_mode;
   int panel_enable_led;
   int panel_counter;
+
+  /* values which are used to track the frontend's access to sensors  */
+  char hw_read[NUM_OPTIONS-OPT_START];
 };
 
 #define CONNECTION_SCSI   0 /* SCSI interface */
@@ -448,7 +455,7 @@ do_usb_cmd(struct scanner *s, int runRS, int shortTime,
  unsigned char * inBuff, size_t * inLen
 );
 
-static SANE_Status do_usb_clear(struct scanner *s, int runRS);
+static SANE_Status do_usb_clear(struct scanner *s, int clear, int runRS);
 
 static SANE_Status wait_scanner (struct scanner *s);
 
@@ -463,7 +470,7 @@ static int get_page_height (struct scanner *s);
 
 static SANE_Status set_window (struct scanner *s);
 
-static SANE_Status read_panel(struct scanner *s);
+static SANE_Status read_panel(struct scanner *s, SANE_Int option);
 static SANE_Status send_panel(struct scanner *s);
 
 static SANE_Status start_scan (struct scanner *s);

doc/descriptions/canon_dr.desc

@@ -11,7 +11,7 @@
 
 :backend "canon_dr"              ; name of backend
 :url "http://www.thebility.com/canon/" 
-:version "23"                    ; version of backend
+:version "24"                    ; version of backend
 :manpage "sane-canon_dr"         ; name of manpage (if it exists)
 :comment "New backend as of SANE release 1.1.0, testers needed, see manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -81,7 +81,7 @@
 :interface "USB"
 :usbid "0x1083" "0x1617"
 :status :basic
-:comment "Gray/Color, Simplex/Duplex working. Poor calibration, only full-width scans."
+:comment "Gray/Color, Simplex/Duplex, 300/600dpi working. Poor calibration, only full-width scans."
 
 :model "DR-2580C"
 :interface "USB SCSI"