From aa7a54199df5a252f9480ab4524984ec87b27713 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <nicols-guest@users.alioth.debian.org>
Date: Sun, 14 Jun 2009 18:37:11 +0200
Subject: [PATCH] Fix for MP800R network scan and documentation update for
 MF5770.

- backend/pixma_mp150.c:
  Thanks to Vladimir Andreev patch, fix network scan for MP800R.
- doc/descriptions/pixma.desc and doc/sane-pixma.man:
  . Documentation updates for latest MF5770 changes.
  . Note: MF5770 grayscale mode appears to require some more work.
---
 backend/pixma_mp150.c       | 4 +++-
 doc/descriptions/pixma.desc | 4 ++--
 doc/sane-pixma.man          | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 29a88502b..11cfe97c7 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -841,7 +841,9 @@ wait_until_ready (pixma_t * s)
       WAIT_INTERRUPT (1000);
       if (mp->generation == 3)
         RET_IF_ERR (query_status_3 (s));
-      else if (s->cfg->pid == MP600_PID || s->cfg->pid == MP600R_PID)
+      else if (s->cfg->pid == MP600_PID || 
+               s->cfg->pid == MP600R_PID ||  
+               s->cfg->pid == MP800R_PID)
         RET_IF_ERR (query_status (s));
       if (--tmo == 0)
         {
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 824c16376..745658d84 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -324,8 +324,8 @@
 :model "imageCLASS MF5770"
 :interface "USB"
 :usbid "0x04a9" "0x265f"
-:status :untested
-:comment "Testers needed!"
+:status :good
+:comment "All resolutions supported (up to 600DPI) in color. Grayscale not working yet in preview (75 dpi capable ?)."
 
 :model "imageCLASS MF3110"
 :interface "USB"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index dbc665ab7..2c992da01 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "28 Feb 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "10 Jun 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon PIXMA MP series
@@ -30,7 +30,7 @@ MultiPASS MP700, MP730, PIXMA MP750 (no grayscale)
 .br
 ImageCLASS MF4010, MF4018, MF4120, MF4122, MF4140, MF4150
 .br
-ImageCLASS MF4270
+ImageCLASS MF4270, MF5770
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs
@@ -54,7 +54,7 @@ PIXMA MP260
 .br
 ImageCLASS MF3110, MF3240
 .br
-ImageCLASS MF5630, MF5650, MF5730, MF5750, MF5770, MF8170c
+ImageCLASS MF5630, MF5650, MF5730, MF5750, MF8170c
 .RE
 .PP
 \#The following models may use partly the same Pixma protocol as MPs listed