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

Merge branch 'mx350'

merge-requests/1/head
Nicolas Martin 2010-07-04 21:15:45 +02:00
rodzic b95d698f33 980b51a836
commit 4e5df3d981
1 zmienionych plików z 6 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
backend/pixma_mp150.c
Wyświetl plik

@ -148,9 +148,6 @@
#define MX320_PID 0x1736 /* untested */
#define MX330_PID 0x1737
/* PIXMA 2010 vintage */
#define MX340_PID 0x1741
/* Generation 4 */
#define MP250_PID 0x173a
#define MP270_PID 0x173b
@ -160,6 +157,10 @@
#define MP640_PID 0x173f
#define MP990_PID 0x1740
/* PIXMA 2010 vintage */
#define MX340_PID 0x1741
#define MX350_PID 0x1742
/* Generation 4 XML messages that encapsulates the Pixma protocol messages */
#define XML_START_1 \
"<?xml version=\"1.0\" encoding=\"utf-8\" ?>\
@ -1218,6 +1219,7 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp)
s->cfg->pid == MX320_PID ||
s->cfg->pid == MX330_PID ||
s->cfg->pid == MX340_PID ||
s->cfg->pid == MX350_PID ||
s->cfg->pid == MX7600_PID )
&&
sp->source == PIXMA_SOURCE_FLATBED)
@ -1611,6 +1613,7 @@ const pixma_config_t pixma_mp150_devices[] = {
/* PIXMA 2010 vintage */
DEVICE ("Canon PIXMA MX340", "MX340", MX340_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX350", "MX350", MX350_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
/* Generation 4: CIS */
DEVICE ("Canon PIXMA MP640", "MP640", MP640_PID, 4800, 638, 877, PIXMA_CAP_CIS),