lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整连续睡眠导致卡死的问题

This commit is contained in:
13038267101 2023-01-04 15:34:54 +08:00
parent 576b633d5c
commit 9343d75bea
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hgdriver/hgdev/hg_scanner.cpp
View File

@ -3053,19 +3053,19 @@ int hg_scanner::reset(void)
}
int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
{
SANE_Bool devs_status = false;
int ret = get_scan_is_sleep(devs_status);
if (ret == SCANNER_ERR_OK)
{
if (!devs_status)
{
if (pid_ == 0x239 || pid_ == 0x402)
{
set_notify_sleep();
}
return SCANNER_ERR_DEVICE_SLEEPING;
}
}
//SANE_Bool devs_status = false;
//int ret = get_scan_is_sleep(devs_status);
//if (ret == SCANNER_ERR_OK)
//{
// if (!devs_status)
// {
// if (pid_ == 0x239 || pid_ == 0x402)
// {
// set_notify_sleep();
// }
// return SCANNER_ERR_DEVICE_SLEEPING;
// }
//}
if (code == IO_CTRL_CODE_RESTORE_SETTINGS)
{
int ret = invoke_setting_xxx(&hg_scanner::setting_restore, data);
@ -3447,7 +3447,10 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
}
else if (code == IO_CTRL_CODE_GET_VIDPID)
{
return get_vid_pid(*((int*)data));
int num = 0;
int ret = get_vid_pid(num);
(*(int*)data) = num;
return ret;
}
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
}