refactor open handler

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index a725c83021dcb72aa6dd951c3b75d01fbabe67a0..c459d04af897898ca3d7a91a1e770dd29547d896 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -10,7 +10,6 @@
 #include "kds_s2000w_debug.h"
 
 #define SPACE 0x0a
-#define DEVICE_NAME "kds_s2000w_net"
 #define ATTEMPT 30
 
 uint32_t _kds_s2000w_handler_find_first_data_byte(const imagedata_t* image)
@@ -269,13 +268,10 @@ void kds_s2000w_handler_reset(handler_t* h)
        h->scan_status->read_bytes = 0;
 }
 
-connection_state_t kds_s2000w_handler_open(const char* devicename, void** handle)
+connection_state_t kds_s2000w_handler_open(void** handle)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_open");
 
-       if (strcmp(devicename, DEVICE_NAME) != 0)
-               return NOTCONNECTED;
-
        handler_t* h = kds_s2000w_handler_init();
        if (h == NULL) {
                *handle = NULL;
@@ -284,7 +280,6 @@ connection_state_t kds_s2000w_handler_open(const char* devicename, void** handle
 
        *handle = h;
        _kds_s2000w_handler_load_config(h);
-       kds_s2000w_debug_printf_version(INFO, DEVICE_NAME, MAJOR, MINOR, PATCH);
 
        return _kds_s2000w_handler_connect(h);
 }

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 1d7080fe21f203be10159fb33e3f45fd89ca070b..2a6c0906c001991cbefb1e48c0765cd6dd9f0f42 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -59,7 +59,7 @@ handler_t* kds_s2000w_handler_init();
 void kds_s2000w_handler_free(handler_t* h);
 void kds_s2000w_handler_reset(handler_t* h);
 
-connection_state_t kds_s2000w_handler_open(const char* devicename, void** handle);
+connection_state_t kds_s2000w_handler_open(void** handle);
 void kds_s2000w_handler_close(handler_t* h);
 void kds_s2000w_handler_recreate_session(handler_t* h);
 

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 52c59739f407ea8ab771459107496a8dabaf2a5b..599ce4af21058c6a295196ef7ced3bf9d31cf94b 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -77,10 +77,11 @@ SANE_Status sane_kds_s2000w_net_open(SANE_String_Const devicename,
        if (strcmp(devicename, NAME) != 0)
                return SANE_STATUS_INVAL;
 
-       connection_state_t state = kds_s2000w_handler_open(devicename, handle);
+       connection_state_t state = kds_s2000w_handler_open(handle);
        if (*handle == NULL)
                return SANE_STATUS_NO_MEM;
 
+       kds_s2000w_debug_printf_version(INFO, devicename, MAJOR, MINOR, PATCH);
        handler_t* h = (handler_t*) *handle;
 
        if (state == NOTCONNECTED) {