[sane-devel] [PATCH] Added support for Avision FB2280E
Paul Wolneykien
manowar at altlinux.org
Thu Nov 25 14:29:43 GMT 2021
It seems to be the same as FB2080E.
Signed-off-by: Paul Wolneykien <manowar at altlinux.org>
---
backend/avision.c | 9 +++++++++
doc/descriptions/avision.desc | 6 ++++++
testsuite/tools/data/ascii.ref | 7 +++++++
testsuite/tools/data/db.ref | 2 ++
testsuite/tools/data/hal-new.ref | 5 +++++
testsuite/tools/data/hal.ref | 5 +++++
testsuite/tools/data/html-backends-split.ref | 15 +++++++++++----
testsuite/tools/data/html-mfgs.ref | 17 ++++++++++++++---
testsuite/tools/data/hwdb.ref | 4 ++++
testsuite/tools/data/plist.ref | 8 ++++++++
testsuite/tools/data/statistics.ref | 4 ++--
testsuite/tools/data/testfile.desc | 6 ++++++
testsuite/tools/data/udev+acl.ref | 2 ++
testsuite/tools/data/udev.ref | 2 ++
testsuite/tools/data/usermap.ref | 2 ++
testsuite/tools/data/xml.ref | 8 ++++++++
16 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/backend/avision.c b/backend/avision.c
index b81578a66..91dd4cafa 100644
--- a/backend/avision.c
+++ b/backend/avision.c
@@ -688,6 +688,15 @@ static Avision_HWEntry Avision_Device_List [] =
/* comment="1 pass, 600 dpi, zero-edge" ASIC 7 */
/* status="basic" */
+ { NULL, NULL,
+ 0x0638, 0x2a1f,
+ "Avision", "FB2280E",
+ 0,
+ { 0, {0, 0}, {{0, 0}, {0, 0}} }
+ },
+ /* comment="1 pass, 600 dpi, zero-edge" ASIC 7 */
+ /* status="basic" */
+
{ "AVISION", "AV8000S",
0, 0,
"Avision", "AV8000S",
diff --git a/doc/descriptions/avision.desc b/doc/descriptions/avision.desc
index b694e899d..839fdb5a4 100644
--- a/doc/descriptions/avision.desc
+++ b/doc/descriptions/avision.desc
@@ -348,6 +348,12 @@
:comment "1 pass, 600 dpi, zero-edge" ASIC 7
:status :basic
+:model "FB2280E"
+:interface "USB"
+:usbid "0x0638" "0x2a1f"
+:comment "1 pass, 600 dpi, zero-edge" ASIC 7
+:status :basic
+
:model "AV8000S"
:interface "SCSI"
:comment "1 pass, 1200 dpi, A3"
diff --git a/testsuite/tools/data/ascii.ref b/testsuite/tools/data/ascii.ref
index c2adbe872..550355458 100644
--- a/testsuite/tools/data/ascii.ref
+++ b/testsuite/tools/data/ascii.ref
@@ -736,6 +736,13 @@ backend `avision'
status basic
url *none*
comment `1 pass, 600 dpi, zero-edge'
+ model `FB2280E'
+ interface `USB'
+ usb-vendor-id `0x0638'
+ usb-product-id `0x2a1f'
+ status basic
+ url *none*
+ comment `1 pass, 600 dpi, zero-edge'
model `AV8000S'
interface `SCSI'
usb-vendor-id *none*
diff --git a/testsuite/tools/data/db.ref b/testsuite/tools/data/db.ref
index 3df3e95da..9eee103a9 100644
--- a/testsuite/tools/data/db.ref
+++ b/testsuite/tools/data/db.ref
@@ -1196,6 +1196,8 @@
0x0638 0x0aa1 root:scanner 0664
# Avision AV210D2+
0x0638 0x1a35 root:scanner 0664
+# Avision FB2280E
+0x0638 0x2a1f root:scanner 0664
# Minolta Elite II
0x0686 0x4004 root:scanner 0664
# Minolta Dimage Scan Dual III
diff --git a/testsuite/tools/data/hal-new.ref b/testsuite/tools/data/hal-new.ref
index fc48a7151..4862dfddb 100644
--- a/testsuite/tools/data/hal-new.ref
+++ b/testsuite/tools/data/hal-new.ref
@@ -3096,6 +3096,11 @@
<append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge>
</match>
+ <!-- Avision FB2280E -->
+ <match key="usb.product_id" int="0x2a1f">
+ <append key="info.capabilities" type="strlist">scanner</append>
+ <merge key="scanner.access_method" type="string">proprietary</merge>
+ </match>
</match>
<match key="usb.vendor_id" int="0x0686">
<!-- Minolta Elite II -->
diff --git a/testsuite/tools/data/hal.ref b/testsuite/tools/data/hal.ref
index 68ef92a99..208b0af13 100644
--- a/testsuite/tools/data/hal.ref
+++ b/testsuite/tools/data/hal.ref
@@ -3096,6 +3096,11 @@
<append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge>
</match>
+ <!-- Avision FB2280E -->
+ <match key="usb.product_id" int="0x2a1f">
+ <append key="info.capabilities" type="strlist">scanner</append>
+ <merge key="scanner.access_method" type="string">proprietary</merge>
+ </match>
</match>
<match key="usb.vendor_id" int="0x0686">
<!-- Minolta Elite II -->
diff --git a/testsuite/tools/data/html-backends-split.ref b/testsuite/tools/data/html-backends-split.ref
index 8d3cdc7aa..f3411297c 100644
--- a/testsuite/tools/data/html-backends-split.ref
+++ b/testsuite/tools/data/html-backends-split.ref
@@ -41,11 +41,11 @@ isn't mentioned in this list at all.</p>
</tr>
<tr>
<td align=center><a href="#SCANNERS">Scanners</a></td>
-<td align=center><font color="#000000">2012</font></td>
-<td align=center><font color="#000000">1205</font></td>
+<td align=center><font color="#000000">2013</font></td>
+<td align=center><font color="#000000">1206</font></td>
<td align=center><font color="#007000">417</font></td>
<td align=center><font color="#90B000">662</font></td>
-<td align=center><font color="#FF9000">101</font></td>
+<td align=center><font color="#FF9000">102</font></td>
<td align=center><font color="#B00000">25</font></td>
<td align=center><font color="#0000B0">325</font></td>
<td align=center><font color="#F00000">482</font></td>
@@ -551,7 +551,7 @@ Siemens
<th align=center>Comment</th>
</tr>
<tr>
-<td align=center rowspan=65>
+<td align=center rowspan=66>
<a href="http://www.avision.com">Avision</a>
<td align=center>AV100CS</td>
<td align=center>SCSI</td>
@@ -952,6 +952,13 @@ Siemens
<td>1 pass, 600 dpi, zero-edge</td>
</tr>
<tr>
+<td align=center>FB2280E</td>
+<td align=center>USB</td>
+<td align=center>0x0638/0x2a1f</td>
+<td align=center><font color="#FF9000">Basic</font></td>
+<td>1 pass, 600 dpi, zero-edge</td>
+</tr>
+<tr>
<td align=center>AV8000S</td>
<td align=center>SCSI</td>
<td align=center> </td>
diff --git a/testsuite/tools/data/html-mfgs.ref b/testsuite/tools/data/html-mfgs.ref
index 157e39444..476ce3cad 100644
--- a/testsuite/tools/data/html-mfgs.ref
+++ b/testsuite/tools/data/html-mfgs.ref
@@ -41,11 +41,11 @@ isn't mentioned in this list at all.</p>
</tr>
<tr>
<td align=center><a href="#SCANNERS">Scanners</a></td>
-<td align=center><font color="#000000">2012</font></td>
-<td align=center><font color="#000000">1205</font></td>
+<td align=center><font color="#000000">2013</font></td>
+<td align=center><font color="#000000">1206</font></td>
<td align=center><font color="#007000">417</font></td>
<td align=center><font color="#90B000">662</font></td>
-<td align=center><font color="#FF9000">101</font></td>
+<td align=center><font color="#FF9000">102</font></td>
<td align=center><font color="#B00000">25</font></td>
<td align=center><font color="#0000B0">325</font></td>
<td align=center><font color="#F00000">482</font></td>
@@ -1781,6 +1781,17 @@ artec_eplus48u<br>(unmaintained)
</td>
<td align=center><a href="man/sane-avision.5.html">sane-avision</a></td>
</tr>
+<tr><td align=center>FB2280E</td>
+<td align=center>USB</td>
+<td align=center>0x0638/0x2a1f</td>
+<td align=center><font color="#FF9000">Basic</font></td>
+<td>1 pass, 600 dpi, zero-edge</td>
+<td align=center>
+<a href="http://skull.piratehaven.org/~mike/sane/avision.html">avision</a>
+<br>(Build: 296)
+</td>
+<td align=center><a href="man/sane-avision.5.html">sane-avision</a></td>
+</tr>
<tr><td align=center>FB6000E</td>
<td align=center>SCSI</td>
<td align=center> </td>
diff --git a/testsuite/tools/data/hwdb.ref b/testsuite/tools/data/hwdb.ref
index 1dd6b2a7d..ef2b90fdc 100644
--- a/testsuite/tools/data/hwdb.ref
+++ b/testsuite/tools/data/hwdb.ref
@@ -2405,6 +2405,10 @@ usb:v0638p0AA1*
usb:v0638p1A35*
libsane_matched=yes
+# Avision FB2280E
+usb:v0638p2A1F*
+ libsane_matched=yes
+
# Minolta Elite II
usb:v0686p4004*
libsane_matched=yes
diff --git a/testsuite/tools/data/plist.ref b/testsuite/tools/data/plist.ref
index 0f2352da1..c39b2f004 100644
--- a/testsuite/tools/data/plist.ref
+++ b/testsuite/tools/data/plist.ref
@@ -4696,6 +4696,14 @@
<key>vendor</key>
<string>0x0638</string>
</dict>
+ <dict>
+ <key>device type</key>
+ <string>scanner</string>
+ <key>product</key>
+ <string>0x2a1f</string>
+ <key>vendor</key>
+ <string>0x0638</string>
+ </dict>
<dict>
<key>device type</key>
<string>scanner</string>
diff --git a/testsuite/tools/data/statistics.ref b/testsuite/tools/data/statistics.ref
index e94dc2234..8dc134d0e 100644
--- a/testsuite/tools/data/statistics.ref
+++ b/testsuite/tools/data/statistics.ref
@@ -1,7 +1,7 @@
Number of known devices:
Scanners:
- Total: 2337
- Supported: 1205 (complete: 417, good: 662, basic: 101, minimal: 25)
+ Total: 2338
+ Supported: 1206 (complete: 417, good: 662, basic: 102, minimal: 25)
Untested: 325
Unsupported: 482
Still cameras:
diff --git a/testsuite/tools/data/testfile.desc b/testsuite/tools/data/testfile.desc
index be78f981a..9885fafae 100644
--- a/testsuite/tools/data/testfile.desc
+++ b/testsuite/tools/data/testfile.desc
@@ -638,6 +638,12 @@
:comment "1 pass, 600 dpi, zero-edge" ASIC 7
:status :basic
+:model "FB2280E"
+:interface "USB"
+:usbid "0x0638" "0x2a1f"
+:comment "1 pass, 600 dpi, zero-edge" ASIC 7
+:status :basic
+
:model "AV8000S"
:interface "SCSI"
:comment "1 pass, 1200 dpi, A3"
diff --git a/testsuite/tools/data/udev+acl.ref b/testsuite/tools/data/udev+acl.ref
index ebe14823a..ae336c3fa 100644
--- a/testsuite/tools/data/udev+acl.ref
+++ b/testsuite/tools/data/udev+acl.ref
@@ -1259,6 +1259,8 @@ ATTR{idVendor}=="0638", ATTR{idProduct}=="0a94", ENV{libsane_matched}="yes"
ATTR{idVendor}=="0638", ATTR{idProduct}=="0aa1", ENV{libsane_matched}="yes"
# Avision AV210D2+
ATTR{idVendor}=="0638", ATTR{idProduct}=="1a35", ENV{libsane_matched}="yes"
+# Avision FB2280E
+ATTR{idVendor}=="0638", ATTR{idProduct}=="2a1f", ENV{libsane_matched}="yes"
# Minolta Elite II
ATTR{idVendor}=="0686", ATTR{idProduct}=="4004", ENV{libsane_matched}="yes"
# Minolta Dimage Scan Dual III
diff --git a/testsuite/tools/data/udev.ref b/testsuite/tools/data/udev.ref
index d68f357a3..762b89461 100644
--- a/testsuite/tools/data/udev.ref
+++ b/testsuite/tools/data/udev.ref
@@ -1259,6 +1259,8 @@ ATTR{idVendor}=="0638", ATTR{idProduct}=="0a94", MODE="0664", GROUP="scanner", E
ATTR{idVendor}=="0638", ATTR{idProduct}=="0aa1", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Avision AV210D2+
ATTR{idVendor}=="0638", ATTR{idProduct}=="1a35", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
+# Avision FB2280E
+ATTR{idVendor}=="0638", ATTR{idProduct}=="2a1f", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Minolta Elite II
ATTR{idVendor}=="0686", ATTR{idProduct}=="4004", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Minolta Dimage Scan Dual III
diff --git a/testsuite/tools/data/usermap.ref b/testsuite/tools/data/usermap.ref
index 0b7281bab..90227c88f 100644
--- a/testsuite/tools/data/usermap.ref
+++ b/testsuite/tools/data/usermap.ref
@@ -1194,6 +1194,8 @@ libusbscanner 0x0003 0x0638 0x0a94 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0
libusbscanner 0x0003 0x0638 0x0aa1 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Avision AV210D2+
libusbscanner 0x0003 0x0638 0x1a35 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Avision FB2280E
+libusbscanner 0x0003 0x0638 0x2a1f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Minolta Elite II
libusbscanner 0x0003 0x0686 0x4004 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Minolta Dimage Scan Dual III
diff --git a/testsuite/tools/data/xml.ref b/testsuite/tools/data/xml.ref
index a6a23b1eb..3f280496c 100644
--- a/testsuite/tools/data/xml.ref
+++ b/testsuite/tools/data/xml.ref
@@ -864,6 +864,14 @@
<url>*none*</url>
<comment>1 pass, 600 dpi, zero-edge</comment>
</model>
+ <model name="FB2280E">
+ <interface>USB</interface>
+ <usbvendorid>0x0638</usbvendorid>
+ <usbproductid>0x2a1f</usbproductid>
+ <status>basic</status>
+ <url>*none*</url>
+ <comment>1 pass, 600 dpi, zero-edge</comment>
+ </model>
<model name="AV8000S">
<interface>SCSI</interface>
<usbvendorid>*none*</usbvendorid>
--
2.33.0
More information about the sane-devel
mailing list