diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc index 5fcbdafe9..7bc20d5a5 100644 --- a/backend/genesys_gl646.cc +++ b/backend/genesys_gl646.cc @@ -1025,8 +1025,7 @@ gl646_setup_sensor (Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys_ /** Test if the ASIC works */ -static SANE_Status -gl646_asic_test (Genesys_Device * dev) +static void gl646_asic_test(Genesys_Device* dev) { DBG_HELPER(dbg); uint8_t val; @@ -1042,16 +1041,14 @@ gl646_asic_test (Genesys_Device * dev) if (val != 0xde) /* value of register 0x38 */ { - DBG(DBG_error, "%s: register contains invalid value\n", __func__); - return SANE_STATUS_IO_ERROR; + throw SaneException("register contains invalid value"); } sanei_genesys_read_register(dev, 0x4f, &val); if (val != 0xad) /* value of register 0x39 */ { - DBG(DBG_error, "%s: register contains invalid value\n", __func__); - return SANE_STATUS_IO_ERROR; + throw SaneException("register contains invalid value"); } /* ram test: */ @@ -1082,12 +1079,9 @@ gl646_asic_test (Genesys_Device * dev) { if (verify_data[i + 2] != data[i]) { - DBG(DBG_error, "%s: data verification error\n", __func__); - return SANE_STATUS_IO_ERROR; + throw SaneException("data verification error"); } } - - return SANE_STATUS_GOOD; } /** @@ -3506,7 +3500,7 @@ gl646_init (Genesys_Device * dev) /* Test ASIC and RAM */ if (!(dev->model->flags & GENESYS_FLAG_LAZY_INIT)) { - RIE (gl646_asic_test (dev)); + gl646_asic_test(dev); } /* send gamma tables if needed */ diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc index ac09ae333..ec10b1d73 100644 --- a/backend/genesys_gl841.cc +++ b/backend/genesys_gl841.cc @@ -290,9 +290,8 @@ static void sanei_gl841_setup_sensor(Genesys_Device * dev, const Genesys_Sensor& /** Test if the ASIC works */ -/*TODO: make this functional*/ -static SANE_Status -sanei_gl841_asic_test (Genesys_Device * dev) +// TODO: make this functional +static void sanei_gl841_asic_test(Genesys_Device* dev) { DBG_HELPER(dbg); @@ -300,27 +299,24 @@ sanei_gl841_asic_test (Genesys_Device * dev) size_t size, verify_size; unsigned int i; - return SANE_STATUS_INVAL; + throw SaneException("not implemented"); // set and read exposure time, compare if it's the same sanei_genesys_write_register(dev, 0x38, 0xde); - sanei_genesys_write_register(dev, 0x39, 0xad); sanei_genesys_read_register(dev, 0x38, &val); if (val != 0xde) /* value of register 0x38 */ { - DBG(DBG_error, "%s: register contains invalid value\n", __func__); - return SANE_STATUS_IO_ERROR; + throw SaneException("register contains invalid value"); } sanei_genesys_read_register(dev, 0x39, &val); if (val != 0xad) /* value of register 0x39 */ { - DBG(DBG_error, "%s: register contains invalid value\n", __func__); - return SANE_STATUS_IO_ERROR; + throw SaneException("register contains invalid value"); } /* ram test: */ @@ -352,7 +348,6 @@ sanei_gl841_asic_test (Genesys_Device * dev) { if (verify_data[i] != data[i]) { - DBG(DBG_error, "%s: data verification error\n", __func__); DBG(DBG_info, "0x%.8x: got %.2x %.2x %.2x %.2x, expected %.2x %.2x %.2x %.2x\n", i, verify_data[i], @@ -363,11 +358,9 @@ sanei_gl841_asic_test (Genesys_Device * dev) data[i+1], data[i+2], data[i+3]); - return SANE_STATUS_IO_ERROR; + throw SaneException("data verification error"); } } - - return SANE_STATUS_GOOD; } /* @@ -4363,7 +4356,7 @@ gl841_init (Genesys_Device * dev) /* Test ASIC and RAM */ if (!(dev->model->flags & GENESYS_FLAG_LAZY_INIT)) { - RIE (sanei_gl841_asic_test (dev)); + sanei_gl841_asic_test(dev); } const auto& sensor = sanei_genesys_find_sensor_any(dev);