From 25fd7585d0e714e3833bd2cbd21cd5c7d39344dc Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Sat, 12 Aug 2000 15:09:21 +0000 Subject: [PATCH] Merge devel (v1.0.3) into head branch. --- backend/microtek2.desc | 15 +++++++++++++++ backend/microtek2.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/backend/microtek2.desc b/backend/microtek2.desc index ef925c746..af83f6bc5 100644 --- a/backend/microtek2.desc +++ b/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" diff --git a/backend/microtek2.h b/backend/microtek2.h index a749ff4e6..9978253e0 100644 --- a/backend/microtek2.h +++ b/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 */