调整锁定版本日志输出
This commit is contained in:
parent
0b2e2971fb
commit
f2a4f1f385
|
@ -365,6 +365,12 @@ void hg_scanner_239::init_version(void)
|
|||
is_kernelsnap_devsislock = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!is_kernelsnap_devsislock)
|
||||
{
|
||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT));
|
||||
}
|
||||
|
||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str());
|
||||
|
||||
if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 1209))
|
||||
|
@ -1395,11 +1401,17 @@ int hg_scanner_239::set_devshtudown()
|
|||
int hg_scanner_239::set_scan_islock(SANE_Bool set_islock)
|
||||
{
|
||||
if (!is_kernelsnap_devsislock)
|
||||
{
|
||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT));
|
||||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
||||
}
|
||||
|
||||
if (set_islock != 0 && set_islock != 1)
|
||||
{
|
||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_INVALID_PARAMETER));
|
||||
return SCANNER_ERR_INVALID_PARAMETER;
|
||||
|
||||
}
|
||||
|
||||
int val = 0,
|
||||
ret = write_register(setting3399::SR_SET_LOCK_STATES, set_islock);
|
||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Set scanner is lock:%d\r\n", set_islock);
|
||||
|
@ -1409,8 +1421,10 @@ int hg_scanner_239::set_scan_islock(SANE_Bool set_islock)
|
|||
int hg_scanner_239::get_scan_islock(SANE_Bool& islock)
|
||||
{
|
||||
if (!is_kernelsnap_devsislock)
|
||||
{
|
||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT));
|
||||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
||||
|
||||
}
|
||||
|
||||
int val = 0,
|
||||
ret = read_register(setting3399::SR_GET_LOCK_STATES, &val);
|
||||
|
@ -1427,7 +1441,11 @@ int hg_scanner_239::get_scan_islock(SANE_Bool& islock)
|
|||
int hg_scanner_239::set_scan_lock_check_val(string check_str)
|
||||
{
|
||||
if (!is_kernelsnap_devsislock)
|
||||
{
|
||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "devs lock:%s \n", hg_scanner_err_name(SCANNER_ERR_DEVICE_NOT_SUPPORT));
|
||||
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
|
||||
}
|
||||
|
||||
#if defined(WIN32) || defined(_WIN64)
|
||||
if (check_str.empty())
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue