Merge branch 'master' of http://192.168.100.140:8099/sane/code_device
This commit is contained in:
commit
8d6a7c7e7b
|
@ -844,21 +844,21 @@ int usb_io::control_io(uint8_t type, uint8_t req, uint16_t val, uint16_t ind, vo
|
|||
}
|
||||
else
|
||||
{
|
||||
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_);
|
||||
if (ret > 0)
|
||||
{
|
||||
*len = ret;
|
||||
//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_);
|
||||
// if (ret > 0)
|
||||
// {
|
||||
// *len = ret;
|
||||
|
||||
last_err_ = SCANNER_ERR_OK;
|
||||
// last_err_ = SCANNER_ERR_OK;
|
||||
|
||||
return last_err_;
|
||||
}
|
||||
else
|
||||
*len = 0;
|
||||
}
|
||||
else
|
||||
// return last_err_;
|
||||
// }
|
||||
// else
|
||||
// *len = 0;
|
||||
//}
|
||||
//else
|
||||
*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));
|
||||
last_err_ = usb_manager::usb_error_2_hg_err(ret);
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
project(hwdriver)
|
||||
project(hgdriver)
|
||||
string(TIMESTAMP CURRENT_YEAR "%Y")
|
||||
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_MINOR=ver_2)
|
||||
add_definitions(-DVERSION_YEAR=ver_3)
|
||||
add_definitions(-DVERSION_BUILD=${MONTHDAY})
|
||||
add_definitions(-DOEM_HANWANG)
|
||||
add_definitions(-DOEM_HUAGAO)
|
||||
add_definitions(-Duos)
|
||||
add_compile_options(-std=c++11)
|
||||
#set(CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS} -g -ftest-coverage -fprofile-arcs")
|
||||
|
|
Loading…
Reference in New Issue