From c4a88e6bf4a2e153ec667f811dfdeb35ef2e9464 Mon Sep 17 00:00:00 2001 From: Ralph Little Date: Tue, 7 Jan 2020 22:52:14 -0800 Subject: [PATCH] genesys: renamed HP ScanJet 3670C to 3670. Model has no C suffix --- backend/genesys.conf.in | 2 +- backend/genesys/enums.h | 2 +- backend/genesys/tables_model.cpp | 6 +++--- doc/descriptions/genesys.desc | 4 ++-- testsuite/tools/data/ascii.ref | 4 ++-- testsuite/tools/data/db.ref | 2 +- testsuite/tools/data/hal-new.ref | 2 +- testsuite/tools/data/hal.ref | 2 +- testsuite/tools/data/html-backends-split.ref | 4 ++-- testsuite/tools/data/html-mfgs.ref | 4 ++-- testsuite/tools/data/hwdb.ref | 2 +- testsuite/tools/data/testfile.desc | 4 ++-- testsuite/tools/data/udev+acl.ref | 2 +- testsuite/tools/data/udev.ref | 2 +- testsuite/tools/data/usermap.ref | 2 +- testsuite/tools/data/xml.ref | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/backend/genesys.conf.in b/backend/genesys.conf.in index 603688904..786ccd56b 100644 --- a/backend/genesys.conf.in +++ b/backend/genesys.conf.in @@ -11,7 +11,7 @@ # Hewlett Packard ScanJet 2400c usb 0x03f0 0x0a01 -# Hewlett Packard ScanJet 3670c/3690c +# Hewlett Packard ScanJet 3670/3690c usb 0x03f0 0x1405 # Plustek OpticPro ST24 diff --git a/backend/genesys/enums.h b/backend/genesys/enums.h index c14f6c406..810c4ca34 100644 --- a/backend/genesys/enums.h +++ b/backend/genesys/enums.h @@ -192,7 +192,7 @@ enum class ModelId : unsigned DCT_DOCKETPORT_487, HP_SCANJET_2300C, HP_SCANJET_2400C, - HP_SCANJET_3670C, + HP_SCANJET_3670, HP_SCANJET_4850C, HP_SCANJET_G4010, HP_SCANJET_G4050, diff --git a/backend/genesys/tables_model.cpp b/backend/genesys/tables_model.cpp index 7bbc03054..0b3a0af33 100644 --- a/backend/genesys/tables_model.cpp +++ b/backend/genesys/tables_model.cpp @@ -1467,10 +1467,10 @@ void genesys_init_usb_device_tables() model = Genesys_Model(); - model.name = "hewlett-packard-scanjet-3670c"; + model.name = "hewlett-packard-scanjet-3670"; model.vendor = "Hewlett Packard"; - model.model = "ScanJet 3670c"; - model.model_id = ModelId::HP_SCANJET_3670C; + model.model = "ScanJet 3670"; + model.model_id = ModelId::HP_SCANJET_3670; model.asic_type = AsicType::GL646; model.resolutions = { diff --git a/doc/descriptions/genesys.desc b/doc/descriptions/genesys.desc index ee155f6f2..888f25279 100644 --- a/doc/descriptions/genesys.desc +++ b/doc/descriptions/genesys.desc @@ -79,7 +79,7 @@ :status :basic :comment "clone of the HP 2400C" -:model "ScanJet 3670C" +:model "ScanJet 3670" :interface "USB" :usbid "0x03f0" "0x1405" :status :complete @@ -89,7 +89,7 @@ :interface "USB" :usbid "0x03f0" "0x1405" :status :complete -:comment "1200x1200 dpi max, same as HP 3670C" +:comment "1200x1200 dpi max, same as HP 3670" :model "ScanJet 4850C" :interface "USB" diff --git a/testsuite/tools/data/ascii.ref b/testsuite/tools/data/ascii.ref index 4d6673237..20c2bf289 100644 --- a/testsuite/tools/data/ascii.ref +++ b/testsuite/tools/data/ascii.ref @@ -5709,7 +5709,7 @@ backend `genesys' status basic url *none* comment `clone of the HP 2400C' - model `ScanJet 3670C' + model `ScanJet 3670' interface `USB' usb-vendor-id `0x03f0' usb-product-id `0x1405' @@ -5722,7 +5722,7 @@ backend `genesys' usb-product-id `0x1405' status complete url *none* - comment `1200x1200 dpi max, same as HP 3670C' + comment `1200x1200 dpi max, same as HP 3670' model `ScanJet 4850C' interface `USB' usb-vendor-id `0x03f0' diff --git a/testsuite/tools/data/db.ref b/testsuite/tools/data/db.ref index d51729acf..38286677f 100644 --- a/testsuite/tools/data/db.ref +++ b/testsuite/tools/data/db.ref @@ -66,7 +66,7 @@ 0x03f0 0x1205 root:scanner 0664 # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C 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 # Hewlett-Packard ScanJet 5590 0x03f0 0x1705 root:scanner 0664 diff --git a/testsuite/tools/data/hal-new.ref b/testsuite/tools/data/hal-new.ref index c9b7f8081..fc48a7151 100644 --- a/testsuite/tools/data/hal-new.ref +++ b/testsuite/tools/data/hal-new.ref @@ -175,7 +175,7 @@ scanner proprietary - + scanner proprietary diff --git a/testsuite/tools/data/hal.ref b/testsuite/tools/data/hal.ref index 18490f296..68ef92a99 100644 --- a/testsuite/tools/data/hal.ref +++ b/testsuite/tools/data/hal.ref @@ -175,7 +175,7 @@ scanner proprietary - + scanner proprietary diff --git a/testsuite/tools/data/html-backends-split.ref b/testsuite/tools/data/html-backends-split.ref index 3455e20cb..bd8d1543d 100644 --- a/testsuite/tools/data/html-backends-split.ref +++ b/testsuite/tools/data/html-backends-split.ref @@ -5991,7 +5991,7 @@ Kyocera clone of the HP 2400C -ScanJet 3670C +ScanJet 3670 USB 0x03f0/0x1405 Complete @@ -6002,7 +6002,7 @@ Kyocera USB 0x03f0/0x1405 Complete -1200x1200 dpi max, same as HP 3670C +1200x1200 dpi max, same as HP 3670 ScanJet 4850C diff --git a/testsuite/tools/data/html-mfgs.ref b/testsuite/tools/data/html-mfgs.ref index f82b30c9a..1b34bb461 100644 --- a/testsuite/tools/data/html-mfgs.ref +++ b/testsuite/tools/data/html-mfgs.ref @@ -12078,7 +12078,7 @@ hpljm1005
(0) sane-hp3500 -ScanJet 3670C +ScanJet 3670 USB 0x03f0/0x1405 Complete @@ -12093,7 +12093,7 @@ hpljm1005
(0) USB 0x03f0/0x1405 Complete -1200x1200 dpi max, same as HP 3670C +1200x1200 dpi max, same as HP 3670 genesys
(1.0-63) diff --git a/testsuite/tools/data/hwdb.ref b/testsuite/tools/data/hwdb.ref index 7d029e089..9adc73f3f 100644 --- a/testsuite/tools/data/hwdb.ref +++ b/testsuite/tools/data/hwdb.ref @@ -97,7 +97,7 @@ usb:v03F0p1205* usb:v03F0p1305* libsane_matched=yes -# Hewlett-Packard ScanJet 3670C | Hewlett-Packard ScanJet 3690C +# Hewlett-Packard ScanJet 3670 | Hewlett-Packard ScanJet 3690C usb:v03F0p1405* libsane_matched=yes diff --git a/testsuite/tools/data/testfile.desc b/testsuite/tools/data/testfile.desc index e59aed3db..bae40993e 100644 --- a/testsuite/tools/data/testfile.desc +++ b/testsuite/tools/data/testfile.desc @@ -4894,7 +4894,7 @@ :status :basic :comment "clone of the HP 2400C" -:model "ScanJet 3670C" +:model "ScanJet 3670" :interface "USB" :usbid "0x03f0" "0x1405" :status :complete @@ -4904,7 +4904,7 @@ :interface "USB" :usbid "0x03f0" "0x1405" :status :complete -:comment "1200x1200 dpi max, same as HP 3670C" +:comment "1200x1200 dpi max, same as HP 3670" :model "ScanJet 4850C" :interface "USB" diff --git a/testsuite/tools/data/udev+acl.ref b/testsuite/tools/data/udev+acl.ref index 47210343c..bcedd50f1 100644 --- a/testsuite/tools/data/udev+acl.ref +++ b/testsuite/tools/data/udev+acl.ref @@ -81,7 +81,7 @@ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1105", ENV{libsane_matched}="yes" ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1205", ENV{libsane_matched}="yes" # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C 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" # Hewlett-Packard ScanJet 5590 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", ENV{libsane_matched}="yes" diff --git a/testsuite/tools/data/udev.ref b/testsuite/tools/data/udev.ref index 9a221fc2e..bd448af9e 100644 --- a/testsuite/tools/data/udev.ref +++ b/testsuite/tools/data/udev.ref @@ -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" # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C 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" # Hewlett-Packard ScanJet 5590 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1705", MODE="0664", GROUP="scanner", ENV{libsane_matched}="yes" diff --git a/testsuite/tools/data/usermap.ref b/testsuite/tools/data/usermap.ref index e02d73a95..b1d5a9fc2 100644 --- a/testsuite/tools/data/usermap.ref +++ b/testsuite/tools/data/usermap.ref @@ -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 # Hewlett-Packard ScanJet 4570C | Hewlett-Packard ScanJet 5500C 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 # Hewlett-Packard ScanJet 5590 libusbscanner 0x0003 0x03f0 0x1705 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 diff --git a/testsuite/tools/data/xml.ref b/testsuite/tools/data/xml.ref index 061809392..3c5b861b4 100644 --- a/testsuite/tools/data/xml.ref +++ b/testsuite/tools/data/xml.ref @@ -6609,7 +6609,7 @@ *none* clone of the HP 2400C - + USB 0x03f0 0x1405 @@ -6623,7 +6623,7 @@ 0x1405 complete *none* - 1200x1200 dpi max, same as HP 3670C + 1200x1200 dpi max, same as HP 3670 USB