diff --git a/ChangeLog b/ChangeLog index 1fb4f72dd..23b11637a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-04-18 Henning Meier-Geinitz + + * doc/descriptions/epson.desc doc/descriptions/fujitsu.desc + doc/descriptions/hp.desc doc/descriptions/u12.desc + doc/descriptions/umax.desc: Added most USB vendor and product + ids. Minor cleanup. + 2006-04-17 Henning Meier-Geinitz * backend/umax1220u-common.c backend/umax1220u.c @@ -10,8 +17,8 @@ doc/descriptions-external/pixma.desc: Moved scanners supported by the external pixma backend to pixma.desc. Added Canon PIXMA MP730. - * doc/sane-mustek_usb2.man: Removed description of non-existimg - configuration ile. + * doc/sane-mustek_usb2.man: Removed description of non-existing + configuration file. 2006-04-12 Julien Blache * tools/sane-desc.c: Fix/optimize udev rules; tests on the same diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc index 6272b8cb0..e506720fd 100644 --- a/doc/descriptions/epson.desc +++ b/doc/descriptions/epson.desc @@ -81,14 +81,17 @@ :model "Perfection 636U" :interface "USB" +:usbid "0x04b8" "0x0101" :status :complete :model "Perfection 610" :interface "USB" +:usbid "0x04b8" "0x0103" :status :complete :model "Perfection 640" :interface "USB" +:usbid "0x04b8" "0x010c" :status :complete :model "Perfection 1200S" @@ -97,45 +100,55 @@ :model "Perfection 1200U" :interface "USB" +:usbid "0x04b8" "0x0104" :status :complete :model "Perfection 1200Photo" :comment "with TPU" :interface "USB" +:usbid "0x04b8" "0x0104" :status :complete :model "Perfection 1240" :interface "SCSI USB" +:usbid "0x04b8" "0x010b" :status :complete :model "Perfection 1640" :interface "SCSI USB" +:usbid "0x04b8" "0x010a" :status :complete :model "Perfection 1650" :interface "USB" +:usbid "0x04b8" "0x0110" :status :complete :model "Perfection 1660" :interface "USB" +:usbid "0x04b8" "0x011e" :status :complete :model "Perfection 2400" :interface "USB" +:usbid "0x04b8" "0x011b" :status :complete :model "Perfection 2450" :interface "USB IEEE-1394" +:usbid "0x04b8" "0x0112" :status :complete :model "Perfection 3200" :comment "US version of the GT-9800" :interface "USB" +:usbid "0x04b8" "0x011c" :status :complete :model "Perfection 4870" :comment "US version of the GT-9800" :interface "USB" +:usbid "0x04b8" "0x0128" :status :complete :model "Expression 636" @@ -149,10 +162,12 @@ :model "Expression 1600" :interface "SCSI USB IEEE-1394" +:usbid "0x04b8" "0x0107" :status :complete :model "Expression 1680" :interface "SCSI USB IEEE-1394" +:usbid "0x04b8" "0x010e" :status :complete :model "FilmScan 200" @@ -163,42 +178,52 @@ :model "CX-3200" :interface "USB" +:usbid "0x04b8" "0x0802" :status :good :model "CX-3600" :interface "USB" +:usbid "0x04b8" "0x080e" :status :good :model "CX-3650" +:usbid "0x04b8" "0x080e" :interface "USB" :status :good :model "CX-4600" :interface "USB" +:usbid "0x04b8" "0x080d" :status :good :model "CX-5200" :interface "USB" +:usbid "0x04b8" "0x0801" :status :good :model "CX-5400" :interface "USB" +:usbid "0x04b8" "0x0801" :status :good :model "CX-6400" :interface "USB" +:usbid "0x04b8" "0x0805" :status :good :model "RX-500" :interface "USB" +:usbid "0x04b8" "0x0807" :status :good :model "RX-600" :interface "USB" +:usbid "0x04b8" "0x0806" :status :good :model "RX-425" :interface "USB" +:usbid "0x04b8" "0x080f" :status :good :model "DX-3850" @@ -207,28 +232,35 @@ :model "CX-3700" :interface "USB" +:usbid "0x04b8" "0x0818" :status :good :model "CX-3800" :interface "USB" +:usbid "0x04b8" "0x0818" :status :good :model "DX-3800" :interface "USB" +:usbid "0x04b8" "0x0818" :status :good :model "CX-4200" :interface "USB" +:usbid "0x04b8" "0x0820" :status :good :model "AcuLaser CX11" :interface "USB" +:usbid "0x04b8" "0x0815" :status :good :model "AcuLaser CX11NF" :interface "USB" +:usbid "0x04b8" "0x0815" :status :good :model "CX-6600" :interface "USB" +:usbid "0x04b8" "0x0103" :status :good diff --git a/doc/descriptions/fujitsu.desc b/doc/descriptions/fujitsu.desc index 48d1b4349..4e0adf987 100644 --- a/doc/descriptions/fujitsu.desc +++ b/doc/descriptions/fujitsu.desc @@ -55,10 +55,12 @@ :model "fi-4120C" :interface "SCSI USB" +:usbid "0x04c5" "0x1042" :status :basic :model "fi-4220C" :interface "SCSI USB" +:usbid "0x04c5" "0x1041" :status :basic :model "fi-4340C" diff --git a/doc/descriptions/hp.desc b/doc/descriptions/hp.desc index 2f3f33ef1..a73ebd76d 100644 --- a/doc/descriptions/hp.desc +++ b/doc/descriptions/hp.desc @@ -20,63 +20,89 @@ :mfg "Hewlett-Packard" ; name a manufacturer :url "http://www.hp.com/" + :model "ScanJet Plus" ; name models for above-specified mfg. :interface "Propietary" :status :complete :comment "Driver for HP parallel interface card required" + :model "ScanJet IIc" :interface "SCSI" :status :complete + :model "ScanJet IIp" :interface "SCSI" :status :complete + :model "ScanJet IIcx" :interface "SCSI" :status :complete + :model "ScanJet 3c" :interface "SCSI" :status :complete + :model "ScanJet 3p" :interface "SCSI" :status :complete + :model "ScanJet 4c" :interface "SCSI" :status :complete + :model "ScanJet 4p" :interface "SCSI" :status :complete + :model "ScanJet 4100C" :interface "USB" +:usbid "0x03f0" "0x0101" :status :complete + :model "ScanJet 5p" :interface "SCSI" :status :complete + :model "ScanJet 5100C" :interface "Parport" :status :complete :comment "Requires ppscsi driver and epst module" + :model "ScanJet 5200C" :interface "Parport USB" +:usbid "0x03f0" "0x0401" :status :complete :comment "Parallel interface requires ppscsi driver and epst module" + :model "ScanJet 6100C" :interface "SCSI" :status :complete + :model "ScanJet 6200C" :interface "SCSI USB" +:usbid "0x03f0" "0x0201" :status :complete + :model "ScanJet 6250C" :interface "SCSI USB" +:usbid "0x03f0" "0x0201" :status :complete + :model "ScanJet 6300C" :interface "SCSI USB" +:usbid "0x03f0" "0x0601" :status :complete + :model "ScanJet 6350C" :interface "SCSI USB" +:usbid "0x03f0" "0x0601" :status :complete + :model "ScanJet 6390C" :interface "SCSI USB" +:usbid "0x03f0" "0x0601" :status :complete + :model "PhotoSmart PhotoScanner" :interface "SCSI" :status :complete diff --git a/doc/descriptions/u12.desc b/doc/descriptions/u12.desc index 060a7d79a..e5ff81fe2 100644 --- a/doc/descriptions/u12.desc +++ b/doc/descriptions/u12.desc @@ -19,16 +19,19 @@ :model "OpticPro U12" :interface "USB" +:usbid "0x07b3" "0x0001" :status :basic :comment "Note: Only devices with product ID 0x0001 are supported!" :model "OpticPro UT12" :interface "USB" +:usbid "0x07b3" "0x0001" :status :basic :comment "Note: Only devices with product ID 0x0001 are supported!" :model "OpticPro 1212U" :interface "USB" +:usbid "0x07b3" "0x0001" :status :basic ;* RevScan ********************************************************************************** @@ -37,6 +40,7 @@ :model "RevScan Orange R48Ti" :interface "USB" +:usbid "0x07b3" "0x0001" :status :basic :comment "Rebadged Plustek OpticPro UT12" @@ -47,9 +51,11 @@ :model "ColorPage HR6 V1" :interface "USB" +:usbid "0x0458" "0x2004" :status :basic :model "ColorPage Vivid III USB" :interface "USB" +:usbid "0x07b3" "0x0001" :status :untested :comment "Note: Device has Plustek vendor and product ID (0x07b3/0x0001)" diff --git a/doc/descriptions/umax.desc b/doc/descriptions/umax.desc index 4582202bc..b5fabbf9c 100644 --- a/doc/descriptions/umax.desc +++ b/doc/descriptions/umax.desc @@ -98,6 +98,7 @@ :model "Astra 2200 (SU)" :interface "USB" +:usbid "0x1606" "0x0230" :status :good :comment "OK, needs USB control messages"