USB IDs updates in imageClass backend (pixma), by Dennis Lou.

merge-requests/1/head
Nicolas Martin 2008-05-07 06:52:24 +00:00
rodzic a2933d5207
commit 00a0b5fd31
2 zmienionych plików z 10 dodań i 12 usunięć

Wyświetl plik

@ -1,3 +1,7 @@
2008-05-07 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_imageclass.c, doc/descriptions/pixma.desc:
USB IDs updates in imageClass backend (pixma), by Dennis Lou.
2008-05-07 Jochen Eisinger <jochen@penguin-breeder.org>
* doc/sane-mustek_pp.conf: fix catman warning. Reported by

Wyświetl plik

@ -77,14 +77,10 @@
#define MF5770_PID 0x265f
#define MF3110_PID 0x2660
#define MF3200_PID 0x2684
#define MF6500_PID 0x2686
#define MF4100_PID 0x26a3
/*
* FIXME: missing PIDs for MF6500, MF4690 and MF4010
*
* #define MF6500_PID
* #define MF4600_PID
* #define MF4010_PID
*/
#define MF4600_PID 0x26b0
#define MF4010_PID 0x26b4
enum iclass_state_t
{
@ -615,11 +611,9 @@ const pixma_config_t pixma_iclass_devices[] = {
DEV ("Canon imageCLASS MF5770", MF5770_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF3110", MF3110_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF3240", MF3200_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon MF6500 Series", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF4150", MF4100_PID, 600, 640, 877, PIXMA_CAP_ADF),
/*
* DEV ("Canon MF6500 Series" ,MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
* DEV ("Canon imageCLASS MF4690" ,MF4600_PID, 600, 640, 877, PIXMA_CAP_ADF),
* DEV ("Canon imageCLASS MF4010" ,MF4010_PID, 600, 640, 877, PIXMA_CAP_ADF),
*/
DEV ("Canon imageCLASS MF4690", MF4600_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV ("Canon imageCLASS MF4010", MF4010_PID, 600, 640, 877, PIXMA_CAP_ADF),
DEV (NULL, 0, 0, 0, 0, 0)
};