From a8f3404cc3e90125ef004f23450acbd82f4b0626 Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Thu, 29 May 2008 20:03:35 +0000 Subject: [PATCH] Update SANE status types, and take into account new ones. --- backend/pixma_io_sanei.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/pixma_io_sanei.c b/backend/pixma_io_sanei.c index 8d17357ee..5b6f4e09c 100644 --- a/backend/pixma_io_sanei.c +++ b/backend/pixma_io_sanei.c @@ -227,10 +227,16 @@ map_error (SANE_Status ss) case SANE_STATUS_ACCESS_DENIED: return PIXMA_EACCES; case SANE_STATUS_CANCELLED: - case SANE_STATUS_EOF: + return PIXMA_ECANCELED; case SANE_STATUS_JAMMED: - case SANE_STATUS_NO_DOCS: + return PIXMA_EPAPER_JAMMED; case SANE_STATUS_COVER_OPEN: + return PIXMA_ECOVER_OPEN; + case SANE_STATUS_NO_DOCS: + return PIXMA_ENO_PAPER; + case SANE_STATUS_EOF: + case SANE_STATUS_HW_LOCKED: /* unused by pixma */ + case SANE_STATUS_WARMING_UP: /* unused by pixma */ break; } PDBG (pixma_dbg (1, "BUG:Unmapped SANE Status code %d\n", ss));