fujitsu backend v140

add initial support for Ricoh scanners

backend/fujitsu.c

@@ -1,12 +1,12 @@
 /* sane - Scanner Access Now Easy.
 
    This file is part of the SANE package, and implements a SANE backend
-   for various Fujitsu scanners.
+   for various Fujitsu and Ricoh scanners.
 
    Copyright (C) 2000 Randolph Bentson
    Copyright (C) 2001 Frederik Ramm
    Copyright (C) 2001-2004 Oliver Schirrmeister
-   Copyright (C) 2003-2022 m. allan noah
+   Copyright (C) 2003-2023 m. allan noah
 
    JPEG output and low memory usage support funded by:
      Archivista GmbH, www.archivista.ch
@@ -616,6 +616,8 @@
       v139 2022-11-15, MAN
          - move updated window_gamma logic to set_window
          - use internal gamma table if possible (fixes #618)
+      v140 2023-03-27, MAN
+         - add initial support for Ricoh scanners
 
    SANE FLOW DIAGRAM
 
@@ -665,7 +667,7 @@
 #include "fujitsu.h"
 
 #define DEBUG 1
-#define BUILD 139
+#define BUILD 140
 
 /* values for SANE_DEBUG_FUJITSU env var:
  - errors           5
@@ -1154,7 +1156,7 @@ connect_fd (struct fujitsu *s)
 }
 
 /*
- * This routine will check if a certain device is a Fujitsu scanner
+ * This routine will check if a certain device is a Fujitsu/Ricoh scanner
  * It also copies interesting data from INQUIRY into the handle structure
  */
 static SANE_Status
@@ -1209,9 +1211,9 @@ init_inquire (struct fujitsu *s)
   for (i = 3; s->version_name[i] == ' ' && i >= 0; i--)
     s->version_name[i] = 0;
 
-  if (strcmp ("FUJITSU", s->vendor_name)) {
+  if (strcmp ("FUJITSU", s->vendor_name) && strcmp ("RICOH", s->vendor_name)) {
     DBG (5, "The device at '%s' is reported to be made by '%s'\n", s->device_name, s->vendor_name);
-    DBG (5, "This backend only supports Fujitsu products.\n");
+    DBG (5, "This backend only supports Fujitsu and Ricoh products.\n");
     return SANE_STATUS_INVAL;
   }
 

backend/fujitsu.conf.in

@@ -15,10 +15,10 @@ scsi FUJITSU
 # To use a specific scsi device
 #scsi /dev/sg1
 
-# For Fujitsu scanners connected via USB on a known device (kernel driver):
+# For scanners connected via USB on a known device (kernel driver):
 #usb /dev/usb/scanner0
 
-# For Fujitsu scanners connected via USB using vendor and device ids (libusb):
+# For scanners connected via USB using vendor and device ids (libusb):
 #usb VENDORID PRODUCTID
 
 # NOTE: if you have to add your device here- please send the id and model
@@ -303,3 +303,12 @@ usb 0x04c5 0x162c
 
 #ScanSnap iX1400
 usb 0x04c5 0x1630
+
+######################################
+# Ricoh-only scanners
+
+#fi-8040
+usb 0x05ca 0x0307
+
+#fi-70F"
+usb 0x05ca 0x0308

doc/descriptions/fujitsu.desc

@@ -11,7 +11,7 @@
 
 
 :backend "fujitsu"               ; name of backend
-:version "139"                   ; version of backend
+:version "140"                   ; version of backend
 :manpage "sane-fujitsu"          ; name of manpage (if it exists)
 :comment "This backend supports most Fujitsu and Ricoh fi-series and similar scanners. See manpage for details."
 :devicetype :scanner             ; start of a list of devices....
@@ -815,3 +815,13 @@
 :status :good
 :usbid "0x04c5" "0x160b"
 
+:model "fi-8040"
+:interface "USB"
+:status :untested
+:usbid "0x05ca" "0x0307"
+
+:model "fi-70F"
+:interface "USB"
+:status :untested
+:usbid "0x05ca" "0x0308"
+

doc/sane-fujitsu.man

@@ -1,16 +1,16 @@
-.TH sane\-fujitsu 5 "15 Nov 2022" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane\-fujitsu 5 "24 Mar 2023" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-fujitsu
 
 .SH NAME
-sane\-fujitsu \- SANE backend for Fujitsu flatbed and ADF scanners
+sane\-fujitsu \- SANE backend for Fujitsu and Ricoh fi series scanners
 
 .SH DESCRIPTION
 The
 .B sane\-fujitsu
 library implements a SANE (Scanner Access Now Easy) backend which provides
-access to most Fujitsu flatbed and ADF scanners.
+access to most Fujitsu flatbed and ADF scanners, and the subsequent Ricoh models.
 
-This document describes backend version 139, which initially shipped with SANE 1.1.2.
+This document describes backend version 140.
 
 .SH SUPPORTED HARDWARE
 This version supports every known model which speaks the Fujitsu SCSI and
@@ -20,14 +20,14 @@ supported.  Please see the list at
 .I http://www.sane\-project.org/sane\-supported\-devices.html
 for details.
 
-This backend may support other Fujitsu scanners. The best
+This backend may support other Fujitsu or newer Ricoh scanners. The best
 way to determine level of support is to test the scanner directly,
 or to collect a trace of the windows driver in action.
 Please contact the author for help or with test results.
 
 .SH UNSUPPORTED HARDWARE
 The following scanners are known NOT to work with this backend,
-either because they have a non\-Fujitsu chipset, or an unsupported
+either because they have an unsupported chipset, or an unsupported
 interface type. Some of these scanners may be supported by another
 backend.
 .PP
@@ -152,7 +152,7 @@ specify one. Probably should not be used with the other "scsi" line above.
 .RS
 Requests backend to search all usb buses in the system for a device
 which uses that vendor and product id. The device will then be queried
-to determine if it is a Fujitsu scanner.
+to determine if it is a supported scanner.
 .RE
 .PP
 "usb /dev/usb/scanner0" (or other device file)