diff --git a/ChangeLog b/ChangeLog index 3fdc9a3fe..26e7c2d1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,18 @@ * doc/descriptions-external/epkowa.desc: Film area guide mode of 4990 not supported (bug #302728). + * doc/descriptions-external/brother-mfc4600.desc + doc/descriptions-external/brother.desc + doc/descriptions-external/brother2.desc + doc/descriptions-external/hp3770.desc + doc/descriptions-external/hp3900.desc + doc/descriptions-external/hp8200.desc + doc/descriptions-external/hp_rts88xx.desc + doc/descriptions-external/mustek_a3p1.desc + doc/descriptions-external/primascan.desc + doc/descriptions-external/template.desc. + doc/descriptions-external/viceo.desc: + Added several USB ids. Added some more scanners. General cleanup. 2006-01-09 Henning Meier-Geinitz diff --git a/doc/descriptions-external/brother-mfc4600.desc b/doc/descriptions-external/brother-mfc4600.desc index f0f895a7a..1d57e4724 100644 --- a/doc/descriptions-external/brother-mfc4600.desc +++ b/doc/descriptions-external/brother-mfc4600.desc @@ -30,6 +30,7 @@ :status :basic :url "http://sourceforge.net/projects/brother-mfc" :interface "USB" +:usbid "0x04f9" "0x0111" :comment "Only USB version of this scanner is supported. Please report how well it works. See link." diff --git a/doc/descriptions-external/brother.desc b/doc/descriptions-external/brother.desc index 41cd34d54..877c1f9e3 100644 --- a/doc/descriptions-external/brother.desc +++ b/doc/descriptions-external/brother.desc @@ -28,271 +28,371 @@ ;:comment "" ; comment about the manufacturer +;data taken from Brother website and Brsane.ini + + :model "DCP-1000" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0112" +:comment "No report yet." + +:model "DCP-1000J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0153" :comment "No report yet." :model "DCP-1400" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0116" +:comment "No report yet." + +:model "DCP-3020C" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x014c" :comment "No report yet." :model "DCP-4020C" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0144" :comment "No report yet." :model "DCP-8020" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0140" :comment "No report yet." :model "DCP-8025D" :status :good :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0141" + +:model "DCP-8025J" +:status :good +:interface "USB" +:usbid "0x04f9" "0x014f" +:comment "No report yet." :model "DCP-8040" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x015d" :comment "No report yet." :model "DCP-8045D" :status :good :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x015e" :model "FAX1800C" :status :untested :interface "USB" +:usbid "0x04f9" "0x0126" :comment "No report yet." :model "FAX1815C" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x014d" :comment "No report yet." :model "FAX1820C" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0147" :comment "No report yet." :model "FAX1920CN" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0149" :comment "No report yet." :model "FAX-2850" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0123" :comment "No report yet." :model "FAX-2900" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0117" :comment "No report yet." :model "FAX-3800" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0118" :comment "No report yet." :model "FAX-4100" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x012e" :comment "No report yet." :model "FAX-4750e" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x012f" :comment "No report yet." :model "FAX-5750e" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0130" :comment "No report yet." +:model "MFC-100" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0135" +:comment "No report yet." + +:model "MFC-150CL" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0136" +:comment "No report yet." :model "MFC-3100C" :status :untested :interface "USB" +:usbid "0x04f9" "0x010e" :comment "No report yet." :model "MFC-3200C" :status :untested :interface "USB" +:usbid "0x04f9" "0x013a" :comment "No report yet." :model "MFC-3220C" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0146" :comment "No report yet." :model "MFC-3320CN" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0148" :comment "No report yet." :model "MFC-3420C" :status :good :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x014a" + +:model "MFC-3420J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0157" +:comment "No report yet." :model "MFC-3820CN" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x014b" +:comment "No report yet." + +:model "MFC-3820J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0158" :comment "No report yet." :model "MFC-4420C" :status :untested :interface "USB" +:usbid "0x04f9" "0x013e" :comment "No report yet." :model "MFC-4800" :status :good :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0110" + +:model "MFC-4800J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0124" +:comment "No report yet." :model "MFC-4820C" :status :good :interface "USB" +:usbid "0x04f9" "0x013f" :model "MFC-5100C" :status :good :interface "USB" +:usbid "0x04f9" "0x010f" + +:model "MFC-5100J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0122" +:comment "No report yet." :model "MFC-5200C" :status :good :interface "USB" +:usbid "0x04f9" "0x0132" + +:model "MFC-5200J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x013d" +:comment "No report yet." :model "MFC-580" :status :good :interface "USB" +:usbid "0x04f9" "0x0120" :model "MFC-590" :status :good :interface "USB" +:usbid "0x04f9" "0x0121" :model "MFC-6800" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0111" +:comment "No report yet." + +:model "MFC-6800J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0125" +:comment "No report yet." + +:model "MFC-8210" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0151" :comment "No report yet." :model "MFC-8220" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0150" :comment "No report yet." :model "MFC-8420" :status :good :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0142" :model "MFC-8440" :status :good :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x015f" :model "MFC-8500" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0113" +:comment "No report yet." + +:model "MFC-8500J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0128" :comment "No report yet." :model "MFC-8820D" :status :good :interface "USB" -;:url "" ; model's URL -:comment "Is reported to work well with backend version 0.0.12." +:usbid "0x04f9" "0x0143" -:model "MFC-8840D" +:model "MFC-8820J" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x014e" :comment "No report yet." +:model "MFC-8840D" +:status :good +:interface "USB" +:usbid "0x04f9" "0x0160" + :model "MFC-890" :status :good :interface "USB" +:usbid "0x04f9" "0x013c" :model "MFC-9030" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x012b" :comment "No report yet." :model "MFC-9070" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x011d" :comment "No report yet." :model "MFC-9160" :status :good :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x011f" :comment "Is reported to work well with backend version 0.0.12." :model "MFC-9180" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x011e" :comment "No report yet." :model "MFC-9660" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0119" :comment "No report yet." :model "MFC-9700" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0114" :comment "No report yet." :model "MFC-9760" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x011c" :comment "No report yet." :model "MFC-9800" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x0115" +:comment "No report yet." + +:model "MFC-9800J" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0127" :comment "No report yet." :model "MFC-9860" :status :untested :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x011a" :comment "No report yet." :model "MFC-9880" :status :unsupported :interface "USB" -;:url "" ; model's URL +:usbid "0x04f9" "0x011b" :comment "There is a report that this scanner does not work with the brother backend (I/O errors)" diff --git a/doc/descriptions-external/brother2.desc b/doc/descriptions-external/brother2.desc index efd7b6bc6..ebec34aec 100644 --- a/doc/descriptions-external/brother2.desc +++ b/doc/descriptions-external/brother2.desc @@ -28,89 +28,122 @@ ;:comment "" ; comment about the manufacturer +;data taken from Brother website and Brsane2.ini :model "DCP-110C" :status :untested :interface "USB" +:usbid "0x04f9" "0x0169" :comment "No report yet." :model "DCP-310CN" :status :untested :interface "USB" +:usbid "0x04f9" "0x016b" :comment "No report yet." :model "DCP-7010" :status :good :interface "USB" +:usbid "0x04f9" "0x0182" :model "DCP-7020" :status :untested :interface "USB" +:usbid "0x04f9" "0x0183" :comment "No report yet." :model "DCP-7025" :status :good :interface "USB" +:usbid "0x04f9" "0x0184" :model "MFC-210C" :status :good :interface "USB" +:usbid "0x04f9" "0x0161" :model "MFC-215C" :status :good :interface "USB" +:usbid "0x04f9" "0x0193" :comment "brscan2-0.0.2 necessary" :model "MFC-3240C" :status :untested :interface "USB" +:usbid "0x04f9" "0x0173" :comment "No report yet." :model "MFC-3340CN" :status :untested :interface "USB" +:usbid "0x04f9" "0x0174" :comment "No report yet." :model "MFC-410CN" :status :untested :interface "USB" +:usbid "0x04f9" "0x0163" :comment "No report yet." :model "MFC-420CN" :status :untested :interface "USB" +:usbid "0x04f9" "0x0162" :comment "No report yet." :model "MFC-5440CN" :status :good :interface "USB" +:usbid "0x04f9" "0x016d" :model "MFC-5840CN" :status :untested :interface "USB" +:usbid "0x04f9" "0x016e" +:comment "No report yet." + +;only in ini +:model "MFC-610CLN" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0166" +:comment "No report yet." + +;only in ini +:model "MFC-610CLN" +:status :untested +:interface "USB" +:usbid "0x04f9" "0x0168" :comment "No report yet." :model "MFC-620CN" :status :untested :interface "USB" +:usbid "0x04f9" "0x0165" :comment "No report yet." :model "MFC-7220" :status :untested :interface "USB" +:usbid "0x04f9" "0x0185" :comment "No report yet." :model "MFC-7225N" :status :untested :interface "USB" +:usbid "0x04f9" "0x0186" :comment "No report yet." :model "MFC-7420" :status :untested :interface "USB" +:usbid "0x04f9" "0x0180" :comment "No report yet." :model "MFC-7820N" :status :untested :interface "USB" +:usbid "0x04f9" "0x0181" :comment "No report yet." diff --git a/doc/descriptions-external/hp3770.desc b/doc/descriptions-external/hp3770.desc index 2adc45168..7c2c60e9e 100644 --- a/doc/descriptions-external/hp3770.desc +++ b/doc/descriptions-external/hp3770.desc @@ -27,12 +27,13 @@ :url "http://www.hp.com/" ; manufacturer's URL :model "ScanJet 3770" ; name models for above-specified mfg. -:status :good ; :minimal, :basic, :good, :complete +:status :basic ; :minimal, :basic, :good, :complete ; :untested, or :unsupported :interface "USB" ; interface type of the device: ; "SCSI", "USB", "Parport (EPP)", ; "Parport (SPP)", "Parport (ECP)", ; "Serial port", "IEEE-1394", "JetDirect", ; or "Proprietary". +:usbid "0x03f0" "0x2505" :url "http://ftp.cyberbaladeur.fr/3770.tar.gz" ; model's URL -:comment "External backend. Binary-only code. Not supported by the SANE developers. Is reported to scan only a small area?" +:comment "External backend. Binary-only Linux i386 code. Not supported by the SANE developers. Is reported to scan only a small area? Scanning of slides or negatives is not implemented." diff --git a/doc/descriptions-external/hp3900.desc b/doc/descriptions-external/hp3900.desc index 733951757..8636f1644 100644 --- a/doc/descriptions-external/hp3900.desc +++ b/doc/descriptions-external/hp3900.desc @@ -27,7 +27,6 @@ :url "http://www.hp.com/" :model "ScanJet 3970c" ; name models for above-specified mfg. -;:url "/unsupported/hp-scanjet-3970c.html" :status :minimal ; :minimal, :basic, :good, :complete ; :untested, or :unsupported :interface "USB" ; interface type of the device: @@ -35,15 +34,17 @@ ; "Parport (SPP)", "Parport (ECP)", ; "Serial port", "IEEE-1394", "JetDirect", ; or "Proprietary". +:usbid "0x03f0" "0x2305" ;:comment "" ; comment about the model :model "ScanJet 4070 Photosmart" :interface "USB" -;:url "/unsupported/hp-scanjet-4070.html" +:usbid "0x03f0" "0x2405" :status :minimal :model "ScanJet 4370" :interface "USB" +:usbid "0x03f0" "0x4105" ;:url "/unsupported/hp-scanjet-4370.html" :status :untested :comment "Untested. Please report if it works." diff --git a/doc/descriptions-external/hp8200.desc b/doc/descriptions-external/hp8200.desc index 2236843f7..7dcf663b3 100644 --- a/doc/descriptions-external/hp8200.desc +++ b/doc/descriptions-external/hp8200.desc @@ -34,6 +34,7 @@ ; "Parport (SPP)", "Parport (ECP)", ; "Serial port", "IEEE-1394", "JetDirect", ; or "Proprietary". +:usbid "0x03f0" "0x0b01" :url "http://ftp.cyberbaladeur.fr/82xxc%20Linux%20drivers.tar.gz" ; model's URL -:comment "External backend. Binary-only code. Not supported by the SANE developers." +:comment "External backend. Binary-only Linux i386 code. Not supported by the SANE developers." diff --git a/doc/descriptions-external/hp_rts88xx.desc b/doc/descriptions-external/hp_rts88xx.desc index 92063c8bc..833a412db 100644 --- a/doc/descriptions-external/hp_rts88xx.desc +++ b/doc/descriptions-external/hp_rts88xx.desc @@ -13,11 +13,13 @@ :model "HP4400C" ; name models for above-specified mfg. :interface "USB" +:usbid "0x03f0" "0x0705" :status :basic :comment "grayscale 300DPI only" :model "HP4470C" :interface "USB" +:usbid "0x03f0" "0x0805" :status :basic :comment "grayscale 300DPI only, XPA/bed mode" diff --git a/doc/descriptions-external/mustek_a3p1.desc b/doc/descriptions-external/mustek_a3p1.desc index aee050c45..e38b87a8e 100755 --- a/doc/descriptions-external/mustek_a3p1.desc +++ b/doc/descriptions-external/mustek_a3p1.desc @@ -13,6 +13,7 @@ :model "P 3600 A3 Pro" :interface "USB" :status :minimal +:usbid "0x055f" "0x0401" :comment "Reports about scanning problems. 1800 dpi seems to work if only small scan areas are selected." diff --git a/doc/descriptions-external/primascan.desc b/doc/descriptions-external/primascan.desc index 9350f8417..1f022028a 100644 --- a/doc/descriptions-external/primascan.desc +++ b/doc/descriptions-external/primascan.desc @@ -28,5 +28,6 @@ :model "Colorado 2400U" :interface "USB" +:usbid "0x0461" "0x0346" :status :minimal ;:comment "" diff --git a/doc/descriptions-external/template.desc. b/doc/descriptions-external/template.desc. index 4392e0634..25b9b5aed 100644 --- a/doc/descriptions-external/template.desc. +++ b/doc/descriptions-external/template.desc. @@ -38,16 +38,19 @@ ; "Parport (SPP)", "Parport (ECP)", ; "Serial port", "IEEE-1394", "JetDirect", ; or "Proprietary". +:usbid "0x1234" "0x4321" ; Vendor and product ids of an USB device :url "http://www.tmp.com/z.html" ; model's URL :comment "With Z-Axis scrolling" ; comment about the model :model "Templ ZS" :interface "USB" +:usbid "0x1234" "0x4322" :status :unsupported :comment "No support yet, but we have docs." :model "Templ ZQ" :interface "USB" +:usbid "0x1234" "0x4323" :status :minimal :model "Templ ZY" diff --git a/doc/descriptions-external/viceo.desc b/doc/descriptions-external/viceo.desc index d119fdae3..9f1d9f1d5 100644 --- a/doc/descriptions-external/viceo.desc +++ b/doc/descriptions-external/viceo.desc @@ -21,6 +21,7 @@ :url "http://www.genius-kye.com/" :model "Vivid Pro USB" ; name models for above-specified mfg. :interface "USB" +:usbid "0x0458" "0x2001" :status :basic :comment "Linux 2.4 only, needs a kernel patch." @@ -28,29 +29,34 @@ :url "http://www.primax.nl/" :model "Colorado USB 19200" :interface "USB" +:usbid "0x0461" "0x0360" :status :basic :comment "Linux 2.4 only, needs a kernel patch." :model "Colorado 2200 USB" :interface "USB" +:usbid "0x0461" "0x0364" :status :untested :comment "Untested. See link for details. Linux 2.4 only, needs a kernel patch." -:url "/untested/primax-colorado-2200-usb.html" +:url "/unsupported/primax-colorado-2200-usb.html" :mfg "Visioneer" :model "OneTouch 6100" :interface "USB" +:usbid "0x04a7" "0x0231" :status :basic :comment "Linux 2.4 only, needs a kernel patch." :model "OneTouch 7600" :interface "USB" +:usbid "0x04a7" "0x0211" :status :basic :comment "Linux 2.4 only, needs a kernel patch." :model "OneTouch 8600" :interface "USB" +:usbid "0x04a7" "0x0331" :status :basic :comment "Linux 2.4 only, needs a kernel patch." @@ -64,5 +70,6 @@ :mfg "LG Electronics" :model "Scanworks 600U" :interface "USB" +:usbid "0x0461" "0x0364" :status :basic :comment "Linux 2.4 only, needs a kernel patch."