summaryrefslogtreecommitdiff
path: root/backend/epson2.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-01 15:26:02 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-01 15:26:02 +0100
commit5de81480e84023d91763d89e4523de88df42c194 (patch)
treecb83e4c8216cf0e8bcaa17a6f2cb64cf4d7f469a /backend/epson2.c
parent97e55bdc5cdf59304af739e65f416320bcbcf599 (diff)
parent8e5d399808d2270ae9d56c96560a021e594d18a4 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/epson2.c')
-rw-r--r--backend/epson2.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/backend/epson2.c b/backend/epson2.c
index a15a620..5bb75d4 100644
--- a/backend/epson2.c
+++ b/backend/epson2.c
@@ -15,10 +15,6 @@
* published by the Free Software Foundation, version 2.
*/
-#define EPSON2_VERSION 1
-#define EPSON2_REVISION 0
-#define EPSON2_BUILD 124
-
/* debugging levels:
*
* 127 e2_recv buffer
@@ -900,16 +896,14 @@ SANE_Status
sane_init(SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize)
{
DBG_INIT();
- DBG(2, "%s: " PACKAGE " " VERSION "\n", __func__);
-
- DBG(1, "epson2 backend, version %i.%i.%i\n",
- EPSON2_VERSION, EPSON2_REVISION, EPSON2_BUILD);
+ DBG(1, "%s: version " VERSION "\n", __func__);
- if (version_code != NULL)
- *version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR,
- EPSON2_BUILD);
+ /* Keep '124' as our build version. The arg is obsolete by now */
+ if (version_code)
+ *version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 124);
sanei_usb_init();
+ sanei_usb_set_timeout(60 * 1000);
return SANE_STATUS_GOOD;
}