From 228861b6b2ce5c2639459484f0fe3f435ebede62 Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Mon, 8 Jun 2009 22:32:34 +0200 Subject: [PATCH] Second set of modifications in pixma backend for Canon ImageClass MF5770. File pixma_mp730.c: - first page scan warmup time set to 10 sec - no image post processing required in color mode --- backend/pixma_mp730.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/pixma_mp730.c b/backend/pixma_mp730.c index dadeb5757..8ade8cf9a 100644 --- a/backend/pixma_mp730.c +++ b/backend/pixma_mp730.c @@ -369,10 +369,10 @@ step1 (pixma_t * s) return PIXMA_ENO_PAPER; if (has_ccd_sensor (s)) { - /* MF5770: Wait 25 sec before starting */ - if (s->cfg->pid == MF5770_PID) + /* MF5770: Wait 10 sec before starting for 1st page only */ + if (s->cfg->pid == MF5770_PID && s->param->adf_pageid == 0) { - tmo = 25; /* like Windows driver, 25 sec CCD calibration ? */ + tmo = 10; /* like Windows driver, 10 sec CCD calibration ? */ while (--tmo >= 0) { error = handle_interrupt (s, 1000); \ @@ -582,7 +582,7 @@ mp730_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib) /* n = number of full lines (rows) we have in the buffer. */ if (n != 0) { - if (s->param->channels != 1) + if (s->param->channels != 1 && s->cfg->pid != MF5770_PID) { /* color */ pack_rgb (mp->imgbuf, n, mp->raw_width, mp->lbuf);