add init option descriptor with profile parameter

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index be40a3e22c34677d5147f67b2b8ff46611da65e9..842f75b768ace362b3518d0b78822d6c4a7626e2 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -82,7 +82,7 @@ SANE_Status sane_kds_s2000w_net_open(SANE_String_Const devicename,
                return SANE_STATUS_DEVICE_BUSY;
        }
 
-       kds_s2000w_option_descriptors_init();
+       kds_s2000w_option_descriptors_init(h->profile);
        return SANE_STATUS_GOOD;
 }
 

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index cb4988661f1db02334f017e8bbffaeba1e14ce38..3a657caef4ba46b9bcbd14e6e46a2268d1f450ae 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1107,7 +1107,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_feeder_group()
        return descriptor;
 }
 
-void kds_s2000w_option_descriptors_init()
+void kds_s2000w_option_descriptors_init(uint8_t profile)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_init_option_descriptors");
 

diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h
index 54390257569b52a397cf985ae44fc1651395c1c6..b4baaf2c2d13c1c0ebe8a1fb646ebceeb59233e1 100644 (file)
--- a/src/kds_s2000w_option_descriptors.h
+++ b/src/kds_s2000w_option_descriptors.h
@@ -70,7 +70,7 @@ typedef struct {
        SANE_Option_Descriptor descriptor;
 } option_descriptor;
 
-void kds_s2000w_option_descriptors_init();
+void kds_s2000w_option_descriptors_init(uint8_t profile);
 void kds_s2000w_option_descriptors_free();
 
 option_descriptor* kds_s2000w_option_descriptor_full_get_by_number(uint32_t number);

diff --git a/tests/kds_s2000w_net_get_opt_tests_run.c b/tests/kds_s2000w_net_get_opt_tests_run.c
index 2c7dd97f6036ff95fa46f80cca33fea92d431efa..7c4eefb34d4d2ae9a0e92683134e160c20890b51 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests_run.c
+++ b/tests/kds_s2000w_net_get_opt_tests_run.c
@@ -6,7 +6,7 @@
 
 int setup_default_get_option(void** state)
 {
-       kds_s2000w_option_descriptors_init();
+       kds_s2000w_option_descriptors_init(0);
        response* resp = kds_s2000w_client_response_init();
        const char* responsedata = "{ \
                \"Status\": { \

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 1e7c9ec42e85e5eeb641d40c6b48e983a95c4bff..8e40f1f8082953173f19da31e5109f1e2a2f18e7 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -8,7 +8,7 @@
 
 int setup(void** state)
 {
-       kds_s2000w_option_descriptors_init();
+       kds_s2000w_option_descriptors_init(0);
 
        return 0;
 }