Change to include different checksumming for MF41xx and MF42xx series

ChangeLog

@@ -1,3 +1,7 @@
+2008-12-28  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_imageclass.c:
+	Change to include different checksumming for MF41xx and MF42xx series
+
 2008-12-26  Alessandro Zummo <a.zummo@towertech.it>
 	* backend/epson2.c: changed version code,
 	added protection from wrong settings.

backend/pixma_imageclass.c

@@ -173,7 +173,15 @@ activate (pixma_t * s, uint8_t x)
   uint8_t *data = pixma_newcmd (&mf->cb, cmd_activate, 10, 0);
   data[0] = 1;
   data[3] = x;
-  return iclass_exec (s, &mf->cb, 1);
+  switch (s->cfg->pid)
+    {
+    case MF4200_PID:
+      return iclass_exec (s, &mf->cb, 1);
+      break;
+    case MF4100_PID:
+    default:
+      return pixma_exec (s, &mf->cb);
+    }
 }
 
 static int
@@ -189,7 +197,15 @@ select_source (pixma_t * s)
   iclass_t *mf = (iclass_t *) s->subdriver;
   uint8_t *data = pixma_newcmd (&mf->cb, cmd_select_source, 11, 0);
   data[0] = (s->param->source == PIXMA_SOURCE_ADF) ? 2 : 1;
-  return iclass_exec (s, &mf->cb, 0);
+  switch (s->cfg->pid)
+    {
+    case MF4200_PID:
+      return iclass_exec (s, &mf->cb, 1);
+      break;
+    case MF4100_PID:
+    default:
+      return pixma_exec (s, &mf->cb);
+    }
 }
 
 static int
@@ -210,7 +226,15 @@ send_scan_param (pixma_t * s)
   data[0x1f] = 0x7f;
   data[0x20] = 0xff;
   data[0x23] = 0x81;
-  return iclass_exec (s, &mf->cb, 0);
+  switch (s->cfg->pid)
+    {
+    case MF4200_PID:
+      return iclass_exec (s, &mf->cb, 1);
+      break;
+    case MF4100_PID:
+    default:
+      return pixma_exec (s, &mf->cb);
+    }
 }
 
 static int