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

pixma: usb timeouts to 20 sec as needed by ImageClass MF3240, source code comments and documentation updates for this model. 

- backend/pixma_io.h: usb timeouts change
- backend/pixma_imageclass.c, doc/sane-pixma.man, doc/descriptions/pixma.desc: doc and comments updates.
merge-requests/1/head
Nicolas Martin 2010-01-29 21:39:33 +01:00
rodzic 13cded1269
commit 939acce04a
5 zmienionych plików z 15 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
ChangeLog
Wyświetl plik

@ -1,3 +1,9 @@
2010-01-29 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_io.h, backend/pixma_imageclass.c,
doc/sane-pixma.man, doc/descriptions/pixma.desc:
pixma: changed usb timeouts to 20 sec to support ImageClass MF3240.
updated source code comments and documentation.
2010-01-28 Oliver Schwartz <oliverschwartz at users.sourceforge.net>
* backend/snapscan-usb.c: Use hash of device string instead of parsing
it to create a semaphore id. The new code is less platform dependent

4
backend/pixma_imageclass.c
Wyświetl plik

@ -75,11 +75,11 @@
#define MF4360_PID 0x26ec
#define D480_PID 0x26ed
#define MF4320_PID 0x26ee
#define MF3200_PID 0x2684
/* the following are all untested */
#define MF5630_PID 0x264e
#define MF5650_PID 0x264f
#define MF8100_PID 0x2659
#define MF3200_PID 0x2684
#define MF6500_PID 0x2686
@ -695,11 +695,11 @@ const pixma_config_t pixma_iclass_devices[] = {
DEV ("Canon imageCLASS MF4360", "MF4360", MF4360_PID, 600, 640, 877, PIXMA_CAP_ADFDUP),
DEV ("Canon imageCLASS MF4320", "MF4320", MF4320_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_PID, 600, 640, 877, 0),
DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, 0),
/* FIXME: the following capabilities all need updating/verifying */
DEV ("Canon imageCLASS MF5630", "MF5630", MF5630_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon laserBase MF5650", "MF5650", MF5650_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF8170c", "MF8170c", MF8100_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, 0),
DEV ("Canon imageClass MF6500", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV (NULL, NULL, 0, 0, 0, 0, 0)
};

4
backend/pixma_io.h
Wyświetl plik

@ -57,9 +57,9 @@
*/
/** Timeout for pixma_read() in milliseconds */
#define PIXMA_BULKIN_TIMEOUT 10000
#define PIXMA_BULKIN_TIMEOUT 20000
/** Timeout for pixma_write() in milliseconds */
#define PIXMA_BULKOUT_TIMEOUT 10000
#define PIXMA_BULKOUT_TIMEOUT 20000
struct pixma_io_t;

4
doc/descriptions/pixma.desc
Wyświetl plik

@ -402,8 +402,8 @@
:model "imageCLASS MF3240"
:interface "USB"
:usbid "0x04a9" "0x2684"
:status :untested
:comment "Testers needed!"
:status :complete
:comment "All resolutions supported (up to 600DPI)"
:model "imageCLASS MF4120"
:interface "USB"

6
doc/sane-pixma.man
Wyświetl plik

@ -31,9 +31,9 @@ PIXMA MX300, MX310, MX330, MX700, MX850, MX860, MX7600
.br
MultiPASS MP700, MP730, PIXMA MP750 (no grayscale)
.br
ImageCLASS MF3110, MF4010, MF4018, MF4120, MF4122, MF4140
ImageCLASS MF3110, MF3240, MF4010, MF4018, MF4120, MF4122
.br
ImageCLASS MF4150, MF4270, MF4370dn, MF4380dn
ImageCLASS MF4140, MF4150, MF4270, MF4370dn, MF4380dn
.br
ImageCLASS MF4660, MF4690, MF5770, D480
.br
@ -59,7 +59,7 @@ PIXMA MP740
.br
PIXMA MX320
.br
ImageCLASS MF3240, MF5630, MF5650, MF5730, MF5750, MF8170c
ImageCLASS MF5630, MF5650, MF5730, MF5750, MF8170c
.RE
.PP
\#The following models may use partly the same Pixma protocol as MPs listed