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

new scanner Canon i-SENSYS MF3010

merge-requests/1/head
Rolf Bensch 2013-04-19 23:12:52 +02:00
rodzic f513c65485
commit 5f1da65108
4 zmienionych plików z 26 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2013-04-19 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma_imageclass.c, doc/descriptions/pixma.desc,
doc/sane-pixma.man: New scanner Canon i-SENSYS MF3010 reported by
Nathan Stewart.
2013-04-11 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
New scanners Canon Pixma MG2200, MG3200, MG5400, MX390, MX450, MX520 and

16
backend/pixma_imageclass.c
Wyświetl plik

@ -80,6 +80,7 @@
#define MF3200_PID 0x2684
#define MF6500_PID 0x2686
#define MF4410_PID 0x2737
#define MF3010_PID 0x2759
/* the following are all untested */
#define MF5630_PID 0x264e
#define MF5650_PID 0x264f
@ -276,10 +277,11 @@ request_image_block (pixma_t * s, unsigned flag, uint8_t * info,
const int hlen = 2 + 6;
memset (mf->cb.buf, 0, 11);
pixma_set_be16 (((s->cfg->pid == MF4410_PID || s->cfg->pid == MF4550_PID) ? cmd_read_image2 : cmd_read_image), mf->cb.buf);
pixma_set_be16 (((s->cfg->pid == MF3010_PID || s->cfg->pid == MF4410_PID || s->cfg->pid == MF4550_PID) ? cmd_read_image2 : cmd_read_image), mf->cb.buf);
mf->cb.buf[8] = flag;
mf->cb.buf[10] = 0x06;
expected_len = (s->cfg->pid == MF4410_PID ||
expected_len = (s->cfg->pid == MF3010_PID ||
s->cfg->pid == MF4410_PID ||
s->cfg->pid == MF4550_PID ||
s->cfg->pid == MF4600_PID ||
s->cfg->pid == MF6500_PID ||
@ -291,7 +293,8 @@ request_image_block (pixma_t * s, unsigned flag, uint8_t * info,
*size = pixma_get_be16 (mf->cb.buf + 6); /* 16bit size */
error = 0;
if (s->cfg->pid == MF4410_PID ||
if (s->cfg->pid == MF3010_PID ||
s->cfg->pid == MF4410_PID ||
s->cfg->pid == MF4550_PID ||
s->cfg->pid == MF4600_PID ||
s->cfg->pid == MF6500_PID ||
@ -315,7 +318,8 @@ read_image_block (pixma_t * s, uint8_t * data, unsigned size)
int error;
unsigned maxchunksize, chunksize, count = 0;
maxchunksize = MAX_CHUNK_SIZE * ((s->cfg->pid == MF4410_PID ||
maxchunksize = MAX_CHUNK_SIZE * ((s->cfg->pid == MF3010_PID ||
s->cfg->pid == MF4410_PID ||
s->cfg->pid == MF4550_PID ||
s->cfg->pid == MF4600_PID ||
s->cfg->pid == MF6500_PID ||
@ -631,7 +635,8 @@ iclass_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib)
if (n != 0)
{
if (s->param->channels != 1 &&
s->cfg->pid != MF4410_PID &&
s->cfg->pid != MF3010_PID &&
s->cfg->pid != MF4410_PID &&
s->cfg->pid != MF4550_PID &&
s->cfg->pid != MF4600_PID &&
s->cfg->pid != MF6500_PID &&
@ -762,6 +767,7 @@ const pixma_config_t pixma_iclass_devices[] = {
DEV ("Canon imageClass MF6500", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF4410", "MF4410", MF4410_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon i-SENSYS MF4550d", "MF4550", MF4550_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon i-SENSYS MF3010", "MF3010", MF3010_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),

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

@ -619,6 +619,12 @@
:status :complete
:comment "All resolutions supported (up to 600DPI). Flatbed, ADF simplex and Duplex supported."
:model "i-SENSYS MF3010"
:interface "USB Ethernet"
:usbid "0x04a9" "0x2759"
:status :complete
:comment "All resolutions supported (up to 600DPI)"
:model "imageCLASS MF3110"
:interface "USB"
:usbid "0x04a9" "0x2660"

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

@ -1,10 +1,10 @@
.TH "sane\-pixma" "5" "11 Apr 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.TH "sane\-pixma" "5" "19 Apr 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-pixma
.SH NAME
.B sane\-pixma
\- SANE backend for Canon PIXMA Multi-Functions Printers
.br
E, MG, MP, MX, ImageCLASS, imageRunner and I-SENSYS series
E, MG, MP, MX, ImageCLASS, imageRunner and i-SENSYS series
.br
and for Canon CanoScan Flatbed/TPU Scanners
.SH DESCRIPTION
@ -57,7 +57,7 @@ ImageCLASS MF4410, MF4430, MF4660, MF4690
.br
ImageCLASS MF5730, MF5770, MF6550, D420, D480
.br
I-SENSYS MF4320d, MF4330d, MF4550d
i-SENSYS MF3010, MF4320d, MF4330d, MF4550d
.br
imageRunner 1020/1024/1025
.br
@ -93,7 +93,7 @@ PIXMA MX710, MX920
.br
ImageCLASS MF5630, MF5650, MF5750, MF8030, MF8170c
.br
I-SENSYS MF5880dn, MF6680dn
i-SENSYS MF5880dn, MF6680dn
.RE
.PP
\#The following models may use partly the same Pixma protocol as other devices