From efd7723a4f16c20b31fc874a1792bf3dd52cc920 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sat, 8 Jun 2019 14:03:59 +0300 Subject: [PATCH] genesys: Deduplicate dumping of Genesys_Current_Setup to logs --- backend/genesys_gl124.cc | 24 ++++-------------------- backend/genesys_gl646.cc | 9 ++------- backend/genesys_gl841.cc | 18 ++++-------------- backend/genesys_gl843.cc | 22 ++++------------------ backend/genesys_gl846.cc | 16 ++++------------ backend/genesys_gl847.cc | 16 ++++------------ backend/genesys_low.cc | 15 +++++++++++++++ backend/genesys_low.h | 2 ++ 8 files changed, 39 insertions(+), 83 deletions(-) diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc index d81f42f76..f8b17f734 100644 --- a/backend/genesys_gl124.cc +++ b/backend/genesys_gl124.cc @@ -1532,17 +1532,8 @@ gl124_calculate_current_setup (Genesys_Device * dev, const Genesys_Sensor& senso int optical_res; - DBG(DBG_info, - "%s:\n" - "Resolution: %ux%uDPI\n" - "Lines : %u\n" - "PPL : %u\n" - "Startpos : %.3f/%.3f\n" - "Scan mode : %d\n\n", - __func__, - dev->settings.xres, - dev->settings.yres, dev->settings.lines, dev->settings.pixels, - dev->settings.tl_x, dev->settings.tl_y, static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); /* channels */ if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) @@ -2490,15 +2481,8 @@ gl124_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor) SANE_Status status; - DBG(DBG_info, "%s:\nResolution: %ux%uDPI\n" - "Lines : %u\npixels : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, - dev->settings.xres, - dev->settings.yres, - dev->settings.lines, - dev->settings.pixels, - dev->settings.tl_x, - dev->settings.tl_y, - static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); /* wait for motor to stop first */ status = sanei_genesys_get_status (dev, &val); diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc index 4a983b341..f3280ae34 100644 --- a/backend/genesys_gl646.cc +++ b/backend/genesys_gl646.cc @@ -2876,13 +2876,8 @@ setup_for_scan (Genesys_Device * dev, uint16_t startx = 0, endx, pixels; int move = 0; - DBGSTART; - DBG(DBG_info, "%s settings:\nResolution: %ux%uDPI\n" - "Lines : %u\nPixels : %u\nStartpos : %.3f/%.3f\nScan mode : %d\nScan method: %s\n\n", - __func__, - settings.xres, settings.yres, settings.lines, settings.pixels, - settings.tl_x, settings.tl_y, static_cast(settings.scan_mode), - settings.scan_method == ScanMethod::FLATBED ? "flatbed" : "XPA"); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); if (settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) { diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc index 3d08c0f1e..f055553f1 100644 --- a/backend/genesys_gl841.cc +++ b/backend/genesys_gl841.cc @@ -2552,16 +2552,8 @@ static SANE_Status gl841_calculate_current_setup(Genesys_Device * dev, const Gen SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */ int optical_res; - DBG(DBG_info, - "%s:\n" - "Resolution: %uDPI\n" - "Lines : %u\n" - "PPL : %u\n" - "Startpos : %.3f/%.3f\n" - "Scan mode : %d\n\n", - __func__, - dev->settings.yres, dev->settings.lines, dev->settings.pixels, - dev->settings.tl_x, dev->settings.tl_y, static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); /* channels */ if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) @@ -3878,10 +3870,8 @@ gl841_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor) SANE_Status status; - DBG(DBG_info, "%s:\nResolution: %uDPI\n" - "Lines : %u\nPPL : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, - dev->settings.yres, dev->settings.lines, dev->settings.pixels, dev->settings.tl_x, - dev->settings.tl_y, static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); gl841_slow_back_home(dev,SANE_TRUE); diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc index 06fb89699..03518688e 100644 --- a/backend/genesys_gl843.cc +++ b/backend/genesys_gl843.cc @@ -1676,15 +1676,8 @@ gl843_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor int optical_res; - DBG(DBG_info, "%s settings:\n" - "Resolution: %ux%uDPI\n" - "Lines : %u\n" - "PPL : %u\n" - "Startpos : %.3f/%.3f\n" - "Scan mode : %d\n\n", __func__, - dev->settings.xres, - dev->settings.yres, dev->settings.lines, dev->settings.pixels, - dev->settings.tl_x, dev->settings.tl_y, static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); xres = dev->settings.xres; yres = dev->settings.yres; @@ -3006,15 +2999,8 @@ gl843_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor) SANE_Status status; - DBG(DBG_info, "%s settings:\nResolution: %ux%uDPI\n" - "Lines : %u\npixels : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, - dev->settings.xres, - dev->settings.yres, - dev->settings.lines, - dev->settings.pixels, - dev->settings.tl_x, - dev->settings.tl_y, - static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); /* ensure head is parked in case of calibration */ gl843_slow_back_home (dev, SANE_TRUE); diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc index a10916611..98d467b6a 100644 --- a/backend/genesys_gl846.cc +++ b/backend/genesys_gl846.cc @@ -1379,14 +1379,8 @@ gl846_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */ int optical_res; - DBG(DBG_info, "%s settings:\n" - "Resolution: %uDPI\n" - "Lines : %u\n" - "PPL : %u\n" - "Startpos : %.3f/%.3f\n" - "Scan mode : %d\n\n", __func__, - dev->settings.yres, dev->settings.lines, dev->settings.pixels, - dev->settings.tl_x, dev->settings.tl_y, static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); /* channels */ if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) @@ -2162,10 +2156,8 @@ gl846_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor) SANE_Status status; - DBG(DBG_info, "%s settings:\nResolution: %uDPI\n" - "Lines : %u\nPPL : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, - dev->settings.yres, dev->settings.lines, dev->settings.pixels, - dev->settings.tl_x, dev->settings.tl_y, static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); /* channels */ if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc index d2d9ec1b0..797e3c555 100644 --- a/backend/genesys_gl847.cc +++ b/backend/genesys_gl847.cc @@ -1395,14 +1395,8 @@ gl847_calculate_current_setup(Genesys_Device * dev, const Genesys_Sensor& sensor SANE_Bool half_ccd; /* false: full CCD res is used, true, half max CCD res is used */ int optical_res; - DBG(DBG_info, "%s settings:\n" - "Resolution: %uDPI\n" - "Lines : %u\n" - "PPL : %u\n" - "Startpos : %.3f/%.3f\n" - "Scan mode : %d\n\n", __func__, - dev->settings.yres, dev->settings.lines, dev->settings.pixels, - dev->settings.tl_x, dev->settings.tl_y, static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); /* channels */ if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) @@ -2226,10 +2220,8 @@ gl847_init_regs_for_scan (Genesys_Device * dev, const Genesys_Sensor& sensor) SANE_Status status; - DBG(DBG_info, "%s settings:\nResolution: %uDPI\n" - "Lines : %u\nPPL : %u\nStartpos : %.3f/%.3f\nScan mode : %d\n\n", __func__, - dev->settings.yres, dev->settings.lines, dev->settings.pixels, - dev->settings.tl_x, dev->settings.tl_y, static_cast(dev->settings.scan_mode)); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, dev->settings); /* channels */ if (dev->settings.scan_mode == ScanColorMode::COLOR_SINGLE_PASS) diff --git a/backend/genesys_low.cc b/backend/genesys_low.cc index 585b9ac1c..49548cf08 100644 --- a/backend/genesys_low.cc +++ b/backend/genesys_low.cc @@ -2081,3 +2081,18 @@ void run_functions_at_backend_exit() } s_functions_run_at_backend_exit.release(); } + +void debug_dump(unsigned level, const Genesys_Settings& settings) +{ + DBG(level, "settings:\n" + "Resolution X/Y : %u / %u dpi\n" + "Lines : %u\n" + "Pixels per line : %u\n" + "Depth : %u\n" + "Start position X/Y : %.3f/%.3f\n" + "Scan mode : %d\n\n", + settings.xres, settings.yres, + settings.lines, settings.pixels, settings.depth, + settings.tl_x, settings.tl_y, + static_cast(settings.scan_mode)); +} diff --git a/backend/genesys_low.h b/backend/genesys_low.h index d9302f5ae..f445f69ea 100644 --- a/backend/genesys_low.h +++ b/backend/genesys_low.h @@ -1892,4 +1892,6 @@ extern StaticInit> s_sensors; void genesys_init_sensor_tables(); void genesys_init_frontend_tables(); +void debug_dump(unsigned level, const Genesys_Settings& settings); + #endif /* not GENESYS_LOW_H */