From 2d0710ed0745910531eaf6f199fdd7757772e015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=E9phane=20Voltz?= Date: Tue, 16 Jun 2009 13:06:10 +0200 Subject: [PATCH] don't use addr for GL841 cis scanners when sending coefficient data --- backend/genesys.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/genesys.c b/backend/genesys.c index cbe91077c..727c3c936 100644 --- a/backend/genesys.c +++ b/backend/genesys.c @@ -2974,7 +2974,7 @@ genesys_send_shading_coefficient (Genesys_Device * dev) switch (dev->model->ccd_type) { case CIS_XP200: - target_code = 0xfa00; + target_code = 0xf000; memset (shading_data, 0x00, pixels_per_line * 4 * channels); o = 0; avgpixels = 1; @@ -3180,7 +3180,7 @@ genesys_send_shading_coefficient (Genesys_Device * dev) } - if (dev->model->is_cis) + if (dev->model->is_cis && dev->model->asic_type != GENESYS_GL646) status = genesys_send_offset_and_shading (dev, shading_data, 0x1fe00); else status = @@ -3691,6 +3691,9 @@ genesys_sheetfed_calibration (Genesys_Device * dev) return status; } + /* save the calibration data */ + genesys_save_calibration (dev); + /* and finally eject calibration sheet */ status = dev->model->cmd_set->eject_document (dev); if (status != SANE_STATUS_GOOD)