canon_dr backend v48

- set another unknown byte in buffermode for ssm2
- add another gettimeofday call at end of do_usb_cmd
- don't print 0 length line in hexdump
- mark DR-7080C as working
- default DR-G1100 and DR-G1130 to 8 meg buffers

backend/canon_dr-cmd.h

@@ -207,6 +207,7 @@ putnbyte (unsigned char *pnt, unsigned int value, unsigned int nbytes)
 /* READ/SEND page codes */
 #define SR_datatype_image		0x00
 #define SR_datatype_lut                 0x03
+#define SR_datatype_pixelsize  		0x80 /*DR-G1130*/
 #define SR_datatype_panel  		0x84
 #define SR_datatype_sensors  		0x8b
 #define SR_datatype_counters 		0x8c

backend/canon_dr.c

@@ -305,6 +305,10 @@
          - add support for DR-M160
       v47 2014-07-07, MAN
          - initial DR-G1130 support
+      v48 2014-08-06, MAN
+         - set another unknown byte in buffermode for ssm2
+         - add another gettimeofday call at end of do_usb_cmd
+         - don't print 0 length line in hexdump
 
    SANE FLOW DIAGRAM
 
@@ -354,7 +358,7 @@
 #include "canon_dr.h"
 
 #define DEBUG 1
-#define BUILD 47
+#define BUILD 48
 
 /* values for SANE_DEBUG_CANON_DR env var:
  - errors           5
@@ -3117,7 +3121,7 @@ ssm_buffer (struct scanner *s)
     set_SSM2_pay_len(cmd, outLen);
   
     memset(out,0,outLen);
-    set_SSM2_BUFF_unk(out, 1);
+    set_SSM2_BUFF_unk(out, !s->buffermode);
     set_SSM2_BUFF_unk2(out, 0x40);
     set_SSM2_BUFF_sync(out, !s->buffermode);
   
@@ -6915,7 +6919,9 @@ do_usb_cmd(struct scanner *s, int runRS, int shortTime,
       free(inBuffer);
     }
 
-    DBG (10, "do_usb_cmd: finish\n");
+    gettimeofday(&timer,NULL);
+
+    DBG (10, "do_usb_cmd: finish %lu %lu\n", (long unsigned int)timer.tv_sec, (long unsigned int)timer.tv_usec);
 
     return ret;
 }
@@ -7239,7 +7245,8 @@ hexdump (int level, char *comment, unsigned char *p, int l)
   }
 
   /* print last (partial) line */
-  DBG (level, "%s\n", line);
+  if (i)
+    DBG (level, "%s\n", line);
 }
 
 /**

backend/canon_dr.conf.in

@@ -171,9 +171,11 @@ usb 0x1083 0x164b
 usb 0x1083 0x164c
 
 # DR-G1130
+option buffer-size 8000000
 usb 0x1083 0x164f
 
 # DR-G1100
+option buffer-size 8000000
 usb 0x1083 0x1650
 
 # DR-C120

doc/descriptions/canon_dr.desc

@@ -226,8 +226,8 @@
 :model "DR-7080C"
 :interface "USB SCSI"
 :usbid "0x04a9" "0x1604"
-:status :untested
-:comment "Please test!"
+:status :good
+:comment "ADF and flatbed work"
 
 :model "DR-7090C"
 :interface "USB SCSI"