New avision backend - including the auto-generated .desc file.

ChangeLog

@@ -1,3 +1,10 @@
+
+2002-12-01  Rene Rebe <rene.rebe@gmx.net>
+	 * backend/avision.h backend/avision.c backend/avision.conf
+	   doc/descriptions/avision.desc: updated the Avisin backend - 
+	   including auto-generated .desc file listing all devices
+	   also present in the avisino.c device-list.
+
 2002-12-01  Henning Meier-Geinitz <henning@meier-geinitz.de>
 
 	* configure configure.in backend/dll.c: Add dynamic loading support

backend/avision.h

@@ -108,13 +108,28 @@ typedef struct Avision_HWEntry {
   
 } Avision_HWEntry;
 
-enum asic_type {
+typedef enum {
   AV_ASIC_Cx = 0,
   AV_ASIC_C1 = 1,
   AV_ASIC_C2 = 3,
   AV_ASIC_C5 = 5,
   AV_ASIC_OA980 = 128
-};
+} asic_type;
+
+typedef enum {
+  AV_THRESHOLDED,
+  AV_DITHERED,
+  AV_GRAYSCALE,
+  AV_TRUECOLOR,
+  AV_COLOR_MODE_LAST
+} color_mode;
+
+typedef enum {
+  AV_NORMAL,
+  AV_TRANSPARENT,
+  AV_ADF,
+  AV_OPERATION_MODE_LAST
+} operation_mode;
 
 enum Avision_Option
 {
@@ -162,10 +177,8 @@ typedef union Option_Value
 typedef struct Avision_Dimensions
 {
   /* in dpi */
-  int res;
+  int xres;
-  
+  int yres;
-  /* int resx;
-     int rexy; */
   
   /* in pixels */
   long tlx;
@@ -173,9 +186,6 @@ typedef struct Avision_Dimensions
   long brx;
   long bry;
   
-  long width;
-  long height;
-  
   /* in pixels */
   int line_difference;
   
@@ -193,7 +203,7 @@ typedef struct Avision_Device
   SANE_Range y_range;
   SANE_Range speed_range;
 
-  enum asic_type inquiry_asic_type;
+  asic_type inquiry_asic_type;
   SANE_Bool inquiry_new_protocol;
   SANE_Bool inquiry_adf;
   SANE_Bool inquiry_detect_accessories;
@@ -211,14 +221,8 @@ typedef struct Avision_Device
   int inquiry_optical_res;        /* in dpi */
   int inquiry_max_res;            /* in dpi */
   
-  double inquiry_x_range;         /* in mm */
+  double inquiry_x_ranges  [AV_OPERATION_MODE_LAST]; /* in mm */
-  double inquiry_y_range;         /* in mm */
+  double inquiry_y_ranges  [AV_OPERATION_MODE_LAST]; /* in mm */
-  
-  double inquiry_adf_x_range;     /* in mm */
-  double inquiry_adf_y_range;     /* in mm */
-  
-  double inquiry_transp_x_range;  /* in mm */
-  double inquiry_transp_y_range;  /* in mm */
   
   int inquiry_color_boundary;
   int inquiry_gray_boundary;
@@ -268,7 +272,9 @@ typedef struct Avision_Scanner
   SANE_Bool scanning;           /* scan in progress */
   SANE_Parameters params;       /* scan window */
   Avision_Dimensions avdimen;   /* scan window - detailed internals */
-  int mode;
+
+  color_mode c_mode;
+  operation_mode o_mode;
   
   int fd;			/* SCSI filedescriptor */
   pid_t reader_pid;		/* process id of reader */
@@ -277,12 +283,6 @@ typedef struct Avision_Scanner
   
 } Avision_Scanner;
 
-/* modes */
-#define THRESHOLDED 0
-#define DITHERED 1
-#define GRAYSCALE 2
-#define TRUECOLOR 3
-
 /* scsi command defines */
 #define AV_ADF_ON     0x80
 
@@ -547,14 +547,14 @@ typedef struct calibration_format
                             var[2] = ((val) >> 8 ) & 0xff; \
                             var[3] = ((val)      ) & 0xff
 
-#define get_double(var) (*var << 8) + *(var + 1)
+#define get_double(var) ((*var << 8) + *(var + 1))
 
-#define get_triple(var) (*var << 16) + \
+#define get_triple(var) ((*var << 16) + \
-                        (*(var + 1) << 8) + * *var
+                         (*(var + 1) << 8) + * *var)
 
-#define get_quad(var)   (*var << 24) + \
+#define get_quad(var)   ((*var << 24) + \
                          (*(var + 1) << 16) + \
-                        (*(var + 2) << 8) + *(var + 3)
+                         (*(var + 2) << 8) + *(var + 3))
 
 #define BIT(n, p) ((n & ( 1 << p))?1:0)
 

doc/descriptions/avision.desc

@@ -1,5 +1,8 @@
 ; SANE Backend specification file
 ;
+; THIS FILE IS GENERATED FROM THE "avision.c" FILE AUTOMATICALLY - DO NOT EDIT
+; THIS FILE MANUALLY !!!
+;
 ; It's basically emacs-lisp --- so ";" indicates comment to end of line.
 ; All syntactic elements are keyword tokens, followed by a string or
 ;  keyword argument, as specified.
@@ -7,56 +10,168 @@
 ; ":backend" *must* be specified.
 ; All other information is optional (but what good is the file without it?).
 
-:backend "avision"             ; name of backend
+; name of backend
-:version "0.3.1"               ; version of backend
+:backend "avision"
-:status :beta                  ; :alpha, :beta, :stable, :new
-:url "http://drocklinux.dyndns.org/rene/avision/index.html" ; backend's web page
 
-:manpage "sane-avision"        ; name of manpage (if it exists)
+; version of backend
+:version "Build: 55"
+;status: alpha, beta, stable, new
+:status :stable
+
+; backend's web page
+:url "http://drocklinux.dyndns.org/rene/avision/index.html"
+
+; name of manpage (if it exists)
+:manpage "sane-avision"
 
 :devicetype :scanner
 
-:mfg "Avision" ; name a manufacturer
+:mfg "Avision"
-:url "http://www.avision.com/"
+:url "http://www.avision.com"
 
-:model "AV 6240" ; name models for above-specified mfg.
+:model "AV100CS"
 :interface "SCSI"
-:comment "1 pass, ??? DPI"
+:status "untested"
-:model "AV 630 CS"
+:model "AV100IIICS"
 :interface "SCSI"
-:comment "1 pass, 600 DPI"
+:status "untested"
+:model "AV100S"
+:interface "SCSI"
+:status "untested"
+:model "AV240SC"
+:interface "SCSI"
+:status "untested"
+:model "AV260CS"
+:interface "SCSI"
+:status "untested"
+:model "AV360CS"
+:interface "SCSI"
+:status "untested"
+:model "AV363CS"
+:interface "SCSI"
+:status "untested"
+:model "AV420CS"
+:interface "SCSI"
+:status "untested"
+:model "AV6120"
+:interface "SCSI"
+:status "untested"
 :model "AV620CS"
 :interface "SCSI"
-:comment "1 pass, 600 DPI"
+:status "stable"
+:model "AV620CS Plus"
+:interface "SCSI"
+:status "stable"
+:model "AV630CS"
+:interface "SCSI"
+:status "stable"
+:model "AV630CSL"
+:interface "SCSI"
+:status "untested"
+:model "AV6240"
+:interface "SCSI"
+:status "stable"
+:model "AV600U"
+:interface "USB"
+:status "untested"
+:model "AV660S"
+:interface "USB"
+:status "untested"
+:model "AV680S"
+:interface "USB"
+:status "untested"
+:model "AV690U"
+:interface "USB"
+:status "untested"
+:model "AV800S"
+:interface "SCSI"
+:status "untested"
+:model "AV810C"
+:interface "SCSI"
+:status "untested"
+:model "AV820"
+:interface "SCSI"
+:status "untested"
+:model "AV820C"
+:interface "SCSI"
+:status "untested"
+:model "AV820C Plus"
+:interface "SCSI"
+:status "untested"
+:model "AV830C"
+:interface "SCSI"
+:status "untested"
+:model "AV830C Plus"
+:interface "SCSI"
+:status "untested"
+:model "AV880"
+:interface "SCSI"
+:status "untested"
+:model "AV880C"
+:interface "SCSI"
+:status "untested"
+:model "AV8000S"
+:interface "SCSI"
+:status "stable"
+:model "AVA3"
+:interface "SCSI"
+:status "untested"
 
 :mfg "Hewlett-Packard"
-:url "http://www.hp.com/"
+:url "http://www.hp.com"
 
-:model "HP 5300"
+:model "ScanJet 5300C"
 :interface "USB"
-:comment "1 pass, 600 DPI"
+:status "stable"
-:model "HP 5370c"
+:model "ScanJet 5370C"
 :interface "USB"
-:comment "1 pass, 600 DPI"
+:status "alpha"
-:model "HP 7400"
+:model "ScanJet 7400c"
 :interface "USB"
-:comment "1 pass, 1200 DPI"
+:status "alpha"
-:model "HP 7450"
-:interface "USB"
-:comment "1 pass, 1200 DPI"
 
 :mfg "Minolta"
-:url "http://www.minolta.com/"
+:url "http://www.minolta.com"
 
-:model "FS-V1 (Dimage Scan Dual II)"
+:model "FS-V1"
 :interface "USB"
-:comment "1 pass, 2820 DPI, film-scanner"
+:status "alpha"
 
 :mfg "Mitsubishi"
 
-:model "MCA-S600C"
+:model "MCA-ADFC"
 :interface "SCSI"
-
+:status "untested"
-:model "MCA-SS600"
+:model "S1200C"
 :interface "SCSI"
+:status "untested"
+:model "S600C"
+:interface "SCSI"
+:status "untested"
+:model "SS600"
+:interface "SCSI"
+:status "beta"
 
+:mfg "Fujitsu"
+
+:model "ScanPartner"
+:interface "SCSI"
+:status "untested"
+:model "ScanPartner 10"
+:interface "SCSI"
+:status "untested"
+:model "ScanPartner 10C"
+:interface "SCSI"
+:status "untested"
+:model "ScanPartner 15C"
+:interface "SCSI"
+:status "untested"
+:model "ScanPartner 300C"
+:interface "SCSI"
+:status "untested"
+:model "ScanPartner 600C"
+:interface "SCSI"
+:status "untested"
+:model "ScanPartner Jr"
+:interface "SCSI"
+:status "untested"