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

* backend/canon_dr.c, backend/canon_dr.conf.in, 

doc/descriptions/canon_dr.desc: backend version 13
- new vendor ID for recent machines
- add usb ids for several new machines
- DR-4010C reported good
merge-requests/1/head
m. allan noah 2009-03-06 21:32:02 +00:00
rodzic 6d6d69155e
commit 7d65c00a95
4 zmienionych plików z 174 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -1,3 +1,10 @@
2009-03-06 m. allan noah <kitno455 a t gmail d o t com>
* backend/canon_dr.c, backend/canon_dr.conf.in,
doc/descriptions/canon_dr.desc: backend version 13
- new vendor ID for recent machines
- add usb ids for several new machines
- DR-4010C reported good
2009-03-05 m. allan noah <kitno455 a t gmail d o t com>
* backend/umax1220u.c: set initial scan area dimensions to maximum

45
backend/canon_dr.c
Wyświetl plik

@ -123,6 +123,9 @@
- stop button reqests cancel
v12 2009-01-21, MAN
- dont export private symbols
v13 2009-03-06, MAN
- new vendor ID for recent machines
- add usb ids for several new machines
SANE FLOW DIAGRAM
@ -183,7 +186,7 @@
#include "canon_dr.h"
#define DEBUG 1
#define BUILD 12
#define BUILD 13
/* values for SANE_DEBUG_CANON_DR env var:
- errors 5
@ -399,6 +402,9 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x1601'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x1601", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x1602'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x1602", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x1603'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x1603", attach_one_usb);
@ -417,14 +423,41 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x1609'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x1609", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x160a'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x160a", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x160b'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x160b", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x1614'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x1614", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x160c'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x160c", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x1618'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x1618", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x160f'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x160f", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x04a9 0x2222'\n");
sanei_usb_attach_matching_devices("usb 0x04a9 0x2222", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x1614'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x1614", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x1617'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x1617", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x1618'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x1618", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x161a'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x161a", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x161b'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x161b", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x161d'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x161d", attach_one_usb);
DBG (15, "sane_get_devices: looking for 'usb 0x1083 0x1620'\n");
sanei_usb_attach_matching_devices("usb 0x1083 0x1620", attach_one_usb);
}
/*delete missing scanners from list*/
@ -733,7 +766,7 @@ init_inquire (struct scanner *s)
}
/*check for model name*/
if (strncmp ("DR", s->model_name, 2)) {
if (strncmp ("DR", s->model_name, 2) && strncmp ("CR", s->model_name, 2)) {
DBG (5, "The device at '%s' is reported to be a '%s'\n", s->device_name, s->model_name);
DBG (5, "This backend only supports Canon DR-series products.\n");
return SANE_STATUS_INVAL;

33
backend/canon_dr.conf.in
Wyświetl plik

@ -26,6 +26,9 @@ scsi CANON DR
# DR-2080C
usb 0x04a9 0x1601
# CR-180
usb 0x04a9 0x1602
# DR-9080C
usb 0x04a9 0x1603
@ -44,11 +47,37 @@ usb 0x04a9 0x1608
# DR-3080CII
usb 0x04a9 0x1609
# DR-2050C/SP
usb 0x04a9 0x160a
# DR-7580
usb 0x04a9 0x160b
# CR-55
usb 0x1083 0x160c
# DR-1210C (two versions?)
usb 0x1083 0x160f
usb 0x04a9 0x2222
# DR-4010C
usb 0x04a9 0x1614
usb 0x1083 0x1614
# DR-2510C
usb 0x1083 0x1617
# DR-X10C
usb 0x04a9 0x1618
usb 0x1083 0x1618
# CR-25
usb 0x1083 0x161a
# DR-2010C
usb 0x1083 0x161b
# DR-3010C
usb 0x1083 0x161d
# DR-7090C
usb 0x1083 0x1620

101
doc/descriptions/canon_dr.desc
Wyświetl plik

@ -11,7 +11,7 @@
:backend "canon_dr" ; name of backend
:url "http://www.thebility.com/canon/"
:version "10" ; version of backend
:version "13" ; version of backend
:manpage "sane-canon_dr" ; name of manpage (if it exists)
:comment "New backend as of SANE release 1.1.0, testers needed, see manpage"
:devicetype :scanner ; start of a list of devices....
@ -23,19 +23,79 @@
:url "http://www.canon.com/"
;==================================================
:model "CR-25"
:interface "USB"
:usbid "0x1083" "0x161a"
:status :untested
:comment "Please test!"
:model "CR-55"
:interface "USB"
:usbid "0x1083" "0x160c"
:status :untested
:comment "Please test!"
:model "CR-180"
:interface "USB SCSI"
:usbid "0x04a9" "0x1602"
:status :untested
:comment "Please test!"
:model "DR-1210C"
:interface "USB"
:usbid "0x04a9" "0x2222"
:status :untested
:comment "Older version? Please test!"
:model "DR-1210C"
:interface "USB"
:usbid "0x1083" "0x160f"
:status :untested
:comment "Later version? Please test!"
:model "DR-2010C"
:interface "USB"
:usbid "0x1083" "0x161b"
:status :untested
:comment "Please test!"
:model "DR-2050C"
:interface "USB"
:usbid "0x04a9" "0x160a"
:status :untested
:comment "Please test!"
:model "DR-2050SP"
:interface "USB"
:usbid "0x04a9" "0x160a"
:status :untested
:comment "Same as DR-2050C? Please test!"
:model "DR-2080C"
:interface "USB SCSI"
:usbid "0x04a9" "0x1601"
:status :untested
:comment "Please test!"
:model "DR-2510C"
:interface "USB"
:usbid "0x1083" "0x1617"
:status :untested
:comment "Please test!"
:model "DR-2580C"
:interface "USB SCSI"
:usbid "0x04a9" "0x1608"
:status :untested
:comment "Please test!"
:model "DR 3020"
:model "DR-3010C"
:interface "USB"
:usbid "0x1083" "0x161d"
:status :untested
:comment "Please test!"
:model "DR3020"
:interface "SCSI"
:status :untested
:comment "Please test!"
@ -63,7 +123,19 @@
:model "DR-4010C"
:interface "USB"
:usbid "0x04a9" "0x1614"
:usbid "0x1083" "0x1614"
:status :good
:comment ""
:model "DR4080U"
:interface "USB"
;:usbid "0x1083" "0x1614"
:status :untested
:comment "Please test!"
:model "DR-4580U"
:interface "USB"
;:usbid "0x1083" "0x1614"
:status :untested
:comment "Please test!"
@ -73,6 +145,21 @@
:status :untested
:comment "Please test!"
:model "DR-5020"
:interface "SCSI"
:status :untested
:comment "Please test!"
:model "DR-5060F"
:interface "SCSI"
:status :untested
:comment "Please test!"
:model "DR-5080C"
:interface "SCSI"
:status :untested
:comment "Please test!"
:model "DR-6080"
:interface "USB SCSI"
:usbid "0x04a9" "0x1607"
@ -85,6 +172,12 @@
:status :untested
:comment "Please test!"
:model "DR-7090C"
:interface "USB SCSI"
:usbid "0x1083" "0x1620"
:status :untested
:comment "Please test!"
:model "DR-7580"
:interface "USB SCSI"
:usbid "0x04a9" "0x160b"
@ -99,6 +192,6 @@
:model "DR-X10C"
:interface "USB SCSI"
:usbid "0x04a9" "0x1618"
:usbid "0x1083" "0x1618"
:status :untested
:comment "Please test!"