pixma: some routine maintenance updates to backend and documentation.

ChangeLog

@@ -1,3 +1,7 @@
+2009-12-26  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* doc/sane-pixma.man, backend/pixma.c, backend/pixma_mp150.c:
+	pixma: some routine maintenance updates to backend and documentation.
+
 2009-12-24  Julien Blache <jb@jblache.org>
 	* frontend/saned.c: fix a bug in the standalone polling code.
 

backend/pixma.c

@@ -184,6 +184,12 @@ getenv_atoi (const char *name, int def)
 
 #define CONST_CAST(t,x) (t)(x)
 
+static void
+free_block (const void * ptr)
+{
+  free (CONST_CAST (void *, ptr));
+}
+
 static void
 cleanup_device_list (void)
 {
@@ -192,9 +198,9 @@ cleanup_device_list (void)
       int i;
       for (i = 0; dev_list[i]; i++)
         {
-          free (CONST_CAST (void *, dev_list[i]->name));
-          free (CONST_CAST (void *, dev_list[i]->model));
-          free (CONST_CAST (void *, dev_list[i]));
+          free_block ((const void *) dev_list[i]->name);
+          free_block ((const void *) dev_list[i]->model);
+          free_block ((const void *) dev_list[i]);
         }
     }
   free (dev_list);

backend/pixma_mp150.c

@@ -154,6 +154,7 @@
 #define MP640_PID 0x173f
 #define MP990_PID 0x1740
 
+/* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\
 <cmd xmlns:ivec=\"http://www.canon.com/ns/cmd/2008/07/common/\">\

doc/sane-pixma.man

@@ -1,7 +1,10 @@
-.TH "sane\-pixma" "5" "9 Dec 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "26 Dec 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
-sane\-pixma \- SANE backend for Canon PIXMA MP series
+.B sane\-pixma 
+\- SANE backend for Canon PIXMA Multi-Functions Printers
+.br 
+             MP, MX, ImageCLASS and I-SENSYS series
 .SH DESCRIPTION
 The
 .B sane\-pixma
@@ -63,22 +66,23 @@ ImageCLASS MF3240, MF5630, MF5650, MF5730, MF5750, MF8170c
 \#above, but may still need some work. They are declared in the backend as 
 \#experimental. Snoop logs are required to further investigate, please contact 
 \#the sane\-devel mailing list.
+\#.PP
+\#.RS
+\#PIXMA MX850
+\#.RE
+The backend supports:
 .PP
 .RS
-\#PIXMA MX850
-.RE
-.PP
-The backend supports
-.br
-* resolutions at 75,150,300,600,1200,2400 and 4800 DPI (some maybe buggy),
+* resolutions of 75, 150, 300, 600, 1200, 2400, and 4800 DPI (some maybe buggy),
 .br
 * color and grayscale mode,
 .br
 * a custom gamma table,
 .br
-* Automatic Document Feeder (Duplex for some models).
+* Automatic Document Feeder, Simplex and Duplex.
 .br
 * Transparency Unit, 24 or 48 bits depth.
+.RE
 .PP
 The device name for USB devices is in the form pixma:xxxxyyyy_zzzzz
 where x, y and z are vendor ID, product ID and serial number respectively.
@@ -226,6 +230,13 @@ to "/tmp/config:" would result in directories "tmp/config", ".", and
 .BR sane\-dll (5),
 .I http://home.arcor.de/wittawat/pixma/,
 .I http://mp610.blogspot.com/
+.PP
+In case of trouble with a recent Pixma model, try the latest code for 
+the pixma backend, available in the Sane git repository at:
+.br
+.I http://git.debian.org/?p=sane/sane-backends.git
+.PP
+You can also post into the Sane-devel mailing list for support.
 
 .SH AUTHORS
 Wittawat Yamwong, Nicolas Martin, Dennis Lou, Louis Lagendijk