|
 |
99ff37 |
diff --git a/backend/epson2-ops.c b/backend/epson2-ops.c
|
|
|
99ff37 |
index 83a0169..573ebcf 100644
|
|
|
99ff37 |
--- a/backend/epson2-ops.c
|
|
|
99ff37 |
+++ b/backend/epson2-ops.c
|
|
|
99ff37 |
@@ -291,14 +291,14 @@ e2_dev_post_init(struct Epson_Device *dev)
|
|
|
99ff37 |
dev->need_reset_on_source_change = SANE_FALSE;
|
|
|
99ff37 |
|
|
|
99ff37 |
if (e2_dev_model(dev, "ES-9000H") || e2_dev_model(dev, "GT-30000")) {
|
|
|
99ff37 |
- dev->cmd->set_focus_position = 0;
|
|
|
99ff37 |
dev->cmd->feed = 0x19;
|
|
|
99ff37 |
+ dev->focusSupport = SANE_FALSE;
|
|
|
99ff37 |
}
|
|
|
99ff37 |
|
|
|
99ff37 |
if (e2_dev_model(dev, "GT-8200") || e2_dev_model(dev, "Perfection1650")
|
|
|
99ff37 |
|| e2_dev_model(dev, "Perfection1640") || e2_dev_model(dev, "GT-8700")) {
|
|
|
99ff37 |
dev->cmd->feed = 0;
|
|
|
99ff37 |
- dev->cmd->set_focus_position = 0;
|
|
|
99ff37 |
+ dev->focusSupport = SANE_FALSE;
|
|
|
99ff37 |
dev->need_reset_on_source_change = SANE_TRUE;
|
|
|
99ff37 |
}
|
|
|
99ff37 |
|
|
|
99ff37 |
@@ -825,12 +825,12 @@ e2_discover_capabilities(Epson_Scanner *s)
|
|
|
99ff37 |
|
|
|
99ff37 |
if (esci_request_focus_position(s, &s->currentFocusPosition) ==
|
|
|
99ff37 |
SANE_STATUS_GOOD) {
|
|
|
99ff37 |
- DBG(1, "setting focus is supported, current focus: %u\n", s->currentFocusPosition);
|
|
|
99ff37 |
+ DBG(1, "getting focus is supported, current focus: %u\n", s->currentFocusPosition);
|
|
|
99ff37 |
dev->focusSupport = SANE_TRUE;
|
|
|
99ff37 |
s->opt[OPT_FOCUS_POS].cap &= ~SANE_CAP_INACTIVE;
|
|
|
99ff37 |
s->val[OPT_FOCUS_POS].w = s->currentFocusPosition;
|
|
|
99ff37 |
} else {
|
|
|
99ff37 |
- DBG(1, "setting focus is not supported\n");
|
|
|
99ff37 |
+ DBG(1, "getting focus is not supported\n");
|
|
|
99ff37 |
dev->focusSupport = SANE_FALSE;
|
|
|
99ff37 |
s->opt[OPT_FOCUS_POS].cap |= SANE_CAP_INACTIVE;
|
|
|
99ff37 |
s->val[OPT_FOCUS_POS].w = FOCUS_ON_GLASS; /* just in case */
|