change mark all advanced option

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 6306ae6883f9528de835259e3b38939f27a5a2b5..7256ede94a0c9c3ea54834efd972d95f094178e1 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -149,7 +149,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_skip_blank_pages()
                SANE_TYPE_BOOL,
                SANE_UNIT_NONE,
                sizeof(SANE_Bool),
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_NONE
        };
 
@@ -566,7 +566,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_multifeed_sensitivity()
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 5,
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = (SANE_String_Const*) constraint}
        };
@@ -590,7 +590,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_multifeed_response()
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 3,
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = (SANE_String_Const*) constraint}
        };
@@ -617,7 +617,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_post_scan_rotation()
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 6,
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = (SANE_String_Const*) constraint}
        };
@@ -642,7 +642,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_edge_fill()
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 4,
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = (SANE_String_Const*) constraint}
        };
@@ -667,7 +667,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_image_border()
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 4,
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = (SANE_String_Const*) constraint}
        };
@@ -693,7 +693,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_transport_handling()
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 5,
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = (SANE_String_Const*) constraint}
        };
@@ -720,7 +720,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_jpeg_quality()
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 6,
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = (SANE_String_Const*) constraint}
        };
@@ -745,7 +745,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_document_feeder_timeout_res
                SANE_TYPE_STRING,
                SANE_UNIT_NONE,
                sizeof(SANE_String_Const*) * 4,
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_STRING_LIST,
                {.string_list = (SANE_String_Const*) constraint}
        };
@@ -764,7 +764,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_hole_fill()
                SANE_TYPE_BOOL,
                SANE_UNIT_NONE,
                sizeof(SANE_Bool),
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_NONE,
        };
 
@@ -837,7 +837,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_skip_blank_page_content()
                SANE_TYPE_INT,
                SANE_UNIT_PERCENT,
                sizeof(SANE_Int),
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_RANGE,
                {.range = constraint}
        };
@@ -885,7 +885,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_max_document_length()
                SANE_TYPE_INT,
                SANE_UNIT_NONE,
                sizeof(SANE_Int),
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_RANGE,
                {.range = constraint}
        };
@@ -909,7 +909,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_document_feeder_timeout()
                SANE_TYPE_INT,
                SANE_UNIT_NONE,
                sizeof(SANE_Int),
-               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+               SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED,
                SANE_CONSTRAINT_RANGE,
                {.range = constraint}
        };

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index e4783231b06ce597391f0459082dd4a46189bdc5..468cec6ded415e74d613ecb934d5b93d6ef107ce 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -575,7 +575,7 @@ void kds_s2000w_option_get_descriptor_thirdytwo_test()
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_String_Const*) * 6, option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       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("Draft", option->constraint.string_list[0]);
        assert_string_equal("Good", option->constraint.string_list[1]);
@@ -595,7 +595,7 @@ void kds_s2000w_option_get_descriptor_thirdythree_test()
        assert_int_equal(SANE_TYPE_INT, option->type);
        assert_int_equal(SANE_UNIT_PERCENT, option->unit);
        assert_int_equal(sizeof(SANE_Int), option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
        assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type);
        assert_int_equal(option->constraint.range->min, 0);
        assert_int_equal(option->constraint.range->max, 100);
@@ -612,7 +612,7 @@ void kds_s2000w_option_get_descriptor_thirdyfour_test()
        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(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       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("None", option->constraint.string_list[0]);
        assert_string_equal("Low", option->constraint.string_list[1]);
@@ -631,7 +631,7 @@ void kds_s2000w_option_get_descriptor_thirdyfive_test()
        assert_int_equal(SANE_TYPE_INT, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_Int), option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
        assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type);
        assert_int_equal(option->constraint.range->min, 25);
        assert_int_equal(option->constraint.range->max, 400);
@@ -648,7 +648,7 @@ void kds_s2000w_option_get_descriptor_thirdysix_test()
        assert_int_equal(SANE_TYPE_INT, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_Int), option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
        assert_int_equal(SANE_CONSTRAINT_RANGE, option->constraint_type);
        assert_int_equal(option->constraint.range->min, 0);
        assert_int_equal(option->constraint.range->max, 120);
@@ -665,7 +665,7 @@ void kds_s2000w_option_get_descriptor_thirdyseven_test()
        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(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       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]);
@@ -682,7 +682,7 @@ void kds_s2000w_option_get_descriptor_thirdyeight_test()
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_String_Const*) * 4, option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       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("None", option->constraint.string_list[0]);
        assert_string_equal("Add", option->constraint.string_list[1]);
@@ -700,7 +700,7 @@ void kds_s2000w_option_get_descriptor_thirdynine_test()
        assert_int_equal(SANE_TYPE_BOOL, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_Bool), option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
@@ -715,7 +715,7 @@ void kds_s2000w_option_get_descriptor_fourty_test()
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_String_Const*) * 4, option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       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("Pause", option->constraint.string_list[1]);
@@ -733,7 +733,7 @@ void kds_s2000w_option_get_descriptor_fourtyone_test()
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_String_Const*) * 6, option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       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("None", option->constraint.string_list[0]);
        assert_string_equal("Automatic", option->constraint.string_list[1]);
@@ -753,7 +753,7 @@ void kds_s2000w_option_get_descriptor_fourtytwo_test()
        assert_int_equal(SANE_TYPE_STRING, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_String_Const*) * 4, option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       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("None", option->constraint.string_list[0]);
        assert_string_equal("Automatic", option->constraint.string_list[1]);
@@ -771,7 +771,7 @@ void kds_s2000w_option_get_descriptor_fourtythree_test()
        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(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       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]);
@@ -790,7 +790,7 @@ void kds_s2000w_option_get_descriptor_fourtyfour_test()
        assert_int_equal(SANE_TYPE_BOOL, option->type);
        assert_int_equal(SANE_UNIT_NONE, option->unit);
        assert_int_equal(sizeof(SANE_Bool),  option->size);
-       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, option->cap);
+       assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT | SANE_CAP_ADVANCED, option->cap);
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }