From 0f76413b6703eb6fd552980ab823b9529b463892 Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Wed, 23 Jun 2010 18:54:36 +0200 Subject: [PATCH] Revert "kodak: kill unused function" This reverts commit ed907bf94dfc7196d5d6c74372dca035b0490178. --- backend/kodak.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ backend/kodak.h | 2 ++ 2 files changed, 50 insertions(+) diff --git a/backend/kodak.c b/backend/kodak.c index 222b07372..4422105ce 100644 --- a/backend/kodak.c +++ b/backend/kodak.c @@ -2787,6 +2787,54 @@ do_cmd(struct scanner *s, int runRS, int shortTime, return ret; } +static SANE_Status +wait_scanner(struct scanner *s) +{ + int ret; + + unsigned char cmd[TEST_UNIT_READY_len]; + size_t cmdLen = TEST_UNIT_READY_len; + + DBG (10, "wait_scanner: start\n"); + + memset(cmd,0,cmdLen); + set_SCSI_opcode(cmd,TEST_UNIT_READY_code); + + ret = do_cmd ( + s, 0, 1, + cmd, cmdLen, + NULL, 0, + NULL, NULL + ); + + if (ret != SANE_STATUS_GOOD) { + DBG(5,"WARNING: Brain-dead scanner. Hitting with stick\n"); + ret = do_cmd ( + s, 0, 1, + cmd, cmdLen, + NULL, 0, + NULL, NULL + ); + } + if (ret != SANE_STATUS_GOOD) { + DBG(5,"WARNING: Brain-dead scanner. Hitting with stick again\n"); + ret = do_cmd ( + s, 0, 1, + cmd, cmdLen, + NULL, 0, + NULL, NULL + ); + } + + if (ret != SANE_STATUS_GOOD) { + DBG (5, "wait_scanner: error '%s'\n", sane_strstatus (ret)); + } + + DBG (10, "wait_scanner: finish\n"); + + return ret; +} + /** * Convenience method to determine longest string size in a list. */ diff --git a/backend/kodak.h b/backend/kodak.h index 23532f9be..a2fd5e740 100644 --- a/backend/kodak.h +++ b/backend/kodak.h @@ -259,6 +259,8 @@ do_cmd(struct scanner *s, int runRS, int shortTime, unsigned char * inBuff, size_t * inLen ); +static SANE_Status wait_scanner (struct scanner *s); + static SANE_Status do_cancel (struct scanner *scanner); static SANE_Status set_window (struct scanner *s);