+ Added support for HP ScanJet 4570c (thanks to Markham Thomas)

ChangeLog

@@ -1,3 +1,9 @@
+2008-06-19 Ilia Sotnikov <hostcc@gmail.com>
+	* backend/hp5590.c, backend/hp5590_cmds.c, backend/hp5590_cmds.h
+	* backend/hp5590_low.c, backend/hp5590_low.h
+	* doc/descriptions/hp5590.desc, doc/sane-hp5590.man:
+	Added support for HP ScanJet 4570c (thanks to Markham Thomas)
+
 2008-06-15  Nicolas Martin <nicols-guest at users.alioth.debian.org>
 	* doc/sane-pixma.man,
 	* backend/pixma.c, backend/pixma_mp150.c, backend/pixma_sane_options.c

backend/hp5590.c

@@ -1,5 +1,6 @@
 /* sane - Scanner Access Now Easy.
    Copyright (C) 2007 Ilia Sotnikov <hostcc@gmail.com>
+   HP ScanJet 4570c support by Markham Thomas
    This file is part of the SANE package.
 
    This program is free software; you can redistribute it and/or
@@ -38,7 +39,7 @@
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
 
-   This file is part of a SANE backend for HP 5550/5590/7650 Scanners
+   This file is part of a SANE backend for HP 4570/5550/5590/7650 Scanners
 */
 
 #include "sane/config.h"
@@ -71,7 +72,7 @@
 }
 
 /* #define HAS_WORKING_COLOR_48 */
-#define BUILD 		2
+#define BUILD 		3
 #define USB_TIMEOUT	30 * 1000
 
 static SANE_Word
@@ -280,6 +281,13 @@ attach_usb_device (SANE_String_Const devname,
   return SANE_STATUS_GOOD;
 }
 
+/******************************************************************************/
+static SANE_Status
+attach_hp4570 (SANE_String_Const devname)
+{
+  return attach_usb_device (devname, SCANNER_HP4570);
+}
+
 /******************************************************************************/
 static SANE_Status
 attach_hp5550 (SANE_String_Const devname)
@@ -310,7 +318,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
   
   DBG_INIT();
   
-  DBG (1, "SANE backed for HP 5550/5590/7650 %u.%u.%u\n", V_MAJOR, V_MINOR, BUILD);
+  DBG (1, "SANE backed for HP 4570/5550/5590/7650 %u.%u.%u\n", V_MAJOR, V_MINOR, BUILD);
   DBG (1, "(c) Ilia Sotnikov <hostcc@gmail.com>\n");
 
   if (version_code)
@@ -322,6 +330,14 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize
 
   scanners_list = NULL;
 
+  ret = hp5590_vendor_product_id (SCANNER_HP4570, &vendor_id, &product_id);
+  if (ret != SANE_STATUS_GOOD)
+    return ret;
+
+  ret = sanei_usb_find_devices (vendor_id, product_id, attach_hp4570);
+  if (ret != SANE_STATUS_GOOD)
+    return ret;
+
   ret = hp5590_vendor_product_id (SCANNER_HP5550, &vendor_id, &product_id);
   if (ret != SANE_STATUS_GOOD)
     return ret;

backend/hp5590_cmds.c

@@ -1,5 +1,6 @@
 /* sane - Scanner Access Now Easy.
    Copyright (C) 2007 Ilia Sotnikov <hostcc@gmail.com>
+   HP ScanJet 4570c support by Markham Thomas
    This file is part of the SANE package.
 
    This program is free software; you can redistribute it and/or
@@ -38,7 +39,7 @@
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
 
-   This file is part of a SANE backend for HP 5550/5590/7650 Scanners
+   This file is part of a SANE backend for HP 4570/5550/5590/7650 Scanners
 */
 
 #include "sane/config.h"
@@ -68,6 +69,11 @@ struct hp5590_model
 
 static const struct hp5590_model
 hp5590_models[] = {
+  {
+    SCANNER_HP4570,
+    0x03f0, 0x1305, "SILITEKIElwood",
+    "4570", "Workgroup scanner"
+  },
   {
     SCANNER_HP5550,
     0x03f0, 0x1205, "SILITEKIPenguin",

backend/hp5590_cmds.h

@@ -1,5 +1,6 @@
 /* sane - Scanner Access Now Easy.
    Copyright (C) 2007 Ilia Sotnikov <hostcc@gmail.com>
+   HP ScanJet 4570c support by Markham Thomas
    This file is part of the SANE package.
 
    This program is free software; you can redistribute it and/or
@@ -38,7 +39,7 @@
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
 
-   This file is part of a SANE backend for HP 5550/5590/7650 Scanners
+   This file is part of a SANE backend for HP 4570/5550/5590/7650 Scanners
 */
 
 #ifndef HP5590_H
@@ -52,6 +53,7 @@
 enum hp_scanner_types
 {
   SCANNER_NONE = 0,
+  SCANNER_HP4570,
   SCANNER_HP5550,
   SCANNER_HP5590,
   SCANNER_HP7650

backend/hp5590_low.c

@@ -38,7 +38,7 @@
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
 
-   This file is part of a SANE backend for HP 5550/5590/7650 Scanners
+   This file is part of a SANE backend for HP 4570/5550/5590/7650 Scanners
 */
 
 #include "sane/config.h"

backend/hp5590_low.h

@@ -38,7 +38,7 @@
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
 
-   This file is part of a SANE backend for HP 5550/5590/7650 Scanners
+   This file is part of a SANE backend for HP 4570/5550/5590/7650 Scanners
 */
 
 #ifndef HP5590_LOW_H

doc/descriptions/hp5590.desc

@@ -17,6 +17,12 @@
 :mfg "Hewlett-Packard"
 :url "http://www.hp.com"
 
+:model "ScanJet 4570C"
+:interface "USB"
+:usbid "0x03f0" "0x1305"
+:status :basic
+:comment "Lineart/grayscale/color (24 bit), 100/200/300/600/1200/2400 DPI, flatbed/TMA slides/TMA negatives"
+
 :model "ScanJet 5550C"
 :interface "USB"
 :usbid "0x03f0" "0x1205"

doc/sane-hp5590.man

@@ -9,6 +9,8 @@ library implements a SANE (Scanner Access Now Easy) backend that provides
 access to the following Hewlett-Packard Workgroup/Document scanners:
 .PP
 .RS
+ScanJet 4570
+.br
 ScanJet 5550
 .br
 ScanJet 5590