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

Merge branch 'master' of http://192.168.100.140:8099/sane/code_device

This commit is contained in:
13038267101 2022-11-26 17:48:24 +08:00
parent 346cd707f5 70c11622ff
commit 8d6a7c7e7b
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hgdriver/hgdev/usb_manager.cpp
View File

@ -844,21 +844,21 @@ int usb_io::control_io(uint8_t type, uint8_t req, uint16_t val, uint16_t ind, vo
} }
else else
{ {
if (on_io_error((scanner_err)usb_manager::usb_error_2_hg_err(ret), &endpoints_.control.in)) //if (on_io_error((scanner_err)usb_manager::usb_error_2_hg_err(ret), &endpoints_.control.in))
{ //{
ret = libusb_control_transfer(handle_, type, req, val, ind, (unsigned char*)buf, *len, to_); // ret = libusb_control_transfer(handle_, type, req, val, ind, (unsigned char*)buf, *len, to_);
if (ret > 0) // if (ret > 0)
{ // {
*len = ret; // *len = ret;
last_err_ = SCANNER_ERR_OK; // last_err_ = SCANNER_ERR_OK;
return last_err_; // return last_err_;
} // }
else // else
*len = 0; // *len = 0;
} //}
else //else
*len = 0; *len = 0;
VLOG_MINI_5(LOG_LEVEL_DEBUG_INFO, "libusb_control_transfer(%x, %x, %d, %d) = %s\n", type, req, val, ind, libusb_error_name(ret)); VLOG_MINI_5(LOG_LEVEL_DEBUG_INFO, "libusb_control_transfer(%x, %x, %d, %d) = %s\n", type, req, val, ind, libusb_error_name(ret));
last_err_ = usb_manager::usb_error_2_hg_err(ret); last_err_ = usb_manager::usb_error_2_hg_err(ret);

6
hgdriver/wrapper/CMakeLists.txt
View File

@ -1,12 +1,12 @@
project(hwdriver) project(hgdriver)
string(TIMESTAMP CURRENT_YEAR "%Y") string(TIMESTAMP CURRENT_YEAR "%Y")
string(TIMESTAMP MONTHDAY "1%y%j") string(TIMESTAMP MONTHDAY "1%y%j")
add_definitions(-DBACKEND_NAME=hwdriver) add_definitions(-DBACKEND_NAME=hgdriver)
add_definitions(-DVERSION_MAJOR=ver_1) add_definitions(-DVERSION_MAJOR=ver_1)
add_definitions(-DVERSION_MINOR=ver_2) add_definitions(-DVERSION_MINOR=ver_2)
add_definitions(-DVERSION_YEAR=ver_3) add_definitions(-DVERSION_YEAR=ver_3)
add_definitions(-DVERSION_BUILD=${MONTHDAY}) add_definitions(-DVERSION_BUILD=${MONTHDAY})
add_definitions(-DOEM_HANWANG) add_definitions(-DOEM_HUAGAO)
add_definitions(-Duos) add_definitions(-Duos)
add_compile_options(-std=c++11) add_compile_options(-std=c++11)
#set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS} -g -ftest-coverage -fprofile-arcs") #set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS} -g -ftest-coverage -fprofile-arcs")