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 2022-11-25 16:20:20 +08:00
parent 4b911b285e
commit 0a255dfb25
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hgdriver/hgdev/hg_scanner.cpp
View File

@ -3114,9 +3114,11 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
}
else if (code == IO_CTRL_CODE_GET_SCAN_ISLOCK)
{
SANE_Bool islock = *((SANE_Bool*)data);
int ret = get_scan_islock(&islock);
int ret = get_scan_islock(islock);
*((SANE_Bool*)data) = islock;
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "io ctrl islock:%d\r\n", *((SANE_Bool*)data));
return ret;
}
else if (code == IO_CTRL_CODE_SET_FIRMWARE_UPGRADE)
@ -3184,7 +3186,7 @@ int hg_scanner::set_scan_islock(SANE_Bool set_islock)
{
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
}
int hg_scanner::get_scan_islock(SANE_Bool* islock)
int hg_scanner::get_scan_islock(SANE_Bool& islock)
{
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
}

2
hgdriver/hgdev/hg_scanner.h
View File

@ -406,7 +406,7 @@ public:
virtual int set_devreboot(); //设置设备重启
virtual int set_devshtudown(); //设置设备关机
virtual int set_scan_islock(SANE_Bool set_islock); //设置设备是否锁定
virtual int get_scan_islock(SANE_Bool* islock); //获取设备是否锁定
virtual int get_scan_islock(SANE_Bool& islock); //获取设备是否锁定
virtual int set_scan_lock_check_val(string check_str); //获取设备是否锁定
virtual int firmware_upgrade(std::string filename); //固件升级
virtual int clean_paper_road(); //清理纸道