kvs1025 backend v3, usb bugfixes

ChangeLog

@@ -1,9 +1,13 @@
+2010-04-16 m. allan noah <kitno455 at gmail dot com>
+	* backend/kvs1025*, kvs1025.desc, sane-kvs1025.man: backend v3
+	- invert usb status, add 0x to usbids, add missing KV-S1045 usbid
+
 2010-04-12  Nicolas Martin <nicols-guest at users.alioth.debian.org>
 	* backend/pixma_mp150.c, backend/pixma_io_sanei.c, 
 	doc/descriptions/pixma.desc, doc/sane-pixma.man:
 	pixma: added changes from Gernot Hassenpflug to fully support
-	       Canoscan 8800F.
-	       debug code clean-up in pixma_mp150.c
+	Canoscan 8800F.
+	debug code clean-up in pixma_mp150.c
 
 2010-04-12 Chris Bagwell <chris at cnpbagwell dot com>
 	* backend/p5.c, backend/p5_device.c, backend/p5.h: 

backend/kvs1025.h

@@ -16,7 +16,7 @@
 #define BACKEND_NAME          kvs1025
 
 /* Build version */
-#define V_BUILD            2
+#define V_BUILD            3
 
 /* Paper range supported -- MAX A4 */
 #define KV_MAX_X_RANGE     210

backend/kvs1025_low.h

@@ -15,7 +15,8 @@
 typedef enum
 {
   KV_S1020C = 0x1007,
-  KV_S1025C = 0x1006
+  KV_S1025C = 0x1006,
+  KV_S1045C = 0x1010
 } KV_MODEL_TYPE;
 
 /* Store an integer in 2, 3 or 4 byte in a big-endian array. */

backend/kvs1025_usb.c

@@ -106,10 +106,13 @@ kv_usb_enum_devices ()
 
   sanei_usb_init();
 
-  sprintf(usb_str,"usb %04x %04x",VENDOR_ID,KV_S1025C);
+  sprintf(usb_str,"usb %#04x %#04x",VENDOR_ID,KV_S1020C);
   sanei_usb_attach_matching_devices(usb_str, attach_scanner_usb);
 
-  sprintf(usb_str,"usb %04x %04x",VENDOR_ID,KV_S1020C);
+  sprintf(usb_str,"usb %#04x %#04x",VENDOR_ID,KV_S1025C);
+  sanei_usb_attach_matching_devices(usb_str, attach_scanner_usb);
+
+  sprintf(usb_str,"usb %#04x %#04x",VENDOR_ID,KV_S1045C);
   sanei_usb_attach_matching_devices(usb_str, attach_scanner_usb);
 
   for (pd = g_devices; pd; pd=pd->next) {
@@ -215,7 +218,7 @@ kv_usb_escape (PKV_DEV dev,
 
   /* Send command */
   len = 24;
-  if (!sanei_usb_write_bulk (dev->usb_fd, (SANE_Byte *) cmd_buff, &len))
+  if (sanei_usb_write_bulk (dev->usb_fd, (SANE_Byte *) cmd_buff, &len))
     {
       DBG (DBG_error, "usb_bulk_write: Error writing command.\n");
       hexdump (DBG_error, "cmd block", cmd_buff, 24);

doc/descriptions/kvs1025.desc

@@ -10,7 +10,7 @@
 ;
 
 :backend "kvs1025"               ; name of backend
-:version "2"                     ; version of backend
+:version "3"                     ; version of backend
 :manpage "sane-kvs1025"          ; name of manpage (if it exists)
 :comment "New backend for SANE release 1.0.21, see sane-kvs1025 manpage"
 :devicetype :scanner             ; start of a list of devices....
@@ -27,3 +27,8 @@
 :interface "USB"
 :usbid "0x04da" "0x1006"
 :status :good
+
+:model "KV-S1045C"
+:interface "USB"
+:usbid "0x04da" "0x1010"
+:status :good

doc/sane-kvs1025.man

@@ -1,4 +1,4 @@
-.TH sane\-kvs1025 5 "25 Mar 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-kvs1025 5 "16 Apr 2010" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-kvs1025
 
 .SH NAME
@@ -8,7 +8,7 @@ sane\-kvs1025 \- SANE backend for Panasonic KV-S102xC USB ADF scanners.
 The 
 .B sane\-kvs1025
 library implements a SANE (Scanner Access Now Easy) backend which
-provides access to the Panasonic KV-S1020C and KV-S1025C scanners.
+provides access to the Panasonic KV-S1020C/1025C and KV-S1045C scanners.
 
 .SH KNOWN ISSUES
 This document was written by the SANE project, which has no information