[sane-devel] [PATCH] Added support for Avision FB2280E
Paul Wolneykien
manowar at altlinux.org
Fri Nov 19 11:36:12 GMT 2021
It seems to be the same as FB2080E.
Signed-off-by: Paul Wolneykien <manowar at altlinux.org>
---
sane-backends/backend/avision.c | 9 +++++++++
sane-backends/doc/descriptions/avision.desc | 6 ++++++
sane-backends/testsuite/tools/data/ascii.ref | 7 +++++++
sane-backends/testsuite/tools/data/db.ref | 2 ++
sane-backends/testsuite/tools/data/hal-new.ref | 5 +++++
sane-backends/testsuite/tools/data/hal.ref | 5 +++++
.../testsuite/tools/data/html-backends-split.ref | 7 +++++++
sane-backends/testsuite/tools/data/html-mfgs.ref | 11 +++++++++++
sane-backends/testsuite/tools/data/hwdb.ref | 4 ++++
sane-backends/testsuite/tools/data/testfile.desc | 6 ++++++
sane-backends/testsuite/tools/data/udev+acl.ref | 2 ++
sane-backends/testsuite/tools/data/udev.ref | 2 ++
sane-backends/testsuite/tools/data/usermap.ref | 2 ++
sane-backends/testsuite/tools/data/xml.ref | 8 ++++++++
14 files changed, 76 insertions(+)
diff --git a/sane-backends/backend/avision.c
b/sane-backends/backend/avision.c index e047a7f..635c8c0 100644
--- a/sane-backends/backend/avision.c
+++ b/sane-backends/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/sane-backends/doc/descriptions/avision.desc
b/sane-backends/doc/descriptions/avision.desc index b694e89..839fdb5
100644 --- a/sane-backends/doc/descriptions/avision.desc
+++ b/sane-backends/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/sane-backends/testsuite/tools/data/ascii.ref
b/sane-backends/testsuite/tools/data/ascii.ref index c2adbe8..5503554
100644 --- a/sane-backends/testsuite/tools/data/ascii.ref
+++ b/sane-backends/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/sane-backends/testsuite/tools/data/db.ref
b/sane-backends/testsuite/tools/data/db.ref index 3df3e95..7721737
100644 --- a/sane-backends/testsuite/tools/data/db.ref
+++ b/sane-backends/testsuite/tools/data/db.ref
@@ -1188,6 +1188,8 @@
0x0638 0x0a82 root:scanner 0664
# Avision FB2080E
0x0638 0x0a84 root:scanner 0664
+# Avision FB2280E
+0x0638 0x2a1f root:scanner 0664
# Avision AV122 C2
0x0638 0x0a93 root:scanner 0664
# Avision AV220-G
diff --git a/sane-backends/testsuite/tools/data/hal-new.ref
b/sane-backends/testsuite/tools/data/hal-new.ref index fc48a71..bf8e8bb
100644 --- a/sane-backends/testsuite/tools/data/hal-new.ref
+++ b/sane-backends/testsuite/tools/data/hal-new.ref
@@ -3076,6 +3076,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>
<!-- Avision AV122 C2 -->
<match key="usb.product_id" int="0x0a93">
<append key="info.capabilities"
type="strlist">scanner</append> diff --git
a/sane-backends/testsuite/tools/data/hal.ref
b/sane-backends/testsuite/tools/data/hal.ref index 68ef92a..07f70d9
100644 --- a/sane-backends/testsuite/tools/data/hal.ref +++
b/sane-backends/testsuite/tools/data/hal.ref @@ -3076,6 +3076,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>
<!-- Avision AV122 C2 -->
<match key="usb.product_id" int="0x0a93">
<append key="info.capabilities"
type="strlist">scanner</append> diff --git
a/sane-backends/testsuite/tools/data/html-backends-split.ref
b/sane-backends/testsuite/tools/data/html-backends-split.ref index
8d3cdc7..7fc6ce0 100644 ---
a/sane-backends/testsuite/tools/data/html-backends-split.ref +++
b/sane-backends/testsuite/tools/data/html-backends-split.ref @@ -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/sane-backends/testsuite/tools/data/html-mfgs.ref
b/sane-backends/testsuite/tools/data/html-mfgs.ref index
157e394..7b3436e 100644 ---
a/sane-backends/testsuite/tools/data/html-mfgs.ref +++
b/sane-backends/testsuite/tools/data/html-mfgs.ref @@ -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/sane-backends/testsuite/tools/data/hwdb.ref
b/sane-backends/testsuite/tools/data/hwdb.ref index 1dd6b2a..eb7e932
100644 --- a/sane-backends/testsuite/tools/data/hwdb.ref
+++ b/sane-backends/testsuite/tools/data/hwdb.ref
@@ -2389,6 +2389,10 @@ usb:v0638p0A82*
usb:v0638p0A84*
libsane_matched=yes
+# Avision FB2280E
+usb:v0638p2A1F*
+ libsane_matched=yes
+
# Avision AV122 C2
usb:v0638p0A93*
libsane_matched=yes
diff --git a/sane-backends/testsuite/tools/data/testfile.desc
b/sane-backends/testsuite/tools/data/testfile.desc index
be78f98..9885faf 100644 ---
a/sane-backends/testsuite/tools/data/testfile.desc +++
b/sane-backends/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/sane-backends/testsuite/tools/data/udev+acl.ref
b/sane-backends/testsuite/tools/data/udev+acl.ref index
ebe1482..cbcaf89 100644 ---
a/sane-backends/testsuite/tools/data/udev+acl.ref +++
b/sane-backends/testsuite/tools/data/udev+acl.ref @@ -1251,6 +1251,8 @@
ATTR{idVendor}=="0638", ATTR{idProduct}=="0a68",
ENV{libsane_matched}="yes" ATTR{idVendor}=="0638",
ATTR{idProduct}=="0a82", ENV{libsane_matched}="yes" # Avision FB2080E
ATTR{idVendor}=="0638", ATTR{idProduct}=="0a84",
ENV{libsane_matched}="yes" +# Avision FB2280E +ATTR{idVendor}=="0638",
ATTR{idProduct}=="2a1f", ENV{libsane_matched}="yes" # Avision AV122 C2
ATTR{idVendor}=="0638", ATTR{idProduct}=="0a93",
ENV{libsane_matched}="yes" # Avision AV220-G
diff --git a/sane-backends/testsuite/tools/data/udev.ref
b/sane-backends/testsuite/tools/data/udev.ref index d68f357..a7a8fe3
100644 --- a/sane-backends/testsuite/tools/data/udev.ref
+++ b/sane-backends/testsuite/tools/data/udev.ref
@@ -1251,6 +1251,8 @@ ATTR{idVendor}=="0638", ATTR{idProduct}=="0a68",
MODE="0664", GROUP="scanner", E ATTR{idVendor}=="0638",
ATTR{idProduct}=="0a82", MODE="0664", GROUP="scanner",
ENV{libsane_matched}="yes" # Avision FB2080E ATTR{idVendor}=="0638",
ATTR{idProduct}=="0a84", MODE="0664", GROUP="scanner",
ENV{libsane_matched}="yes" +# Avision FB2280E +ATTR{idVendor}=="0638",
ATTR{idProduct}=="2a1f", MODE="0664", GROUP="scanner",
ENV{libsane_matched}="yes" # Avision AV122 C2 ATTR{idVendor}=="0638",
ATTR{idProduct}=="0a93", MODE="0664", GROUP="scanner",
ENV{libsane_matched}="yes" # Avision AV220-G diff --git
a/sane-backends/testsuite/tools/data/usermap.ref
b/sane-backends/testsuite/tools/data/usermap.ref index 0b7281b..36f0e28
100644 --- a/sane-backends/testsuite/tools/data/usermap.ref +++
b/sane-backends/testsuite/tools/data/usermap.ref @@ -1186,6 +1186,8 @@
libusbscanner 0x0003 0x0638 0x0a68 0x0000 0x0000 0x00 0x00 0x00 0x00
0x00 0x00 0 libusbscanner 0x0003 0x0638 0x0a82 0x0000 0x0000 0x00 0x00
0x00 0x00 0x00 0x00 0x00000000 # Avision FB2080E libusbscanner 0x0003
0x0638 0x0a84 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +#
Avision FB2280E +libusbscanner 0x0003 0x0638 0x2a1f 0x0000 0x0000 0x00
0x00 0x00 0x00 0x00 0x00 0x00000000 # Avision AV122 C2
libusbscanner 0x0003 0x0638 0x0a93 0x0000 0x0000 0x00 0x00 0x00 0x00
0x00 0x00 0x00000000 # Avision AV220-G
diff --git a/sane-backends/testsuite/tools/data/xml.ref
b/sane-backends/testsuite/tools/data/xml.ref index a6a23b1..3f28049
100644 --- a/sane-backends/testsuite/tools/data/xml.ref
+++ b/sane-backends/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.29.3
More information about the sane-devel
mailing list