kopia lustrzana https://gitlab.com/sane-project/backends
genesys: Fix crash during testing mode
rodzic
db6b862d70
commit
55972a3efa
|
@ -5256,22 +5256,31 @@ static void sane_open_impl(SANE_String_Const devicename, SANE_Handle * handle)
|
||||||
throw SaneException("could not find the device to open: %s", devicename);
|
throw SaneException("could not find the device to open: %s", devicename);
|
||||||
}
|
}
|
||||||
|
|
||||||
dbg.vstatus("open device '%s'", dev->file_name.c_str());
|
|
||||||
|
|
||||||
if (is_testing_mode()) {
|
if (is_testing_mode()) {
|
||||||
auto interface = std::unique_ptr<TestScannerInterface>{new TestScannerInterface{dev}};
|
// during testing w
|
||||||
|
auto vendor_id = get_testing_vendor_id();
|
||||||
|
auto product_id = get_testing_product_id();
|
||||||
|
auto bcd_device = get_testing_bcd_device();
|
||||||
|
|
||||||
|
dev->model = &get_matching_usb_dev(vendor_id, product_id, bcd_device).model();
|
||||||
|
|
||||||
|
auto interface = std::unique_ptr<TestScannerInterface>{
|
||||||
|
new TestScannerInterface{dev, vendor_id, product_id, bcd_device}};
|
||||||
interface->set_checkpoint_callback(get_testing_checkpoint_callback());
|
interface->set_checkpoint_callback(get_testing_checkpoint_callback());
|
||||||
dev->interface = std::move(interface);
|
dev->interface = std::move(interface);
|
||||||
|
|
||||||
|
dev->interface->get_usb_device().open(dev->file_name.c_str());
|
||||||
} else {
|
} else {
|
||||||
dev->interface = std::unique_ptr<ScannerInterfaceUsb>{new ScannerInterfaceUsb{dev}};
|
dev->interface = std::unique_ptr<ScannerInterfaceUsb>{new ScannerInterfaceUsb{dev}};
|
||||||
|
|
||||||
|
dbg.vstatus("open device '%s'", dev->file_name.c_str());
|
||||||
|
dev->interface->get_usb_device().open(dev->file_name.c_str());
|
||||||
|
dbg.clear();
|
||||||
|
|
||||||
|
auto bcd_device = dev->interface->get_usb_device().get_bcd_device();
|
||||||
|
|
||||||
|
dev->model = &get_matching_usb_dev(dev->vendorId, dev->productId, bcd_device).model();
|
||||||
}
|
}
|
||||||
dev->interface->get_usb_device().open(dev->file_name.c_str());
|
|
||||||
dbg.clear();
|
|
||||||
|
|
||||||
auto bcd_device = dev->interface->get_usb_device().get_bcd_device();
|
|
||||||
const auto& usb_dev = get_matching_usb_dev(dev->vendorId, dev->productId, bcd_device);
|
|
||||||
|
|
||||||
dev->model = &usb_dev.model();
|
|
||||||
|
|
||||||
dbg.vlog(DBG_info, "Opened device %s", dev->model->name);
|
dbg.vlog(DBG_info, "Opened device %s", dev->model->name);
|
||||||
|
|
||||||
|
|
|
@ -49,9 +49,10 @@
|
||||||
|
|
||||||
namespace genesys {
|
namespace genesys {
|
||||||
|
|
||||||
TestScannerInterface::TestScannerInterface(Genesys_Device* dev) :
|
TestScannerInterface::TestScannerInterface(Genesys_Device* dev, uint16_t vendor_id,
|
||||||
|
uint16_t product_id, uint16_t bcd_device) :
|
||||||
dev_{dev},
|
dev_{dev},
|
||||||
usb_dev_{get_testing_vendor_id(), get_testing_product_id(), get_testing_bcd_device()}
|
usb_dev_{vendor_id, product_id, bcd_device}
|
||||||
{
|
{
|
||||||
// initialize status registers
|
// initialize status registers
|
||||||
if (dev_->model->asic_type == AsicType::GL124) {
|
if (dev_->model->asic_type == AsicType::GL124) {
|
||||||
|
|
|
@ -56,7 +56,8 @@ namespace genesys {
|
||||||
class TestScannerInterface : public ScannerInterface
|
class TestScannerInterface : public ScannerInterface
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
TestScannerInterface(Genesys_Device* dev);
|
TestScannerInterface(Genesys_Device* dev, std::uint16_t vendor_id, std::uint16_t product_id,
|
||||||
|
std::uint16_t bcd_device);
|
||||||
|
|
||||||
~TestScannerInterface() override;
|
~TestScannerInterface() override;
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue