sane-epson2-disable-focus.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. diff --git a/backend/epson2-ops.c b/backend/epson2-ops.c
  2. index 83a0169..573ebcf 100644
  3. --- a/backend/epson2-ops.c
  4. +++ b/backend/epson2-ops.c
  5. @@ -291,14 +291,14 @@ e2_dev_post_init(struct Epson_Device *dev)
  6. dev->need_reset_on_source_change = SANE_FALSE;
  7. if (e2_dev_model(dev, "ES-9000H") || e2_dev_model(dev, "GT-30000")) {
  8. - dev->cmd->set_focus_position = 0;
  9. dev->cmd->feed = 0x19;
  10. + dev->focusSupport = SANE_FALSE;
  11. }
  12. if (e2_dev_model(dev, "GT-8200") || e2_dev_model(dev, "Perfection1650")
  13. || e2_dev_model(dev, "Perfection1640") || e2_dev_model(dev, "GT-8700")) {
  14. dev->cmd->feed = 0;
  15. - dev->cmd->set_focus_position = 0;
  16. + dev->focusSupport = SANE_FALSE;
  17. dev->need_reset_on_source_change = SANE_TRUE;
  18. }
  19. @@ -825,12 +825,12 @@ e2_discover_capabilities(Epson_Scanner *s)
  20. if (esci_request_focus_position(s, &s->currentFocusPosition) ==
  21. SANE_STATUS_GOOD) {
  22. - DBG(1, "setting focus is supported, current focus: %u\n", s->currentFocusPosition);
  23. + DBG(1, "getting focus is supported, current focus: %u\n", s->currentFocusPosition);
  24. dev->focusSupport = SANE_TRUE;
  25. s->opt[OPT_FOCUS_POS].cap &= ~SANE_CAP_INACTIVE;
  26. s->val[OPT_FOCUS_POS].w = s->currentFocusPosition;
  27. } else {
  28. - DBG(1, "setting focus is not supported\n");
  29. + DBG(1, "getting focus is not supported\n");
  30. dev->focusSupport = SANE_FALSE;
  31. s->opt[OPT_FOCUS_POS].cap |= SANE_CAP_INACTIVE;
  32. s->val[OPT_FOCUS_POS].w = FOCUS_ON_GLASS; /* just in case */