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

调整start流程

This commit is contained in:
13038267101 2022-10-12 17:09:11 +08:00
parent a2dd7745b9
commit ac7db74432
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hgdriver/hgdev/hg_scanner_302.cpp
View File

@ -1684,18 +1684,16 @@ void hg_scanner_302::thread_handle_usb_read(void)
int hg_scanner_302::start(void) int hg_scanner_302::start(void)
{ {
split3399_ = 0 ;
bool handled = false; bool handled = false;
int ret = try_third_app_handle_start(handled), int ret = try_third_app_handle_start(handled),
val = 0; val = 0;
user_cancel_ = false;
// for third-sane-app invoking, added on 2022-05-19 // for third-sane-app invoking, added on 2022-05-19
if (handled) if (handled)
return ret; return ret;
user_cancel_ = false; user_cancel_ = false;
split3399_ = 0;
cb_mem_ = true; cb_mem_ = true;
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status()); VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status());
notify_ui_working_status(STATU_DESC_PREPARE_START); notify_ui_working_status(STATU_DESC_PREPARE_START);

3
hgdriver/hgdev/hg_scanner_400.cpp
View File

@ -309,12 +309,11 @@ int hg_scanner_400::start(void)
int ret = try_third_app_handle_start(handled), int ret = try_third_app_handle_start(handled),
count = -1; count = -1;
user_cancel_ = false;
// for third-sane-app invoking, added on 2022-05-19 // for third-sane-app invoking, added on 2022-05-19
if (handled) if (handled)
return ret; return ret;
user_cancel_ = false;
ret = writedown_device_configuration(true); ret = writedown_device_configuration(true);
if (ret == SCANNER_ERR_OK) if (ret == SCANNER_ERR_OK)
writedown_image_configuration(); writedown_image_configuration();

5
hgdriver/hgdev/hg_scanner_402.cpp
View File

@ -1688,17 +1688,16 @@ void hg_scanner_402::thread_handle_usb_read(void)
int hg_scanner_402::start(void) int hg_scanner_402::start(void)
{ {
split3399_ = 0 ;
bool handled = false; bool handled = false;
int ret = try_third_app_handle_start(handled), int ret = try_third_app_handle_start(handled),
val = 0; val = 0;
user_cancel_ = false;
// for third-sane-app invoking, added on 2022-05-19 // for third-sane-app invoking, added on 2022-05-19
if (handled) if (handled)
return ret; return ret;
split3399_ = 0;
user_cancel_ = false; user_cancel_ = false;
cb_mem_ = true; cb_mem_ = true;
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status()); VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status());

3
hgdriver/hgdev/hg_scanner_439.cpp
View File

@ -1598,17 +1598,16 @@ void hg_scanner_439::thread_handle_usb_read(void)
int hg_scanner_439::start(void) int hg_scanner_439::start(void)
{ {
split3399_ = 0;
bool handled = false; bool handled = false;
int ret = try_third_app_handle_start(handled), int ret = try_third_app_handle_start(handled),
val = 0; val = 0;
user_cancel_ = false;
// for third-sane-app invoking, added on 2022-05-19 // for third-sane-app invoking, added on 2022-05-19
if (handled) if (handled)
return ret; return ret;
split3399_ = 0;
user_cancel_ = false; user_cancel_ = false;
cb_mem_ = true; cb_mem_ = true;
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status()); VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "scanner status: 0x%x\n", get_status());