mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Remove unused two-table feeding support from gl847

pixma-add-canon-ts-3400-series
Povilas Kanapickas 2021-12-27 22:20:56 +02:00
rodzic d4dc13f527
commit e27d991fdf
1 zmienionych plików z 7 dodań i 27 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
backend/genesys/gl847.cpp
Wyświetl plik

@ -339,25 +339,13 @@ static void gl847_init_motor_regs_scan(Genesys_Device* dev,
unsigned step_multiplier = gl847_get_step_multiplier (reg); unsigned step_multiplier = gl847_get_step_multiplier (reg);
bool use_fast_fed = false;
if (dev->settings.yres == 4444 && feed_steps > 100 && !has_flag(flags, ScanFlag::FEEDING)) {
use_fast_fed = true;
}
if (has_flag(dev->model->flags, ModelFlag::DISABLE_FAST_FEEDING)) {
use_fast_fed = false;
}
reg->set24(REG_LINCNT, scan_lines); reg->set24(REG_LINCNT, scan_lines);
reg->set8(REG_0x02, 0); reg->set8(REG_0x02, 0);
sanei_genesys_set_motor_power(*reg, true); sanei_genesys_set_motor_power(*reg, true);
std::uint8_t reg02 = reg->get8(REG_0x02); std::uint8_t reg02 = reg->get8(REG_0x02);
if (use_fast_fed) {
reg02 |= REG_0x02_FASTFED;
} else {
reg02 &= ~REG_0x02_FASTFED; reg02 &= ~REG_0x02_FASTFED;
}
if (has_flag(flags, ScanFlag::AUTO_GO_HOME)) { if (has_flag(flags, ScanFlag::AUTO_GO_HOME)) {
reg02 |= REG_0x02_AGOHOME | REG_0x02_NOTHOME; reg02 |= REG_0x02_AGOHOME | REG_0x02_NOTHOME;
@ -403,20 +391,12 @@ static void gl847_init_motor_regs_scan(Genesys_Device* dev,
// correct move distance by acceleration and deceleration amounts // correct move distance by acceleration and deceleration amounts
unsigned feedl = feed_steps; unsigned feedl = feed_steps;
unsigned dist = 0; unsigned dist = 0;
if (use_fast_fed)
{
feedl <<= static_cast<unsigned>(fast_step_type);
dist = (scan_table.table.size() + 2 * fast_table.table.size());
// TODO read and decode REG_0xAB
dist += (reg->get8(0x5e) & 31);
dist += reg->get8(REG_FEDCNT);
} else {
feedl <<= static_cast<unsigned>(motor_profile.step_type); feedl <<= static_cast<unsigned>(motor_profile.step_type);
dist = scan_table.table.size(); dist = scan_table.table.size();
if (has_flag(flags, ScanFlag::FEEDING)) { if (has_flag(flags, ScanFlag::FEEDING)) {
dist *= 2; dist *= 2;
} }
}
// check for overflow // check for overflow
if (dist < feedl) { if (dist < feedl) {
@ -457,7 +437,7 @@ static void gl847_init_motor_regs_scan(Genesys_Device* dev,
reg->set8(REG_BWDSTEP, min_restep); reg->set8(REG_BWDSTEP, min_restep);
std::uint32_t z1, z2; std::uint32_t z1, z2;
sanei_genesys_calculate_zmod(use_fast_fed, sanei_genesys_calculate_zmod(false,
scan_exposure_time * ccdlmt * tgtime, scan_exposure_time * ccdlmt * tgtime,
scan_table.table, scan_table.table,
scan_table.table.size(), scan_table.table.size(),