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

Changes for MF4600 series and a few fixes.

merge-requests/1/head
Nicolas Martin 2009-01-19 21:02:26 +00:00
rodzic 81953325e8
commit 2628042ada
2 zmienionych plików z 11 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2009-01-19 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* pixma_imageclass.c:
Fixed select_source message length, and typo bug in last update.
Set MP4600 series for inverted checksumming.
2009-01-19 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c backend/genesys.conf.in backend/genesys.h
backend/genesys_devices.c backend/genesys_gl646.c

9
backend/pixma_imageclass.c
Wyświetl plik

@ -176,6 +176,7 @@ activate (pixma_t * s, uint8_t x)
switch (s->cfg->pid)
{
case MF4200_PID:
case MF4600_PID:
return iclass_exec (s, &mf->cb, 1);
break;
case MF4100_PID:
@ -195,12 +196,13 @@ static int
select_source (pixma_t * s)
{
iclass_t *mf = (iclass_t *) s->subdriver;
uint8_t *data = pixma_newcmd (&mf->cb, cmd_select_source, 11, 0);
uint8_t *data = pixma_newcmd (&mf->cb, cmd_select_source, 10, 0);
data[0] = (s->param->source == PIXMA_SOURCE_ADF) ? 2 : 1;
switch (s->cfg->pid)
{
case MF4200_PID:
return iclass_exec (s, &mf->cb, 1);
case MF4600_PID:
return iclass_exec (s, &mf->cb, 0);
break;
case MF4100_PID:
default:
@ -229,7 +231,8 @@ send_scan_param (pixma_t * s)
switch (s->cfg->pid)
{
case MF4200_PID:
return iclass_exec (s, &mf->cb, 1);
case MF4600_PID:
return iclass_exec (s, &mf->cb, 0);
break;
case MF4100_PID:
default: