Merge devel (v1.0.3) into head branch.

backend/microtek2.desc

@@ -8,20 +8,35 @@
 :mfg "Microtek"                   ; name a manufacturer
 :url "http://www.microtek.com/"
 :model "parallel models unsupported"
+:interface "Parport"
 :model "ScanMaker V300"
+:interface "SCSI"
 :model "ScanMaker V310"
+:interface "SCSI"
 :model "ScanMaker V600"
+:interface "SCSI"
 :model "ScanMaker E3plus"         ; name models for above-specified mfg.
+:interface "SCSI"
 :model "ScanMaker X6"
+:interface "SCSI"
 :model "ScanMaker X6EL"
+:interface "SCSI"
+:model "ScanMaker X6USB"
+:interface "USB"
 :model "ScanMaker 330"
+:interface "SCSI"
 :model "ScanMaker 630"
+:interface "SCSI"
 :model "ScanMaker 636"
+:interface "SCSI"
 :model "ScanMaker 9600XL"
+:interface "SCSI"
 :comment "only flatbed mode ?"
 :model "Phantom 636"
+:interface "SCSI"
 
 :mfg "Vobis"
 :url "http://www.vobis.de/"
 :model "HighScan"                 ; name models for above-specified mfg.
+:interface "SCSI"
 :comment "only E3plus based models"

backend/microtek2.h

@@ -778,6 +778,8 @@ typedef struct Microtek2_Device {
 #define MD_OFFSET_2                  256  /* Image data starts 2 bytes */
                                           /* from the beginning of a */
                                           /* scanline */
+#define MD_X6_SHORT_TRANSFER	     512  /* X6 USB crashes if you read
+					     too much */
 
     u_int32_t n_control_bytes;            /* for read_control_bits; the */
                                           /* number is model dependent */