From b975ac1fcdb0002441cb1039422a5b37be6602a2 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Thu, 7 Aug 2008 08:21:51 +0000 Subject: [PATCH] * backend/fujitsu.c, backend/fujitsu.conf.in, doc/descriptions/fujitsu.desc: backend v75 - added fi-6230 ID, updated fi-6130, fi-6230 status --- ChangeLog | 5 +++++ backend/fujitsu.c | 7 ++++++- backend/fujitsu.conf.in | 3 +++ doc/descriptions/fujitsu.desc | 7 ++++--- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 509266db4..741edca7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-07 Rene Rebe + * backend/fujitsu.c, backend/fujitsu.conf.in, + doc/descriptions/fujitsu.desc: backend v75 + - added fi-6230 ID, updated fi-6130, fi-6230 status + 2008-08-05 Julien Blache * frontend/saned.c: initialize runas_{u,g}id to 0 instead of -1; initialize ngroups to 0. diff --git a/backend/fujitsu.c b/backend/fujitsu.c index b280fa2cd..7cf13c9c0 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -368,6 +368,8 @@ - fi-5750C can't handle 10 bit LUT via USB v74 2008-08-02, MAN - replace global scsi blocks with local ones in each function + v75 2008-08-07, ReneR + - added fi-6230 usb ID SANE FLOW DIAGRAM @@ -428,7 +430,7 @@ #include "fujitsu.h" #define DEBUG 1 -#define BUILD 74 +#define BUILD 75 /* values for SANE_DEBUG_FUJITSU env var: - errors 5 @@ -710,6 +712,9 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x114f'\n"); sanei_usb_attach_matching_devices("usb 0x04c5 0x114f", attach_one_usb); + DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1150\n"); + sanei_usb_attach_matching_devices("usb 0x04c5 0x1150", attach_one_usb); + DBG (15, "sane_get_devices: looking for 'usb 0x04c5 0x1155'\n"); sanei_usb_attach_matching_devices("usb 0x04c5 0x1155", attach_one_usb); } diff --git a/backend/fujitsu.conf.in b/backend/fujitsu.conf.in index 8f91704b8..58a75d2d3 100644 --- a/backend/fujitsu.conf.in +++ b/backend/fujitsu.conf.in @@ -69,5 +69,8 @@ usb 0x04c5 0x114d #fi-6130 usb 0x04c5 0x114f +#fi-6230 +usb 0x04c5 0x1150 + #ScanSnap S510 usb 0x04c5 0x1155 diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc index 1ce4e7435..875fc2d0f 100644 --- a/doc/descriptions/fujitsu.desc +++ b/doc/descriptions/fujitsu.desc @@ -126,14 +126,15 @@ :comment "small, current, integrated touchscreen and keyboard" :model "fi-6130" -:interface "SCSI USB" +:interface "USB" :status :good :usbid "0x04c5" "0x114f" :comment "medium, current" :model "fi-6230" -:interface "SCSI USB" -:status :untested +:interface "USB" +:status :good +:usbid "0x04c5" "0x1150" :comment "medium, current" ;==================================================