From 1f4a5311d74b518b25411bc12da4e7d5974b7d20 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Thu, 12 Sep 2019 22:21:55 +0300 Subject: [PATCH] genesys: Rename DesegmentationState::raw_{channel => line}_bytes --- backend/genesys.cc | 4 ++-- backend/genesys_device.h | 2 +- backend/genesys_gl124.cc | 14 +++++++------- backend/genesys_gl646.cc | 4 ++-- backend/genesys_gl841.cc | 4 ++-- backend/genesys_gl843.cc | 6 +++--- backend/genesys_gl846.cc | 8 ++++---- backend/genesys_gl847.cc | 8 ++++---- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/backend/genesys.cc b/backend/genesys.cc index 10533abd2..bf0ebaf02 100644 --- a/backend/genesys.cc +++ b/backend/genesys.cc @@ -3433,7 +3433,7 @@ static void genesys_fill_line_interp_buffer(Genesys_Device* dev, uint8_t* work_b /* go to next line if needed */ if (dev->deseg.curr_byte == dev->deseg.pixel_groups) { - dev->oe_buffer.set_pos(dev->oe_buffer.pos() + dev->deseg.raw_channel_bytes); + dev->oe_buffer.set_pos(dev->oe_buffer.pos() + dev->deseg.raw_line_bytes); dev->deseg.curr_byte = 0; dev->line_count++; } @@ -3519,7 +3519,7 @@ static void genesys_fill_segmented_buffer(Genesys_Device* dev, uint8_t* work_buf /* go to next line if needed */ if (dev->deseg.curr_byte == dev->deseg.pixel_groups) { - dev->oe_buffer.set_pos(dev->oe_buffer.pos() + dev->deseg.raw_channel_bytes); + dev->oe_buffer.set_pos(dev->oe_buffer.pos() + dev->deseg.raw_line_bytes); dev->deseg.curr_byte = 0; } diff --git a/backend/genesys_device.h b/backend/genesys_device.h index cfd53d134..3a77c7b94 100644 --- a/backend/genesys_device.h +++ b/backend/genesys_device.h @@ -203,7 +203,7 @@ struct DesegmentationState unsigned pixel_groups = 0; // Total bytes in a line received from a scanner - unsigned raw_channel_bytes = 0; + unsigned raw_line_bytes = 0; // The current byte during desegmentation process unsigned curr_byte = 0; diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc index bbc0de57c..ddb262720 100644 --- a/backend/genesys_gl124.cc +++ b/backend/genesys_gl124.cc @@ -946,33 +946,33 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens DBG(DBG_io2, "%s: endpixel used=%d\n", __func__, endx / session.segment_count); // words(16bit) before gamma, conversion to 8 bit or lineart - dev->deseg.raw_channel_bytes = + dev->deseg.raw_line_bytes = multiply_by_depth_ceil(session.output_pixels / session.ccd_size_divisor, session.params.depth); dev->deseg.curr_byte = 0; dev->deseg.skip_bytes = 0; - dev->deseg.pixel_groups = dev->deseg.raw_channel_bytes / session.segment_count; - const_cast(session).conseq_pixel_dist_bytes = dev->deseg.raw_channel_bytes / session.segment_count; + dev->deseg.pixel_groups = dev->deseg.raw_line_bytes / session.segment_count; + const_cast(session).conseq_pixel_dist_bytes = dev->deseg.raw_line_bytes / session.segment_count; dev->line_count = 0; dev->line_interp = 0; DBG (DBG_io2, "%s: pixels =%d\n", __func__, session.optical_pixels); DBG (DBG_io2, "%s: depth =%d\n", __func__, session.params.depth); - DBG (DBG_io2, "%s: dev->bpl =%lu\n", __func__, (unsigned long) dev->deseg.raw_channel_bytes); + DBG (DBG_io2, "%s: dev->bpl =%lu\n", __func__, (unsigned long) dev->deseg.raw_line_bytes); DBG (DBG_io2, "%s: dev->len =%lu\n", __func__, (unsigned long) dev->deseg.pixel_groups); DBG (DBG_io2, "%s: dev->line_interp=%lu\n", __func__, (unsigned long)dev->line_interp); // BUG: we shouldn't multiply by channels here dev->oe_buffer.clear(); - dev->oe_buffer.alloc(dev->deseg.raw_channel_bytes * session.params.channels); + dev->oe_buffer.alloc(dev->deseg.raw_line_bytes * session.params.channels); // MAXWD is expressed in 2 words unit // BUG: we shouldn't multiply by channels here - reg->set24(REG_MAXWD, dev->deseg.raw_channel_bytes * session.params.channels); + reg->set24(REG_MAXWD, dev->deseg.raw_line_bytes * session.params.channels); DBG(DBG_io2, "%s: words_per_line used=%d\n", __func__, - dev->deseg.raw_channel_bytes * session.params.channels); + dev->deseg.raw_line_bytes * session.params.channels); reg->set24(REG_LPERIOD, exposure_time); DBG (DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time); diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc index 0847b1cc4..1e97dd805 100644 --- a/backend/genesys_gl646.cc +++ b/backend/genesys_gl646.cc @@ -563,7 +563,7 @@ static void gl646_setup_registers(Genesys_Device* dev, DBG(DBG_info, "%s: startx=%d, endx=%d, ccd_size_divisor=%d\n", __func__, sx, ex, session.ccd_size_divisor); - dev->deseg.raw_channel_bytes = session.output_channel_bytes; + dev->deseg.raw_line_bytes = session.output_channel_bytes; regs->set24(REG_MAXWD, session.output_line_bytes); @@ -1510,7 +1510,7 @@ static void gl646_detect_document_end(Genesys_Device* dev) /* we add the number of lines needed to read the last part of the document in */ lines = (SANE_UNFIX(dev->model->y_offset) * dev->session.params.yres) / MM_PER_INCH; DBG(DBG_io, "%s: adding %d line to flush\n", __func__, lines); - bytes_left += lines * dev->deseg.raw_channel_bytes; + bytes_left += lines * dev->deseg.raw_line_bytes; if (dev->session.params.depth > 8) { bytes_left = 2 * bytes_left; diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc index e453dc358..40be00a42 100644 --- a/backend/genesys_gl841.cc +++ b/backend/genesys_gl841.cc @@ -1604,7 +1604,7 @@ static void gl841_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens reg->set16(REG_ENDPIXEL, end); DBG(DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d\n", __func__, start, end); - dev->deseg.raw_channel_bytes = session.output_line_bytes; + dev->deseg.raw_line_bytes = session.output_line_bytes; reg->set24(REG_MAXWD, session.output_line_bytes); @@ -2440,7 +2440,7 @@ static void gl841_detect_document_end(Genesys_Device* dev) /* the current scancnt is also the final one, so we use it to * compute total bytes to read. We also add the line count to eject document */ - total_bytes_to_read=(scancnt+postcnt) * dev->deseg.raw_channel_bytes; + total_bytes_to_read=(scancnt+postcnt) * dev->deseg.raw_line_bytes; DBG(DBG_io, "%s: old total_bytes_to_read=%u\n", __func__, (unsigned int)dev->total_bytes_to_read); diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc index a6cbc85df..e94e7a1f4 100644 --- a/backend/genesys_gl843.cc +++ b/backend/genesys_gl843.cc @@ -1157,11 +1157,11 @@ static void gl843_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens reg->set16(REG_STRPIXEL, session.pixel_startx); reg->set16(REG_ENDPIXEL, session.pixel_endx); - dev->deseg.raw_channel_bytes = session.output_channel_bytes; // FIXME: this is not currently used + dev->deseg.raw_line_bytes = session.output_channel_bytes; // FIXME: this is not currently used DBG(DBG_io2, "%s: pixels =%d\n", __func__, session.optical_pixels); DBG(DBG_io2, "%s: depth =%d\n", __func__, session.params.depth); - DBG(DBG_io2, "%s: dev->bpl =%lu\n", __func__, (unsigned long) dev->deseg.raw_channel_bytes); + DBG(DBG_io2, "%s: dev->bpl =%lu\n", __func__, (unsigned long) dev->deseg.raw_line_bytes); DBG(DBG_io2, "%s: dev->len =%lu\n", __func__, (unsigned long) dev->deseg.pixel_groups); /* MAXWD is expressed in 2 words unit */ @@ -1582,7 +1582,7 @@ static void gl843_detect_document_end(Genesys_Device* dev) // number of bytes to read from scanner to get document out of it after // end of document dectected by hardware sensor */ - bytes_to_flush = lines * dev->deseg.raw_channel_bytes; + bytes_to_flush = lines * dev->deseg.raw_line_bytes; /* if we are already close to end of scan, flushing isn't needed */ if (bytes_to_flush < read_bytes_left) diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc index 34f5866d3..af9f960c6 100644 --- a/backend/genesys_gl846.cc +++ b/backend/genesys_gl846.cc @@ -814,7 +814,7 @@ static void gl846_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens /* words(16bit) before gamma, conversion to 8 bit or lineart*/ words_per_line = (session.optical_pixels_raw * session.params.xres) / sensor.optical_res / session.segment_count; - dev->deseg.raw_channel_bytes = multiply_by_depth_ceil(words_per_line, session.params.depth); + dev->deseg.raw_line_bytes = multiply_by_depth_ceil(words_per_line, session.params.depth); dev->deseg.pixel_groups = multiply_by_depth_ceil(dev->deseg.pixel_groups, session.params.depth); dev->deseg.curr_byte = 0; @@ -831,17 +831,17 @@ static void gl846_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens DBG (DBG_io2, "%s: pixels =%d\n", __func__, session.optical_pixels); DBG (DBG_io2, "%s: depth =%d\n", __func__, session.params.depth); - DBG (DBG_io2, "%s: dev->bpl =%lu\n", __func__, (unsigned long) dev->deseg.raw_channel_bytes); + DBG (DBG_io2, "%s: dev->bpl =%lu\n", __func__, (unsigned long) dev->deseg.raw_line_bytes); DBG (DBG_io2, "%s: dev->len =%lu\n", __func__, (unsigned long) dev->deseg.pixel_groups); DBG (DBG_io2, "%s: dev->segnb =%lu\n", __func__, (unsigned long) dev->session.segment_count); // BUG: we shouldn't multiply by channels here dev->oe_buffer.clear(); - dev->oe_buffer.alloc(dev->deseg.raw_channel_bytes * session.params.channels); + dev->oe_buffer.alloc(dev->deseg.raw_line_bytes * session.params.channels); /* MAXWD is expressed in 4 words unit */ // BUG: we shouldn't multiply by channels here - reg->set24(REG_MAXWD, (dev->deseg.raw_channel_bytes * session.params.channels >> 2)); + reg->set24(REG_MAXWD, (dev->deseg.raw_line_bytes * session.params.channels >> 2)); reg->set16(REG_LPERIOD, exposure_time); DBG (DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time); diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc index db8141b40..f0fc57699 100644 --- a/backend/genesys_gl847.cc +++ b/backend/genesys_gl847.cc @@ -828,7 +828,7 @@ static void gl847_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens } /* words(16bit) before gamma, conversion to 8 bit or lineart*/ - dev->deseg.raw_channel_bytes = multiply_by_depth_ceil( + dev->deseg.raw_line_bytes = multiply_by_depth_ceil( (session.optical_pixels_raw * session.params.xres) / sensor.optical_res / session.segment_count, session.params.depth); dev->deseg.pixel_groups = multiply_by_depth_ceil(dev->deseg.pixel_groups, session.params.depth); @@ -847,16 +847,16 @@ static void gl847_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens DBG (DBG_io2, "%s: pixels =%d\n", __func__, session.optical_pixels); DBG (DBG_io2, "%s: depth =%d\n", __func__, session.params.depth); - DBG (DBG_io2, "%s: dev->bpl =%lu\n", __func__, (unsigned long) dev->deseg.raw_channel_bytes); + DBG (DBG_io2, "%s: dev->bpl =%lu\n", __func__, (unsigned long) dev->deseg.raw_line_bytes); DBG (DBG_io2, "%s: dev->len =%lu\n", __func__, (unsigned long) dev->deseg.pixel_groups); DBG (DBG_io2, "%s: dev->segnb =%lu\n", __func__, (unsigned long) dev->session.segment_count); // BUG: we shouldn't multiply by channels here dev->oe_buffer.clear(); - dev->oe_buffer.alloc(dev->deseg.raw_channel_bytes * session.params.channels); + dev->oe_buffer.alloc(dev->deseg.raw_line_bytes * session.params.channels); /* MAXWD is expressed in 4 words unit */ - reg->set24(REG_MAXWD, (dev->deseg.raw_channel_bytes * session.params.channels >> 2)); + reg->set24(REG_MAXWD, (dev->deseg.raw_line_bytes * session.params.channels >> 2)); reg->set16(REG_LPERIOD, exposure_time); DBG(DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time);