mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: renamed HP ScanJet 3670C to 3670. Model has no C suffix

merge-requests/317/merge
Ralph Little 2020-01-07 22:52:14 -08:00
rodzic 88ea0d48e7
commit c4a88e6bf4
16 zmienionych plików z 24 dodań i 24 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/genesys.conf.in
Wyświetl plik

@ -11,7 +11,7 @@
# Hewlett Packard ScanJet 2400c # Hewlett Packard ScanJet 2400c
usb 0x03f0 0x0a01 usb 0x03f0 0x0a01
# Hewlett Packard ScanJet 3670c/3690c # Hewlett Packard ScanJet 3670/3690c
usb 0x03f0 0x1405 usb 0x03f0 0x1405
# Plustek OpticPro ST24 # Plustek OpticPro ST24

2
backend/genesys/enums.h
Wyświetl plik

@ -192,7 +192,7 @@ enum class ModelId : unsigned
DCT_DOCKETPORT_487, DCT_DOCKETPORT_487,
HP_SCANJET_2300C, HP_SCANJET_2300C,
HP_SCANJET_2400C, HP_SCANJET_2400C,
HP_SCANJET_3670C, HP_SCANJET_3670,
HP_SCANJET_4850C, HP_SCANJET_4850C,
HP_SCANJET_G4010, HP_SCANJET_G4010,
HP_SCANJET_G4050, HP_SCANJET_G4050,

6
backend/genesys/tables_model.cpp
Wyświetl plik

@ -1467,10 +1467,10 @@ void genesys_init_usb_device_tables()
model = Genesys_Model(); model = Genesys_Model();
model.name = "hewlett-packard-scanjet-3670c"; model.name = "hewlett-packard-scanjet-3670";
model.vendor = "Hewlett Packard"; model.vendor = "Hewlett Packard";
model.model = "ScanJet 3670c"; model.model = "ScanJet 3670";
model.model_id = ModelId::HP_SCANJET_3670C; model.model_id = ModelId::HP_SCANJET_3670;
model.asic_type = AsicType::GL646; model.asic_type = AsicType::GL646;
model.resolutions = { model.resolutions = {

4
doc/descriptions/genesys.desc
Wyświetl plik

@ -79,7 +79,7 @@
:status :basic :status :basic
:comment "clone of the HP 2400C" :comment "clone of the HP 2400C"
:model "ScanJet 3670C" :model "ScanJet 3670"
:interface "USB" :interface "USB"
:usbid "0x03f0" "0x1405" :usbid "0x03f0" "0x1405"
:status :complete :status :complete
@ -89,7 +89,7 @@
:interface "USB" :interface "USB"
:usbid "0x03f0" "0x1405" :usbid "0x03f0" "0x1405"
:status :complete :status :complete
:comment "1200x1200 dpi max, same as HP 3670C" :comment "1200x1200 dpi max, same as HP 3670"
:model "ScanJet 4850C" :model "ScanJet 4850C"
:interface "USB" :interface "USB"

4
testsuite/tools/data/ascii.ref
Wyświetl plik

@ -5709,7 +5709,7 @@ backend `genesys'
status basic status basic
url *none* url *none*
comment `clone of the HP 2400C' comment `clone of the HP 2400C'
model `ScanJet 3670C' model `ScanJet 3670'
interface `USB' interface `USB'
usb-vendor-id `0x03f0' usb-vendor-id `0x03f0'
usb-product-id `0x1405' usb-product-id `0x1405'
@ -5722,7 +5722,7 @@ backend `genesys'
usb-product-id `0x1405' usb-product-id `0x1405'
status complete status complete
url *none* url *none*
comment `1200x1200 dpi max, same as HP 3670C' comment `1200x1200 dpi max, same as HP 3670'
model `ScanJet 4850C' model `ScanJet 4850C'
interface `USB' interface `USB'
usb-vendor-id `0x03f0' usb-vendor-id `0x03f0'

2
testsuite/tools/data/db.ref
Wyświetl plik

@ -66,7 +66,7 @@
0x03f0 0x1205 root:scanner 0664 0x03f0 0x1205 root:scanner 0664
# Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
0x03f0 0x1305 root:scanner 0664 0x03f0 0x1305 root:scanner 0664
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C # Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
0x03f0 0x1405 root:scanner 0664 0x03f0 0x1405 root:scanner 0664
# Hewlett-Packard ScanJet 5590 # Hewlett-Packard ScanJet 5590
0x03f0 0x1705 root:scanner 0664 0x03f0 0x1705 root:scanner 0664

2
testsuite/tools/data/hal-new.ref
Wyświetl plik

@ -175,7 +175,7 @@
<append key="info.capabilities" type="strlist">scanner</append> <append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge> <merge key="scanner.access_method" type="string">proprietary</merge>
</match> </match>
<!-- Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C --> <!-- Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C -->
<match key="usb.product_id" int="0x1405"> <match key="usb.product_id" int="0x1405">
<append key="info.capabilities" type="strlist">scanner</append> <append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge> <merge key="scanner.access_method" type="string">proprietary</merge>

2
testsuite/tools/data/hal.ref
Wyświetl plik

@ -175,7 +175,7 @@
<append key="info.capabilities" type="strlist">scanner</append> <append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge> <merge key="scanner.access_method" type="string">proprietary</merge>
</match> </match>
<!-- Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C --> <!-- Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C -->
<match key="usb.product_id" int="0x1405"> <match key="usb.product_id" int="0x1405">
<append key="info.capabilities" type="strlist">scanner</append> <append key="info.capabilities" type="strlist">scanner</append>
<merge key="scanner.access_method" type="string">proprietary</merge> <merge key="scanner.access_method" type="string">proprietary</merge>

4
testsuite/tools/data/html-backends-split.ref
Wyświetl plik

@ -5991,7 +5991,7 @@ Kyocera
<td>clone of the HP 2400C</td> <td>clone of the HP 2400C</td>
</tr> </tr>
<tr> <tr>
<td align=center>ScanJet 3670C</td> <td align=center>ScanJet 3670</td>
<td align=center>USB</td> <td align=center>USB</td>
<td align=center>0x03f0/0x1405</td> <td align=center>0x03f0/0x1405</td>
<td align=center><font color="#007000">Complete</font></td> <td align=center><font color="#007000">Complete</font></td>
@ -6002,7 +6002,7 @@ Kyocera
<td align=center>USB</td> <td align=center>USB</td>
<td align=center>0x03f0/0x1405</td> <td align=center>0x03f0/0x1405</td>
<td align=center><font color="#007000">Complete</font></td> <td align=center><font color="#007000">Complete</font></td>
<td>1200x1200 dpi max, same as HP 3670C</td> <td>1200x1200 dpi max, same as HP 3670</td>
</tr> </tr>
<tr> <tr>
<td align=center>ScanJet 4850C</td> <td align=center>ScanJet 4850C</td>

4
testsuite/tools/data/html-mfgs.ref
Wyświetl plik

@ -12078,7 +12078,7 @@ hpljm1005<br>(0)
</td> </td>
<td align=center><a href="man/sane-hp3500.5.html">sane-hp3500</a></td> <td align=center><a href="man/sane-hp3500.5.html">sane-hp3500</a></td>
</tr> </tr>
<tr><td align=center>ScanJet 3670C</td> <tr><td align=center>ScanJet 3670</td>
<td align=center>USB</td> <td align=center>USB</td>
<td align=center>0x03f0/0x1405</td> <td align=center>0x03f0/0x1405</td>
<td align=center><font color="#007000">Complete</font></td> <td align=center><font color="#007000">Complete</font></td>
@ -12093,7 +12093,7 @@ hpljm1005<br>(0)
<td align=center>USB</td> <td align=center>USB</td>
<td align=center>0x03f0/0x1405</td> <td align=center>0x03f0/0x1405</td>
<td align=center><font color="#007000">Complete</font></td> <td align=center><font color="#007000">Complete</font></td>
<td>1200x1200 dpi max, same as HP 3670C</td> <td>1200x1200 dpi max, same as HP 3670</td>
<td align=center> <td align=center>
<a href="http://www.meier-geinitz.de/sane/genesys-backend/">genesys</a> <a href="http://www.meier-geinitz.de/sane/genesys-backend/">genesys</a>
<br>(1.0-63) <br>(1.0-63)

2
testsuite/tools/data/hwdb.ref
Wyświetl plik

@ -97,7 +97,7 @@ usb:v03F0p1205*
usb:v03F0p1305* usb:v03F0p1305*
libsane_matched=yes libsane_matched=yes
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C # Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
usb:v03F0p1405* usb:v03F0p1405*
libsane_matched=yes libsane_matched=yes

4
testsuite/tools/data/testfile.desc
Wyświetl plik

@ -4894,7 +4894,7 @@
:status :basic :status :basic
:comment "clone of the HP 2400C" :comment "clone of the HP 2400C"
:model "ScanJet 3670C" :model "ScanJet 3670"
:interface "USB" :interface "USB"
:usbid "0x03f0" "0x1405" :usbid "0x03f0" "0x1405"
:status :complete :status :complete
@ -4904,7 +4904,7 @@
:interface "USB" :interface "USB"
:usbid "0x03f0" "0x1405" :usbid "0x03f0" "0x1405"
:status :complete :status :complete
:comment "1200x1200 dpi max, same as HP 3670C" :comment "1200x1200 dpi max, same as HP 3670"
:model "ScanJet 4850C" :model "ScanJet 4850C"
:interface "USB" :interface "USB"

2
testsuite/tools/data/udev+acl.ref
Wyświetl plik

@ -81,7 +81,7 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1105", ENV{libsane_matched}="yes"
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1305", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1305", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C # Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1405", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1405", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 5590 # Hewlett-Packard ScanJet 5590
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", ENV{libsane_matched}="yes"

2
testsuite/tools/data/udev.ref
Wyświetl plik

@ -81,7 +81,7 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1105", MODE="0664", GROUP="scanner",
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1305", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1305", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C # Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1405", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1405", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"
# Hewlett-Packard ScanJet 5590 # Hewlett-Packard ScanJet 5590
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes"

2
testsuite/tools/data/usermap.ref
Wyświetl plik

@ -64,7 +64,7 @@ libusbscanner 0x0003 0x03f0 0x1105 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0
libusbscanner 0x0003 0x03f0 0x1205 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x03f0 0x1205 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C
libusbscanner 0x0003 0x03f0 0x1305 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x03f0 0x1305 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C # Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C
libusbscanner 0x0003 0x03f0 0x1405 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x03f0 0x1405 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
# Hewlett-Packard ScanJet 5590 # Hewlett-Packard ScanJet 5590
libusbscanner 0x0003 0x03f0 0x1705 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 libusbscanner 0x0003 0x03f0 0x1705 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000

4
testsuite/tools/data/xml.ref
Wyświetl plik

@ -6609,7 +6609,7 @@
<url>*none*</url> <url>*none*</url>
<comment>clone of the HP 2400C</comment> <comment>clone of the HP 2400C</comment>
</model> </model>
<model name="ScanJet 3670C"> <model name="ScanJet 3670">
<interface>USB</interface> <interface>USB</interface>
<usbvendorid>0x03f0</usbvendorid> <usbvendorid>0x03f0</usbvendorid>
<usbproductid>0x1405</usbproductid> <usbproductid>0x1405</usbproductid>
@ -6623,7 +6623,7 @@
<usbproductid>0x1405</usbproductid> <usbproductid>0x1405</usbproductid>
<status>complete</status> <status>complete</status>
<url>*none*</url> <url>*none*</url>
<comment>1200x1200 dpi max, same as HP 3670C</comment> <comment>1200x1200 dpi max, same as HP 3670</comment>
</model> </model>
<model name="ScanJet 4850C"> <model name="ScanJet 4850C">
<interface>USB</interface> <interface>USB</interface>