From c87c40a981f129b8512d8b57a14c53f6f0a2a875 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Thu, 15 Feb 2024 16:04:22 +0100 Subject: [PATCH 1/3] gt68xx: desc: add firmware names to comments Make it easier for users to find the proper firmware by documenting it in the comments section. I wrote a script to extract the data from the driver and then manually verified/corrected it. Some model names needed updates to match their entry in the sourcecode. Signed-off-by: Wolfram Sang --- doc/descriptions/gt68xx.desc | 63 +++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc index b911e989f..15b258a28 100644 --- a/doc/descriptions/gt68xx.desc +++ b/doc/descriptions/gt68xx.desc @@ -14,7 +14,7 @@ :interface "USB" :usbid "0x05d8" "0x4002" :status :good -:comment "Works, only product id 0x4002 is supported" +:comment "Works, only product id 0x4002 is supported. Needs firmware 'Gt680xfw.usb'" :model "Ultima 2000 e+" :interface "USB" @@ -52,17 +52,19 @@ :interface "USB" :usbid "0x0458" "0x201e" :status :untested -:comment "Untested but should work." +:comment "Untested but should work. Needs firmware 'Cis3r5b1.fw'" -:model "Colorpage SF600" +:model "ColorPage SF600" :interface "USB" :usbid "0x0458" "0x2021" :status :basic +:comment "Needs firmware 'cism216.fw'" :model "Colorpage Vivid3x" :interface "USB" :usbid "0x0458" "0x2011" :status :good +:comment "Needs firmware 'ccd548.fw'" :model "Colorpage Vivid3 V2" :interface "USB" @@ -74,35 +76,42 @@ :interface "USB" :usbid "0x0458" "0x2017" :status :good +:comment "Needs firmware 'ccd548.fw'" -:model "Colorpage Vivid4" +:model "ColorPage Vivid 4" :usbid "0x0458" "0x2014" :interface "USB" :status :good +:comment "Needs firmware 'ccd68861.fw'" :model "Colorpage Vivid4x" :usbid "0x0458" "0x201b" :interface "USB" :status :good +:comment "Needs firmware 'ccd548.fw'" :model "Colorpage Vivid4xe" :usbid "0x0458" "0x201a" :interface "USB" :status :good +:comment "Needs firmware 'ccd548.fw'" :model "Colorpage Vivid 1200 X" :interface "USB" :usbid "0x0458" "0x201d" :status :good +:comment "Needs firmware 'ccd569.fw'" :model "Colorpage Vivid 1200 XE" :interface "USB" :usbid "0x0458" "0x201f" :status :good +:comment "Needs firmware 'ccd569.fw'" ; ----------------------------------------------------------------------------- :mfg "Googlegear" + :model "2000" :interface "USB" :usbid "0x05d8" "0x4002" @@ -123,7 +132,7 @@ :interface "USB" :usbid "0x043d" "0x002d" :status :good -:comment "Works, some resolutions fail at 16 bit, same as X70" +:comment "Works, some resolutions fail at 16 bit, same as X70. Needs firmware 'OSLO3071b2.usb'" ; ----------------------------------------------------------------------------- @@ -177,22 +186,25 @@ :interface "USB" :usbid "0x05d8" "0x4002" :status :good +:comment "Needs firmware 'PS1fw.usb'" -:model "BearPaw 1200 CU Plus" +:model "Bearpaw 1200 CU Plus" :interface "USB" :usbid "0x055f" "0x021b" :status :good +:comment "Needs firmware 'PS1Gfw.usb'" -:model "BearPaw 1200 CU Plus" +:model "Bearpaw 1200 CU Plus" :interface "USB" :usbid "0x055f" "0x021c" :status :good +:comment "Needs firmware 'PS1Dfw.usb'" :model "BearPaw 1200 TA" :interface "USB" :usbid "0x055f" "0x021e" :status :good -:comment "Transparency adapter supported" +:comment "Transparency adapter supported. Needs firmware 'A1fw.usb'" :model "BearPaw 1248 CU" :interface "USB" @@ -216,24 +228,25 @@ :interface "USB" :usbid "0x05d8" "0x4002" :status :basic -:comment "Works, but is slow" +:comment "Works, but is slow. Needs firmware 'PS2fw.usb'" :model "BearPaw 2400 CU Plus" :interface "USB" :usbid "0x055f" "0x021d" :status :good +:comment "Needs firmware 'PS2Dfw.usb'" :model "BearPaw 2400 TA" :interface "USB" :usbid "0x055f" "0x0218" :status :good -:comment "Transparency adapter supported" +:comment "Transparency adapter supported. Needs firmware 'A2fw.usb'" :model "BearPaw 2400 TA Plus" :interface "USB" :usbid "0x055f" "0x0219" :status :good -:comment "Transparency adapter supported" +:comment "Transparency adapter supported. Needs firmware 'A2Dfw.usb'" :model "BearPaw 2448 CS Plus" :interface "USB" @@ -245,7 +258,7 @@ :interface "USB" :usbid "0x055f" "0x021a" :status :basic -:comment "Slow. Transparency adapter supported. Slow. Brightness depends on resolution?" +:comment "Slow. Transparency adapter supported. Slow. Brightness depends on resolution?. Needs firmware 'A2Nfw.usb'" :model "Plug-n-Scan 2400 MT" :interface "USB" @@ -263,23 +276,25 @@ :interface "USB" :usbid "0x05d8" "0x4002" :status :good +:comment "Needs firmware 'SBfw.usb'" :model "ScanExpress 1248 UB" :interface "USB" :usbid "0x055f" "0x021f" :status :complete +:comment "Needs firmware 'SBSfw.usb'" :model "ScanExpress 2400 USB" :interface "USB" :usbid "0x05d8" "0x4002" :status :minimal -:comment "Should be detected but may need some more work in the code. Testers welcome. Please contact me if you own this scanner." +:comment "Should be detected but may need some more work in the code. Testers welcome. Please contact me if you own this scanner. Needs firmware 'P9fw.usb'" :model "ScanExpress A3 USB" :interface "USB" :usbid "0x055f" "0x0210" :status :basic -:comment "Still some vertical stripes." +:comment "Still some vertical stripes. Needs firmware 'A32fw.usb'" :model "ScanMagic 1200 UB Plus" :interface "USB" @@ -349,16 +364,19 @@ :interface "USB" :usbid "0x07b3" "0x0400" :status :good +:comment "Needs firmware 'ccd548.fw'" :model "OpticPro 1248U" :interface "USB" :usbid "0x07b3" "0x0401" :status :good +:comment "Needs firmware 'ccd548.fw'" :model "OpticPro U16B" :interface "USB" :usbid "0x07b3" "0x0402" :status :good +:comment "Needs firmware 'ccd68861.fw'" :model "OpticPro U16B+" :interface "USB" @@ -375,13 +393,13 @@ :interface "USB" :usbid "0x07b3" "0x040b" :status :good -:comment "Product ID 0x040b only." +:comment "Product ID 0x040b only. Needs firmware 'ccd548.fw'" :model "OpticPro S24" :interface "USB" :usbid "0x07b3" "0x040e" :status :good -:comment "Product ID 0x040e only. Is reported to work." +:comment "Product ID 0x040e only. Is reported to work. Needs firmware 'ccd569.fw'" :model "OpticPro ST12" :interface "USB" @@ -393,12 +411,13 @@ :interface "USB" :usbid "0x07b3" "0x0413" :status :good +:comment "Needs firmware 'cism216.fw'" :model "OpticSlim 2400" :interface "USB" :usbid "0x07b3" "0x0422" :status :good -:comment "Works up to 1200 dpi." +:comment "Works up to 1200 dpi. Needs firmware 'cis3R5B1.fw'" :model "OpticSlim 2400 plus" :interface "USB" @@ -406,24 +425,24 @@ :status :good :comment "Same as OpticSlim 2400." -:model "OpticSlim 500 plus" +:model "OpticSlim 500 Plus" :interface "USB" :usbid "0x07b3" "0x046e" :status :good -:comment "Need firmware from windows driver. Image is upside down because hardware in this model is upside down. Buttons not tested." +:comment "Image is upside down because hardware in this model is upside down. Buttons not tested. Needs firmware 'cis3R5B1.fw'" :model "Iriscan Express 2" :interface "USB" :usbid "0x07b3" "0x045f" :status :complete -:comment "Works up to 1200 dpi. Calibration with external calibration sheet supported" +:comment "Works up to 1200 dpi. Calibration with external calibration sheet supported. Needs firmware 'cism216.fw'" ; ----------------------------------------------------------------------------- :model "OpticSlim M12" :interface "USB" :usbid "0x07b3" "0x0412" :status :complete -:comment "Works up to 1200 dpi. Calibration with external calibration sheet supported" +:comment "Works up to 1200 dpi. Calibration with external calibration sheet supported. Needs firmware 'cism216.fw'" ; ----------------------------------------------------------------------------- :mfg "RevScan" @@ -473,6 +492,6 @@ :interface "USB" :usbid "0x04a7" "0x0444" :status :good -:comment "Works up to 1200 dpi and 12 bits/color." +:comment "Works up to 1200 dpi and 12 bits/color. Needs firmware 'Cis3r5b1.fw'" ; ----------------------------------------------------------------------------- From e183e24b2f5cd99f93d3527a2c5ee9758e2f6065 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Thu, 15 Feb 2024 16:04:22 +0100 Subject: [PATCH 2/3] epjitsu: desc: add firmware names to comments Make it easier for users to find the proper firmware by documenting it in the comments section. I wrote a script to extract the data from the driver and then manually verified/corrected it. Signed-off-by: Wolfram Sang --- doc/descriptions/epjitsu.desc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/descriptions/epjitsu.desc b/doc/descriptions/epjitsu.desc index e7b0ff696..50f3ca19d 100644 --- a/doc/descriptions/epjitsu.desc +++ b/doc/descriptions/epjitsu.desc @@ -26,46 +26,46 @@ :interface "USB" :status :good :usbid "0x04c5" "0x10c7" -:comment "A6-size flatbed. Hardware provides 150/200/300/400/600 dpi in color. Software creates other resolutions, plus grayscale and binary modes. Hardware grayscale mode is not used due to poor calibration." +:comment "A6-size flatbed. Hardware provides 150/200/300/400/600 dpi in color. Software creates other resolutions, plus grayscale and binary modes. Hardware grayscale mode is not used due to poor calibration. Needs firmware '60f_0A00.nal'" :model "ScanSnap S300" :interface "USB" :status :good :usbid "0x04c5" "0x1156" -:comment "Letter-size ADF. Hardware provides duplex, 150/225/300/600 dpi in color on AC or USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required." +:comment "Letter-size ADF. Hardware provides duplex, 150/225/300/600 dpi in color on AC or USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required. Needs firmware '300_0C00.nal'" :model "ScanSnap S300M" :interface "USB" :status :good :usbid "0x04c5" "0x117f" -:comment "Same as S300, with different usb id" +:comment "Same as S300, with different usb id. Needs firmware '300M_0C00.nal'" :model "fi-65F" :interface "USB" :status :good :usbid "0x04c5" "0x11bd" -:comment "Same as fi-60f, with different usb id. Button support untested." +:comment "Same as fi-60f, with different usb id. Button support untested. Needs firmware '65f_0A01.nal'" :model "ScanSnap S1300" :interface "USB" :status :good :usbid "0x04c5" "0x11ed" -:comment "Same as S300, with different usb id" +:comment "Same as S300, with different usb id. Needs firmware '1300_0C26.nal'" :model "ScanSnap S1100" :interface "USB" :status :good :usbid "0x04c5" "0x1200" -:comment "Letter-size ADF. Hardware provides simplex, 300/600 dpi in color on USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required." +:comment "Letter-size ADF. Hardware provides simplex, 300/600 dpi in color on USB power. Software creates other resolutions, plus grayscale and binary modes. All buttons and sensors are exposed. Scanner always scans in _triplex_ color, fast USB required. Needs firmware '1100_0B00.nal'" :model "ScanSnap S1300i" :interface "USB" :status :good :usbid "0x04c5" "0x128d" -:comment "Same as S300, with different usb id" +:comment "Same as S300, with different usb id. Needs firmware '1300i_0D12.nal'" :model "ScanSnap S1100i" :interface "USB" :status :good :usbid "0x04c5" "0x1447" -:comment "Same as S1100, with different usb id" +:comment "Same as S1100, with different usb id. Needs firmware '1100i_0A00.nal'" From 3d6acc98e0ec2c31874095e052339179041e29d1 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Thu, 15 Feb 2024 16:04:22 +0100 Subject: [PATCH 3/3] artec_eplus48u: desc: add firmware names to comments Make it easier for users to find the proper firmware by documenting it in the comments section. I wrote a script to extract the data from the driver and then manually verified/corrected it. Signed-off-by: Wolfram Sang --- doc/descriptions/artec_eplus48u.desc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/descriptions/artec_eplus48u.desc b/doc/descriptions/artec_eplus48u.desc index 674333ac2..17b8b2153 100644 --- a/doc/descriptions/artec_eplus48u.desc +++ b/doc/descriptions/artec_eplus48u.desc @@ -15,13 +15,13 @@ :status :good :interface "USB" :usbid "0x05d8" "0x4003" -:comment "CIS scanner based on the GT6816 chip. Apparently all other devices are re-badged Artec scanners." +:comment "CIS scanner based on the GT6816 chip. Apparently all other devices are re-badged Artec scanners. Needs firmware 'Artec48.usb'" :model "E+ Pro" :status :minimal :interface "USB" :usbid "0x05d8" "0x4004" -:comment "Works up to 600dpi, but not 1200. Needs better calibration. See bug #310490" +:comment "Works up to 600dpi, but not 1200. Needs better calibration. See bug #310490. Needs firmware '1200.usb'" :mfg "Medion/Lifetec/Tevion/Cytron" @@ -32,17 +32,19 @@ :status :good :interface "USB" :usbid "0x05d8" "0x4003" +:comment "Needs firmware 'Artec48.usb'" :model "MD9705" :status :good :interface "USB" :usbid "0x05d8" "0x4003" +:comment "Needs firmware 'Artec48.usb'" :model "MD4394" :status :good :interface "USB" :usbid "0x05d8" "0x4003" -:comment "Only scanners with product id 0x4003 will work; try the gt68xx backend, if your scanner has product id 0x4002 " +:comment "Only scanners with product id 0x4003 will work; try the gt68xx backend, if your scanner has product id 0x4002 . Needs firmware 'Artec48.usb'" :mfg "Trust" @@ -52,12 +54,13 @@ :status :good :interface "USB" :usbid "0x05d8" "0x4006" +:comment "Needs firmware 'Artec48.usb'" :model "240H Easy Webscan Gold" :status :basic :interface "USB" :usbid "0x05d8" "0x4007" -:comment "Works up to 600 dpi" +:comment "Works up to 600 dpi. Needs firmware 'Artec48.usb'" :mfg "Memorex" @@ -67,6 +70,7 @@ :status :good :interface "USB" :usbid "0x05d8" "0x4005" +:comment "Needs firmware 'Artec48.usb'" :mfg "Microstar" @@ -76,6 +80,7 @@ :status :good :interface "USB" :usbid "0x05d8" "0x4003" +:comment "Needs firmware 'Artec48.usb'" :mfg "UMAX" @@ -90,11 +95,13 @@ :status :good :interface "USB" :usbid "0x05d8" "0x4009" +:comment "Needs firmware 'Artec48.usb'" :model "AstraSlim 1200 SE" :status :good :interface "USB" :usbid "0x05d8" "0x4010" +:comment "Needs firmware '1200.usb'" :mfg "Yakumo" @@ -104,3 +111,4 @@ :status :good :interface "USB" :usbid "0x05d8" "0x4011" +:comment "Needs firmware 'Artec48.usb'"