diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc index 0b74f8732..458b4bf52 100644 --- a/backend/genesys_gl124.cc +++ b/backend/genesys_gl124.cc @@ -1278,15 +1278,8 @@ gl124_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys int optical_res; SANE_Status status; - DBG(DBG_info, - "%s:\n" - "Resolution : %gDPI/%gDPI\n" - "Lines : %g\n" - "PPL : %g\n" - "Startpos : %g/%g\n" - "Depth/Channels: %u/%u\n" - "Flags : %x\n\n", - __func__, params.xres, params.yres, params.lines, params.pixels, params.startx, params.starty, params.depth, params.channels, params.flags); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, params); half_ccd=compute_half_ccd(sensor, params.xres); diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc index e03e165c8..30c168658 100644 --- a/backend/genesys_gl841.cc +++ b/backend/genesys_gl841.cc @@ -2183,18 +2183,8 @@ gl841_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys SANE_Status status; unsigned int oflags; /**> optical flags */ - DBG(DBG_info, - "%s settings:\n" - "Resolution : %gDPI/%gDPI\n" - "Lines : %g\n" - "PPL : %g\n" - "Startpos : %g/%g\n" - "Depth/Channels: %u/%u\n" - "Flags : %x\n\n", - __func__, params.xres, params.yres, params.lines, params.pixels, - params.startx, params.starty, - params.depth, params.channels, - params.flags); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, params); /* results: diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc index 8e21e682a..50cdec40d 100644 --- a/backend/genesys_gl843.cc +++ b/backend/genesys_gl843.cc @@ -1435,16 +1435,8 @@ static SANE_Status gl843_init_scan_regs(Genesys_Device* dev, const Genesys_Senso SANE_Status status; - DBG(DBG_info, "%s:\n" - "Resolution : %gDPI/%gDPI\n" - "Lines : %g\n" - "PPL : %g\n" - "Startpos : %g/%g\n" - "Depth/Channels: %u/%u\n" - "Flags : %x\n\n", - __func__, session.params.xres, session.params.yres, session.params.lines, - session.params.pixels, session.params.startx, session.params.starty, - session.params.depth, session.params.channels, session.params.flags); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, session.params); DBG(DBG_info, "%s : stagger=%d lines\n", __func__, session.num_staggered_lines); diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc index 4f42c6129..e5f0e86e6 100644 --- a/backend/genesys_gl846.cc +++ b/backend/genesys_gl846.cc @@ -1123,14 +1123,8 @@ gl846_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys int optical_res; SANE_Status status; - DBG(DBG_info, "%s settings:\n" - "Resolution : %gDPI/%gDPI\n" - "Lines : %g\n" - "PPL : %g\n" - "Startpos : %g/%g\n" - "Depth/Channels: %u/%u\n" - "Flags : %x\n\n", - __func__, params.xres, params.yres, params.lines, params.pixels, params.startx, params.starty, params.depth, params.channels, params.flags); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, params); /* we may have 2 domains for ccd: xres below or above half ccd max dpi */ if (sensor.get_ccd_size_divisor_for_dpi(params.xres) > 1) diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc index 10f7a6c4f..461fac0c0 100644 --- a/backend/genesys_gl847.cc +++ b/backend/genesys_gl847.cc @@ -1139,14 +1139,8 @@ gl847_init_scan_regs(Genesys_Device * dev, const Genesys_Sensor& sensor, Genesys int optical_res; SANE_Status status; - DBG(DBG_info, "%s settings:\n" - "Resolution : %gDPI/%gDPI\n" - "Lines : %g\n" - "PPL : %g\n" - "Startpos : %g/%g\n" - "Depth/Channels: %u/%u\n" - "Flags : %x\n\n", - __func__, params.xres, params.yres, params.lines, params.pixels, params.startx, params.starty, params.depth, params.channels, params.flags); + DBG(DBG_info, "%s ", __func__); + debug_dump(DBG_info, params); /* we may have 2 domains for ccd: xres below or above half ccd max dpi */ if (sensor.get_ccd_size_divisor_for_dpi(params.xres) > 1) diff --git a/backend/genesys_low.cc b/backend/genesys_low.cc index 49548cf08..bdca21c82 100644 --- a/backend/genesys_low.cc +++ b/backend/genesys_low.cc @@ -2096,3 +2096,24 @@ void debug_dump(unsigned level, const Genesys_Settings& settings) settings.tl_x, settings.tl_y, static_cast(settings.scan_mode)); } + +void debug_dump(unsigned level, const SetupParams& params) +{ + DBG(level, "settings:\n" + "Resolution X/Y : %u / %u dpi\n" + "Lines : %u\n" + "Pixels per line : %u\n" + "Depth : %u\n" + "Channels : %u\n" + "Start position X/Y : %.3f/%.3f\n" + "Scan mode : %d\n", + "Color filter : %d\n", + "Flags : %x\n", + params.xres, params.yres, + params.lines, params.pixels, + params.depth, params.channels, + params.startx, params.starty, + static_cast(params.scan_mode), + static_cast(params.color_filter), + params.flags); +} diff --git a/backend/genesys_low.h b/backend/genesys_low.h index 1a668b097..cd709901b 100644 --- a/backend/genesys_low.h +++ b/backend/genesys_low.h @@ -1900,5 +1900,6 @@ void genesys_init_sensor_tables(); void genesys_init_frontend_tables(); void debug_dump(unsigned level, const Genesys_Settings& settings); +void debug_dump(unsigned level, const SetupParams& params); #endif /* not GENESYS_LOW_H */