Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 104026 | Differences between
and this patch

Collapse All | Expand All

(-)sane-backends/backend/plustek-usb.c (-1 / +2 lines)
Lines 1094-1100 Link Here
1094
	/* the CanoScan CIS devices need special handling... */
1094
	/* the CanoScan CIS devices need special handling... */
1095
	if((dev->usbDev.vendor == 0x04A9) &&    
1095
	if((dev->usbDev.vendor == 0x04A9) &&    
1096
		(dev->usbDev.product==0x2206 || dev->usbDev.product==0x2207 ||
1096
		(dev->usbDev.product==0x2206 || dev->usbDev.product==0x2207 ||
1097
		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E)) {
1097
		 dev->usbDev.product==0x220D || dev->usbDev.product==0x220E ||
1098
		 dev->usbDev.product==0x2220)) {
1098
		use_alt_cal = SANE_TRUE;
1099
		use_alt_cal = SANE_TRUE;
1099
		
1100
		
1100
	} else {
1101
	} else {
(-)sane-backends/backend/plustek-usbdevs.c (+88 lines)
Lines 702-707 Link Here
702
	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
702
	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
703
};
703
};
704
704
705
/* Canon LiDE25
706
 */
707
static DCapsDef Cap0x04A9_0x2220 =
708
{
709
	{{ 0, 100}, 50, 10, {2550, 3508}, {75, 75}, COLOR_BW },
710
	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
711
	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
712
	{{ 0,   0},  0,  0, {0, 0}, { 0, 0 }, 0 },
713
	{1200, 1200},
714
	0,
715
	SENSORORDER_rgb,
716
	16,                 /* sensor distance                         */
717
	3,                  /* number of buttons                       */
718
	kCIS1240,           /* use default settings during calibration */
719
	0,                  /* not used here...                        */
720
	_WAF_MISC_IO_LAMPS | _WAF_BLACKFINE, _NO_MIO
721
};
722
705
/******************* additional Hardware descriptions ************************/
723
/******************* additional Hardware descriptions ************************/
706
724
707
/** U24, UT12 and UT16
725
/** U24, UT12 and UT16
Lines 2279-2284 Link Here
2279
	2.0
2297
	2.0
2280
};
2298
};
2281
2299
2300
/** Canon LiDE25 */
2301
static HWDef Hw0x04A9_0x2220 =
2302
{
2303
	0.72,   /* dMaxMotorSpeed (Max_Speed)                     */
2304
	0.30,   /* dMaxMoveSpeed (Max_Speed)                      */
2305
	0.0,    /* dHighSpeed                                     */
2306
	100,    /* wIntegrationTimeLowLamp                        */
2307
	100,    /* wIntegrationTimeHighLamp                       */
2308
	1200,   /* wMotorDpi (Full step DPI)                      */
2309
	512,    /* wRAMSize (KB)                                  */
2310
	3.75,   /* dMinIntegrationTimeLowres (ms)                 */
2311
	5.75,   /* dMinIntegrationTimeHighres (ms)                */
2312
	   0,   /* wGreenPWMDutyCycleLow (reg 0x2a + 0x2b)        */
2313
	   0,   /* wGreenPWMDutyCycleHigh (reg 0x2a + 0x2b)       */
2314
2315
	0x11,   /* bSensorConfiguration (0x0b)                    */
2316
	0x4d,   /* sensor control settings (reg 0x0c)             */
2317
	0x2f,   /* sensor control settings (reg 0x0d)             */
2318
	0x00,   /* sensor control settings (reg 0x0e)             */
2319
2320
	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
2321
	       /* mono (reg 0x0f to 0x18)                        */
2322
2323
	{0x00, 0x00, 0x04, 0x05, 0x06, 0x07, 0x00, 0x00, 0x00, 0x07},
2324
	      /* color (reg 0x0f to 0x18)                       */
2325
2326
	(_BLUE_CH | _ONE_CH_COLOR), /* bReg_0x26 color mode       */
2327
2328
	0x00,   /* bReg 0x27 color mode                           */
2329
	2,      /* bReg 0x29 illumination mode                    */
2330
2331
	{ 3,  0,    0,  50,  3000,  0,     0 },
2332
	{ 2, 50, 16383, 50, 16383, 50, 16383 },
2333
2334
	1,      /* StepperPhaseCorrection (reg 0x1a + 0x1b)       */
2335
	0,      /* bOpticBlackStart (reg 0x1c)                    */
2336
	0,      /* bOpticBlackEnd (reg 0x1d)                      */
2337
	0x7f,   /* wActivePixelsStart (reg 0x1e + 0x1f)           */
2338
	10559,  /* wLineEnd (reg 0x20 + 0x21)                     */
2339
2340
	50,     /* red lamp on    (reg 0x2c + 0x2d)               */
2341
	16383,  /* red lamp off   (reg 0x2e + 0x2f)               */
2342
	50,     /* green lamp on  (reg 0x30 + 0x31)               */
2343
	16383,  /* green lamp off (reg 0x32 + 0x33)               */
2344
	50,     /* blue lamp on   (reg 0x34 + 0x35)               */
2345
	16383,  /* blue lamp off  (reg 0x36 + 0x37)               */
2346
2347
	3,      /* stepper motor control (reg 0x45)               */
2348
	0,      /* wStepsAfterPaperSensor2 (reg 0x4c + 0x4d)      */
2349
	0x20,   /* steps to reverse when buffer is full reg 0x50) */
2350
	0xfc,   /* acceleration profile (reg 0x51)                */
2351
	0,      /* lines to process (reg 0x54)                    */
2352
	0x0f,   /* kickstart (reg 0x55)                           */
2353
	0x08,   /* pwm freq (reg 0x56)                            */
2354
	0x1f,   /* pwm duty cycle (reg 0x57)                      */
2355
2356
	0x04,   /* Paper sense (reg 0x58)                         */
2357
2358
	0x66,   /* misc io12 (reg 0x59)                           */
2359
	0x16,   /* misc io34 (reg 0x5a)                           */
2360
	0x91,   /* misc io56 (reg 0x5b)                           */
2361
	0x01,   /* test mode ADC Output CODE MSB (reg 0x5c)       */
2362
	0,      /* test mode ADC Output CODE LSB (reg 0x5d)       */
2363
	0,      /* test mode (reg 0x5e)                           */
2364
	_LM9833,
2365
	MODEL_CANON1200,
2366
	2.0
2367
};
2368
2282
/******************** all available combinations *****************************/
2369
/******************** all available combinations *****************************/
2283
2370
2284
/** here we have all supported devices and their settings...
2371
/** here we have all supported devices and their settings...
Lines 2348-2353 Link Here
2348
	{"0x04A9-0x2208",   &Cap0x04A9_0x2208, &Hw0x04A9_0x2208, "D660U"       },
2435
	{"0x04A9-0x2208",   &Cap0x04A9_0x2208, &Hw0x04A9_0x2208, "D660U"       },
2349
	{"0x04A9-0x220D",   &Cap0x04A9_0x220D, &Hw0x04A9_0x220D, "N670U/N676U/LiDE20" },
2436
	{"0x04A9-0x220D",   &Cap0x04A9_0x220D, &Hw0x04A9_0x220D, "N670U/N676U/LiDE20" },
2350
	{"0x04A9-0x220E",   &Cap0x04A9_0x220E, &Hw0x04A9_0x220E, "N1240U/LiDE30"      },
2437
	{"0x04A9-0x220E",   &Cap0x04A9_0x220E, &Hw0x04A9_0x220E, "N1240U/LiDE30"      },
2438
	{"0x04A9-0x2220",   &Cap0x04A9_0x2220, &Hw0x04A9_0x2220, "LiDE25"      },
2351
2439
2352
	/* Please add other devices here...
2440
	/* Please add other devices here...
2353
	 * The first entry is a string, composed out of the vendor and product id,
2441
	 * The first entry is a string, composed out of the vendor and product id,

Return to bug 104026