From bfa5f45e9484f4982851277846db3beaa90965af Mon Sep 17 00:00:00 2001 From: Rolf Bensch Date: Mon, 11 Feb 2013 19:25:44 +0100 Subject: [PATCH] new parameter mf->generation - new multifunctionals are (generation == 2) --- backend/pixma_imageclass.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c index 3b55fe04a..eb2288b48 100644 --- a/backend/pixma_imageclass.c +++ b/backend/pixma_imageclass.c @@ -123,6 +123,8 @@ typedef struct iclass_t unsigned buf_len, blk_len; unsigned last_block; + + uint8_t generation; /* New multifunctionals are (generation == 2) */ } iclass_t; @@ -459,6 +461,10 @@ iclass_open (pixma_t * s) mf->cb.cmd_header_len = 10; mf->cb.cmd_len_field_ofs = 7; + /* set generation = 2 for new multifunctionals */ + mf->generation = (s->cfg->pid >= MF8030_PID) ? 2 : 1; + PDBG (pixma_dbg (3, "*iclass_open***** This is a generation %d scanner. *****\n", mf->generation)); + PDBG (pixma_dbg (3, "Trying to clear the interrupt buffer...\n")); if (handle_interrupt (s, 200) == 0) {