diff --git a/hgdriver/hgdev/hg_scanner_302.cpp b/hgdriver/hgdev/hg_scanner_302.cpp index 9ccbd8b..3b4294a 100644 --- a/hgdriver/hgdev/hg_scanner_302.cpp +++ b/hgdriver/hgdev/hg_scanner_302.cpp @@ -1078,8 +1078,8 @@ int hg_scanner_302::start(void) ret = status_ = SCANNER_ERR_DEVICE_ISLOCK; else { - ret = status_ = SCANNER_ERR_OUT_OF_RANGE; - VLOG_MINI_2(LOG_LEVEL_WARNING, "The device is abnormal and can not be scanned : %s\n", val, hg_scanner_err_name(ret)); + ret = status_ = SCANNER_ERR_DEVICE_UNKNOWN_STATUS; + VLOG_MINI_2(LOG_LEVEL_WARNING, "The device is abnormal(%d) and can not be scanned : %s\n", val, hg_scanner_err_name(ret)); //break; } diff --git a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp index f456d69..6c29ff4 100644 --- a/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp +++ b/hgdriver/wrapper/huagaoxxx_warraper_ex.cpp @@ -250,6 +250,7 @@ extern "C" RETURN_IF(err, SCANNER_ERR_DEVICE_ISLOCK); RETURN_IF(err, SCANNER_ERR_DEVICE_MAYBE_IS_HOLE); RETURN_IF(err, SCANNER_ERR_DEVICE_DEVS_BOOTING); + RETURN_IF(err, SCANNER_ERR_DEVICE_UNKNOWN_STATUS); if (err == SCANNER_ERR_LANG_PAK_LOST) return "SCANNER_ERR_LANG_PAK_LOST"; @@ -322,6 +323,7 @@ extern "C" RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_ISLOCK); RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_MAYBE_IS_HOLE); RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_DEVS_BOOTING); + RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_UNKNOWN_STATUS); if (err == SCANNER_ERR_LANG_PAK_LOST) return "SCANNER_ERR_LANG_PAK_LOST"; diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp index 8f35bf0..55e6950 100644 --- a/hgsane/sane_hg_mdw.cpp +++ b/hgsane/sane_hg_mdw.cpp @@ -57,7 +57,7 @@ namespace local_utility //RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NOT_START, SANE_STATUS_NO_DOCS); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_NO_DATA, SANE_STATUS_EOF); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_IO, SANE_STATUS_IO_ERROR); - RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_OUT_OF_RANGE, SANE_STATUS_NO_MEM); + RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_OUT_OF_RANGE, SANE_STATUS_INVAL); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_IO, SANE_STATUS_IO_ERROR); RETURN_MATCH_ERROR(hgerr, SCANNER_ERR_TIMEOUT, SANE_STATUS_IO_ERROR); @@ -85,7 +85,7 @@ namespace local_utility //RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_DOCS, SCANNER_ERR_NOT_START); RETURN_MATCH_ERROR(statu, SANE_STATUS_EOF, SCANNER_ERR_NO_DATA); RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_IO); - RETURN_MATCH_ERROR(statu, SANE_STATUS_NO_MEM, SCANNER_ERR_OUT_OF_RANGE); + RETURN_MATCH_ERROR(statu, SANE_STATUS_INVAL, SCANNER_ERR_OUT_OF_RANGE); RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_IO); RETURN_MATCH_ERROR(statu, SANE_STATUS_IO_ERROR, SCANNER_ERR_TIMEOUT);