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 MF4550d

merge-requests/1/head
Rolf Bensch 2013-01-14 14:21:58 +01:00
rodzic a8119509db
commit 580b55cb19
3 zmienionych plików z 16 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
backend/pixma_imageclass.c
Wyświetl plik

@ -85,6 +85,7 @@
#define MF5650_PID 0x264f
#define MF8100_PID 0x2659
#define MF8030_PID 0x2707
#define MF4550_PID 0x2736
enum iclass_state_t
@ -271,10 +272,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 ? cmd_read_image2 : cmd_read_image), mf->cb.buf);
pixma_set_be16 (((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 ||
s->cfg->pid == MF4550_PID ||
s->cfg->pid == MF4600_PID ||
s->cfg->pid == MF6500_PID ||
s->cfg->pid == MF8030_PID) ? 512 : hlen;
@ -286,6 +288,7 @@ request_image_block (pixma_t * s, unsigned flag, uint8_t * info,
error = 0;
if (s->cfg->pid == MF4410_PID ||
s->cfg->pid == MF4550_PID ||
s->cfg->pid == MF4600_PID ||
s->cfg->pid == MF6500_PID ||
s->cfg->pid == MF8030_PID)
@ -309,6 +312,7 @@ read_image_block (pixma_t * s, uint8_t * data, unsigned size)
unsigned maxchunksize, chunksize, count = 0;
maxchunksize = MAX_CHUNK_SIZE * ((s->cfg->pid == MF4410_PID ||
s->cfg->pid == MF4550_PID ||
s->cfg->pid == MF4600_PID ||
s->cfg->pid == MF6500_PID ||
s->cfg->pid == MF8030_PID) ? 4 : 1);
@ -607,6 +611,7 @@ iclass_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib)
{
if (s->param->channels != 1 &&
s->cfg->pid != MF4410_PID &&
s->cfg->pid != MF4550_PID &&
s->cfg->pid != MF4600_PID &&
s->cfg->pid != MF6500_PID &&
s->cfg->pid != MF8030_PID)
@ -655,7 +660,7 @@ iclass_finish_scan (pixma_t * s)
query_status (s);
activate (s, 0);
query_status (s);
if (mf->last_block == 0x28 || (s->cfg->pid==MF4410_PID && mf->last_block==0x38))
if (mf->last_block == 0x28 || ((s->cfg->pid==MF4410_PID || s->cfg->pid == MF4550_PID) && mf->last_block==0x38))
{
abort_session (s);
}
@ -724,6 +729,7 @@ const pixma_config_t pixma_iclass_devices[] = {
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 ("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),
/* 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

@ -661,6 +661,12 @@
:status :good
:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). ADF empty buggy."
:model "i-SENSYS MF4550d"
:interface "USB"
:usbid "0x04a9" "0x2737"
:status :good
:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). ADF buggy."
:model "imageCLASS MF4660"
:interface "USB"
:usbid "0x04a9" "0x26b0"

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

@ -1,4 +1,4 @@
.TH "sane\-pixma" "5" "11 Jan 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.TH "sane\-pixma" "5" "14 Jan 2013" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
.IX sane\-pixma
.SH NAME
.B sane\-pixma
@ -55,7 +55,7 @@ ImageCLASS MF4410, MF4430, MF4660, MF4690
.br
ImageCLASS MF5730, MF5770, MF6550, D420, D480
.br
I-SENSYS MF4320d, MF4330d
I-SENSYS MF4320d, MF4330d, MF4550d
.br
imageRunner 1020/1024/1025
.br