change transport handling position

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index d27d687b1eb1616b894d9dab6231e41706864846..f677d0cb5672142b8b2f6009714aa88c32744649 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -279,11 +279,11 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
                        _kds_s2000w_handler_opts_write_int_value(value_object, value);
                        break;
                case 42:
-                       value_object = json_object_object_get(config, "MultifeedResponse");
+                       value_object = json_object_object_get(config, "TransportHandling");
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 43:
-                       value_object = json_object_object_get(config, "TransportHandling");
+                       value_object = json_object_object_get(config, "MultifeedResponse");
                        _kds_s2000w_handler_opts_write_string_value(value_object, value);
                        break;
                case 44:
@@ -484,11 +484,11 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value
                        _kds_s2000w_handler_opts_write_int_value_to_json(value_object, value);
                        break;
                case 42:
-                       value_object = json_object_object_get(config, "MultifeedResponse");
+                       value_object = json_object_object_get(config, "TransportHandling");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 43:
-                       value_object = json_object_object_get(config, "TransportHandling");
+                       value_object = json_object_object_get(config, "MultifeedResponse");
                        _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value);
                        break;
                case 44:

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index bd855efeeb01a866b1d9871f10050d8f46000325..29a92d658153d9af976430ee45157bfdaf6a1ef3 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1156,8 +1156,8 @@ void kds_s2000w_option_descriptors_init()
        descriptor_array[39] = _kds_s2000w_option_descriptor_jpeg_quality();
        descriptor_array[40] = _kds_s2000w_option_descriptor_feeder_group();
        descriptor_array[41] = _kds_s2000w_option_descriptor_max_document_length();
-       descriptor_array[42] = _kds_s2000w_option_descriptor_multifeed_response();
-       descriptor_array[43] = _kds_s2000w_option_descriptor_transport_handling();
+       descriptor_array[42] = _kds_s2000w_option_descriptor_transport_handling();
+       descriptor_array[43] = _kds_s2000w_option_descriptor_multifeed_response();
        descriptor_array[44] = _kds_s2000w_option_descriptor_multifeed_sensitivity();
        descriptor_array[45] = _kds_s2000w_option_descriptor_document_feeder_timeout();
        descriptor_array[46] = _kds_s2000w_option_descriptor_document_feeder_timeout_response();

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 7670e27ca2c66500ee3f2505926aa9b6f54156c0..806a0050ecd2e13a8387b3c790dacc50d4a06901 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -549,7 +549,7 @@ void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state)
 
        sane_kds_s2000w_net_control_option(h, 42, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "Stop");
+       assert_string_equal(value, "Normal");
 
        kds_s2000w_handler_free(h);
        h = NULL;
@@ -564,7 +564,7 @@ void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state)
 
        sane_kds_s2000w_net_control_option(h, 43, SANE_ACTION_GET_VALUE, &value, NULL);
 
-       assert_string_equal(value, "Normal");
+       assert_string_equal(value, "Stop");
 
        kds_s2000w_handler_free(h);
        h = NULL;

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 4fe2a59a77cc2a97615572917cd46453620c5f12..e1abc1d3a2af9d3b08ae3579556147e987ff39ac 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -736,36 +736,36 @@ void kds_s2000w_option_get_descriptor_fourtytwo_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(42);
 
-       assert_string_equal("multifeed-response", option->name);
-       assert_string_equal("multifeed response", option->title);
-       assert_string_equal("multifeed response", option->desc);
+       assert_string_equal("transport-handling", option->name);
+       assert_string_equal("Transport Handling", option->title);
+       assert_string_equal("Transport Handling", option->desc);
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
-       assert_int_equal(sizeof(SANE_String_Const*) * 3, option->size);
+       assert_int_equal(sizeof(SANE_String_Const*) * 5, option->size);
        assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
        assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type);
-       assert_string_equal("Stop", option->constraint.string_list[0]);
-       assert_string_equal("StopAndGenerateImage", option->constraint.string_list[1]);
-       assert_null(option->constraint.string_list[2]);
+       assert_string_equal("Normal", option->constraint.string_list[0]);
+       assert_string_equal("ImprovedStacking", option->constraint.string_list[1]);
+       assert_string_equal("BestStacking", option->constraint.string_list[2]);
+       assert_string_equal("Special", option->constraint.string_list[3]);
+       assert_null(option->constraint.string_list[4]);
 }
 
 void kds_s2000w_option_get_descriptor_fourtythree_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(43);
 
-       assert_string_equal("transport-handling", option->name);
-       assert_string_equal("Transport Handling", option->title);
-       assert_string_equal("Transport Handling", option->desc);
+       assert_string_equal("multifeed-response", option->name);
+       assert_string_equal("multifeed response", option->title);
+       assert_string_equal("multifeed response", option->desc);
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
-       assert_int_equal(sizeof(SANE_String_Const*) * 5, option->size);
+       assert_int_equal(sizeof(SANE_String_Const*) * 3, option->size);
        assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
        assert_int_equal(SANE_CONSTRAINT_STRING_LIST, option->constraint_type);
-       assert_string_equal("Normal", option->constraint.string_list[0]);
-       assert_string_equal("ImprovedStacking", option->constraint.string_list[1]);
-       assert_string_equal("BestStacking", option->constraint.string_list[2]);
-       assert_string_equal("Special", option->constraint.string_list[3]);
-       assert_null(option->constraint.string_list[4]);
+       assert_string_equal("Stop", option->constraint.string_list[0]);
+       assert_string_equal("StopAndGenerateImage", option->constraint.string_list[1]);
+       assert_null(option->constraint.string_list[2]);
 }
 
 void kds_s2000w_option_get_descriptor_fourtyfour_test()