From 2628042adaf17a555e21f27b7e9b66790e24e9ff Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Mon, 19 Jan 2009 21:02:26 +0000 Subject: [PATCH] Changes for MF4600 series and a few fixes. --- ChangeLog | 5 +++++ backend/pixma_imageclass.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4d800189..17983949f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-19 Nicolas Martin + * pixma_imageclass.c: + Fixed select_source message length, and typo bug in last update. + Set MP4600 series for inverted checksumming. + 2009-01-19 Stéphane Voltz * backend/genesys.c backend/genesys.conf.in backend/genesys.h backend/genesys_devices.c backend/genesys_gl646.c diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c index 05bf98e10..8d4bb840f 100644 --- a/backend/pixma_imageclass.c +++ b/backend/pixma_imageclass.c @@ -176,6 +176,7 @@ activate (pixma_t * s, uint8_t x) switch (s->cfg->pid) { case MF4200_PID: + case MF4600_PID: return iclass_exec (s, &mf->cb, 1); break; case MF4100_PID: @@ -195,12 +196,13 @@ static int select_source (pixma_t * s) { iclass_t *mf = (iclass_t *) s->subdriver; - uint8_t *data = pixma_newcmd (&mf->cb, cmd_select_source, 11, 0); + uint8_t *data = pixma_newcmd (&mf->cb, cmd_select_source, 10, 0); data[0] = (s->param->source == PIXMA_SOURCE_ADF) ? 2 : 1; switch (s->cfg->pid) { case MF4200_PID: - return iclass_exec (s, &mf->cb, 1); + case MF4600_PID: + return iclass_exec (s, &mf->cb, 0); break; case MF4100_PID: default: @@ -229,7 +231,8 @@ send_scan_param (pixma_t * s) switch (s->cfg->pid) { case MF4200_PID: - return iclass_exec (s, &mf->cb, 1); + case MF4600_PID: + return iclass_exec (s, &mf->cb, 0); break; case MF4100_PID: default: