kopia lustrzana https://gitlab.com/sane-project/backends
Merge branch 'escl-device-crash-without-flatbed' into 'master'
Escl device crash without flatbed See merge request sane-project/backends!554escl-fix-sleep-mode
commit
fc1c5667da
|
@ -578,8 +578,25 @@ init_options(SANE_String_Const name_source, escl_sane_t *s)
|
||||||
s->scanner->source = PLATEN;
|
s->scanner->source = PLATEN;
|
||||||
if (source == s->scanner->source) return status;
|
if (source == s->scanner->source) return status;
|
||||||
}
|
}
|
||||||
else
|
if (s->scanner->caps[s->scanner->source].ColorModes == NULL) {
|
||||||
|
if (s->scanner->caps[PLATEN].ColorModes)
|
||||||
s->scanner->source = PLATEN;
|
s->scanner->source = PLATEN;
|
||||||
|
else if (s->scanner->caps[ADFSIMPLEX].ColorModes)
|
||||||
|
s->scanner->source = ADFSIMPLEX;
|
||||||
|
else if (s->scanner->caps[ADFDUPLEX].ColorModes)
|
||||||
|
s->scanner->source = ADFDUPLEX;
|
||||||
|
else
|
||||||
|
return SANE_STATUS_INVAL;
|
||||||
|
}
|
||||||
|
if (s->scanner->source == PLATEN) {
|
||||||
|
DBG (10, "SOURCE PLATEN.\n");
|
||||||
|
}
|
||||||
|
else if (s->scanner->source == ADFDUPLEX) {
|
||||||
|
DBG (10, "SOURCE ADFDUPLEX.\n");
|
||||||
|
}
|
||||||
|
else if (s->scanner->source == ADFSIMPLEX) {
|
||||||
|
DBG (10, "SOURCE ADFSIMPLEX.\n");
|
||||||
|
}
|
||||||
memset (s->opt, 0, sizeof (s->opt));
|
memset (s->opt, 0, sizeof (s->opt));
|
||||||
memset (s->val, 0, sizeof (s->val));
|
memset (s->val, 0, sizeof (s->val));
|
||||||
for (i = 0; i < NUM_OPTIONS; ++i) {
|
for (i = 0; i < NUM_OPTIONS; ++i) {
|
||||||
|
|
|
@ -107,6 +107,11 @@
|
||||||
:status :good
|
:status :good
|
||||||
:comment "All resolutions supported."
|
:comment "All resolutions supported."
|
||||||
|
|
||||||
|
:model "DeskJet 3760"
|
||||||
|
:interface "WiFi"
|
||||||
|
:status :good
|
||||||
|
:comment "All resolutions supported."
|
||||||
|
|
||||||
:model "LaserJet MFP M28w"
|
:model "LaserJet MFP M28w"
|
||||||
:interface "WiFi"
|
:interface "WiFi"
|
||||||
:status :untested
|
:status :untested
|
||||||
|
|
|
@ -27,7 +27,7 @@ CANON PIXMA TR8500, TR8520
|
||||||
.br
|
.br
|
||||||
EPSON ET3740, ET4750
|
EPSON ET3740, ET4750
|
||||||
.br
|
.br
|
||||||
HP DESKJET 2710, DESKJET 2723, LASERJET MFP M28W,
|
HP DESKJET 2710, DESKJET 2723, DESKJET 3760, LASERJET MFP M28W,
|
||||||
.br
|
.br
|
||||||
HP OFFICEJET 4630, OFFICEJET PRO 8610
|
HP OFFICEJET 4630, OFFICEJET PRO 8610
|
||||||
.br
|
.br
|
||||||
|
|
Ładowanie…
Reference in New Issue