From 7d13614480338ade1edb6878497213771828c49a Mon Sep 17 00:00:00 2001 From: Gerhard Jaeger Date: Fri, 31 Jan 2003 12:36:44 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 11 +++++++++-- backend/plustek-devs.c | 28 ++++++---------------------- backend/plustek-usb.h | 3 +-- backend/plustek-usbshading.c | 6 ++++-- backend/plustek.c | 2 +- doc/plustek/Plustek-USB.txt | 6 +++++- 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 711ec6582..8512accec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-01-31 Gerhard Jaeger + * doc/plustek/Plustek-USB.txt: Added comment about scanner.o + * backend/plustek.c backend/plustek-devs.c backend/plustek-usb.h + backend/plustek-usbshading.c: Fixed major bug, that avoid proper + shading on CCD-devices like HP 2200C. Fixed also CanoScan 1220 + settings, as the current ones didn't work + 2003-01-30 Henning Meier-Geinitz * doc/descriptions/unsupported.desc: Added Canon, Fijitsu and Prolink @@ -27,7 +34,7 @@ * backend/mustek_pp.c: fixed some character encoding issues in debug messages * README.linux: added a note about the Intel C++ Compiler - + 2003-01-24 Jochen Eisinger * backend/mustek_pp_ccd300.c: continued on the CCD low-level driver. @@ -43,7 +50,7 @@ * backend/bh.c backend/coolscan.c: Minor conversion fixes (from Andrea Suatoni ). * backend/test.c: Use "Color pattern" consistantly. - * acinclude.m4 aclocal.m4 configure configure.in + * acinclude.m4 aclocal.m4 configure configure.in include/sane/config.h.in: Declare prototypes for all functions that may miss on some platforms. * doc/descriptions/unsupported.desc: Added Mustek parport scanners. diff --git a/backend/plustek-devs.c b/backend/plustek-devs.c index e682b3990..8417e904b 100644 --- a/backend/plustek-devs.c +++ b/backend/plustek-devs.c @@ -490,7 +490,7 @@ static DCapsDef Cap0x03F0_0x0505 = static DCapsDef Cap0x03F0_0x0605 = { /* DataOrigin (x, y), ShadingOriginY */ - {{ 0, 209}, 20, -1, {2550, 3508 }, { 50, 50}, COLOR_BW }, + {{ 0, 209}, 0, -1, {2550, 3508 }, { 50, 50}, COLOR_BW }, {{ 0, 0}, 0, -1, {0, 0}, { 0, 0 }, 0 }, /* No film scanner module */ {{ 0, 0}, 0, -1, {0, 0}, { 0, 0 }, 0 }, /* No film scanner module */ {{ 0, 0}, 0, -1, {0, 0}, { 0, 0 }, 0 }, /* No ADF */ @@ -1921,8 +1921,8 @@ static HWDef Hw0x04A9_0x2207_0 = 0x00, /* bReg 0x27 color mode */ 2, /* bReg 0x29 illumination mode */ - { 3, 0, 0, 23, 3472, 0, 0 }, - { 2, 23, 8870, 23, 5055, 23, 2828 }, + { 3, 0, 0, 23, 3937, 0, 0 }, + { 2, 23, 12000, 23, 5500, 23, 3900 }, 1, /* StepperPhaseCorrection (reg 0x1a + 0x1b) */ 0, /* bOpticBlackStart (reg 0x1c) */ @@ -1955,7 +1955,7 @@ static HWDef Hw0x04A9_0x2207_0 = 0, /* test mode ADC Output CODE LSB (reg 0x5d) */ 0, /* test mode (reg 0x5e) */ _LM9832, - MODEL_CANON1220 + MODEL_CANON1200 }; /** Canon 670/676/LiDE20 */ @@ -2092,7 +2092,7 @@ static HWDef Hw0x04A9_0x220E_0 = 0, /* test mode ADC Output CODE LSB (reg 0x5d) */ 0, /* test mode (reg 0x5e) */ _LM9833, - MODEL_CANON1240 + MODEL_CANON1200 }; /******************** all available combinations *****************************/ @@ -2286,23 +2286,7 @@ static ClkMotorDef Motors[] = { { 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0, 12.0 } }, - { MODEL_CANON1220, 8, 51, 6, - /* Motor settings (PWM and PWM_Duty) */ - /* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */ - {{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, - - /* <=400dpi <=600dpi <=800dpi <=1200dpi <=2400dpi */ - { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }}, - /* Color mode MCLK settings */ - { 6.0, 6.0, 3.0, 3.0, 6.0, 6.0, 6.0, 6.0, 2.5, 6.0 }, - { 6.0, 6.0, 3.0, 3.0, 6.0, 6.0, 6.0, 6.0, 2.5, 6.0 }, - - /* Gray mode MCLK settings */ - { 18.0, 15.0, 12.0, 12.0, 9.5, 6.5, 6.0, 6.0, 6.0, 6.0 }, - { 18.0, 15.0, 12.0, 12.0, 9.5, 6.5, 6.0, 6.0, 6.0, 6.0 } - }, - - { MODEL_CANON1240, 8, 51, 3, + { MODEL_CANON1200, 8, 51, 3, /* Motor settings (PWM and PWM_Duty) */ /* <=75dpi <=100dpi <=150dpi <=200dpi <=300dpi */ {{ 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, { 8, 31, 1 }, diff --git a/backend/plustek-usb.h b/backend/plustek-usb.h index 4e1cd4660..697ccb51b 100644 --- a/backend/plustek-usb.h +++ b/backend/plustek-usb.h @@ -244,8 +244,7 @@ typedef enum MODEL_MUSTEK1200, /**< for BearPaw 2400 */ MODEL_HP, /**< for HP2x00 */ MODEL_CANON600 , /**< for CanoScan 600dpi models */ - MODEL_CANON1220, /**< for Canon N1220U */ - MODEL_CANON1240, /**< for Canon N1240U */ + MODEL_CANON1200, /**< for Canon 1200dpi models */ MODEL_UMAX, /**< for UMAX 3400/3450 */ MODEL_LAST } eModelDef; diff --git a/backend/plustek-usbshading.c b/backend/plustek-usbshading.c index 8f277799c..2b5a945b9 100644 --- a/backend/plustek-usbshading.c +++ b/backend/plustek-usbshading.c @@ -764,9 +764,11 @@ TOGAIN: tmp.Red, tmp.Red, tmp.Green, tmp.Green, tmp.Blue, tmp.Blue); m_dwIdealGain = IDEAL_GainNormal; - m_dwIdealGain = 0xff00; /* min(min(rgb.wRed, rgb.wGreen), rgb.wBlue) */ + if( hw->bReg_0x26 & _ONE_CH_COLOR ) + m_dwIdealGain = 0xff00; + a_bRegs[0x3b] = usb_GetNewGain( tmp.Red ); a_bRegs[0x3c] = usb_GetNewGain( tmp.Green ); a_bRegs[0x3d] = usb_GetNewGain( tmp.Blue ); @@ -778,7 +780,7 @@ TOGAIN: /* on CIS devices, we can control the lamp off settings */ if( hw->bReg_0x26 & _ONE_CH_COLOR ) { - m_dwIdealGain = IDEAL_GainNormal; + m_dwIdealGain = IDEAL_GainNormal; if( adjLampSetting( CHANNEL_red, min_rgb.Red, m_dwIdealGain, hw->red_lamp_on, &hw->red_lamp_off )) { diff --git a/backend/plustek.c b/backend/plustek.c index 4ac3380c7..2b558a4f0 100644 --- a/backend/plustek.c +++ b/backend/plustek.c @@ -130,7 +130,7 @@ #include "sane/sanei.h" #include "sane/saneopts.h" -#define BACKEND_VERSION "0.45-3" +#define BACKEND_VERSION "0.45-4" #define BACKEND_NAME plustek #include "sane/sanei_backend.h" #include "sane/sanei_config.h" diff --git a/doc/plustek/Plustek-USB.txt b/doc/plustek/Plustek-USB.txt index e4fe5d63a..91e00006b 100644 --- a/doc/plustek/Plustek-USB.txt +++ b/doc/plustek/Plustek-USB.txt @@ -184,7 +184,11 @@ This is it... Autoloading scanner.o --------------------- -boot.local +To perform an automatic load of the scanner module, you might add the modprobe +line to your boot.local file. +i.e. on SuSE system > 7.x +/etc/init.d/boot.local +An alternative way is to use the hotplug utilities. Debugging your USB scanner (written by Kev Green)