From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 16 Feb 2025 06:23:36 +0000 (+0100)
Subject: add option descriptor multifeed response
X-Git-Tag: v1.1.0^2~4^2~43
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=cf8687f1d9b7f70424be57d9040f07aa6f90a274;p=sane-kds-s2000w-net.git

add option descriptor multifeed response
---

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 8959810..fd8cf32 100644
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -3,7 +3,7 @@
 #include "kds_s2000w_option_descriptors.h"
 #include "kds_s2000w_debug.h"
 
-#define MAX_OPTION_COUNT 24
+#define MAX_OPTION_COUNT 25
 
 SANE_Option_Descriptor* descriptor_array = NULL;
 
@@ -28,6 +28,7 @@ SANE_String_Const* constraint_max_document_length = NULL;
 SANE_String_Const* constraint_scan_source = NULL;
 SANE_String_Const* constraint_color_sharpen = NULL;
 SANE_String_Const* constraint_multifeed_sensitivity = NULL;
+SANE_String_Const* constraint_multifeed_response = NULL;
 
 SANE_Option_Descriptor _kds_s2000w_option_descriptor_standard_group()
 {
@@ -523,7 +524,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_color_sharpen()
 
 SANE_Option_Descriptor _kds_s2000w_option_descriptor_multifeed_sensitivity()
 {
-	kds_s2000w_debug_printf(ALL, "_kds_s2000w_option_descriptor_multifeed_sensitivity");
+	kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_multifeed_sensitivity");
 
 	constraint_multifeed_sensitivity = malloc(sizeof(SANE_String_Const*) * 5);
 	constraint_multifeed_sensitivity[0] = "None";
@@ -547,6 +548,30 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_multifeed_sensitivity()
 	return descriptor;
 }
 
+SANE_Option_Descriptor _kds_s2000w_option_descriptor_multifeed_response()
+{
+	kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_multifeed_response");
+
+	constraint_multifeed_response = malloc(sizeof(SANE_String_Const*) * 5);
+	constraint_multifeed_response[0] = "Stop";
+	constraint_multifeed_response[1] = "StopAndGenerateImage";
+	constraint_multifeed_response[2] = NULL;
+
+	SANE_Option_Descriptor descriptor = {
+		"multifeed-response",
+		"multifeed response",
+		"multifeed response",
+		SANE_TYPE_STRING,
+		SANE_UNIT_NONE,
+		sizeof(SANE_String_Const*) * 3,
+		SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT,
+		SANE_CONSTRAINT_STRING_LIST,
+		{.string_list = constraint_multifeed_response}
+	};
+
+	return descriptor;
+}
+
 void kds_s2000w_option_descriptors_init()
 {
 	kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_init_option_descriptors");
@@ -575,7 +600,8 @@ void kds_s2000w_option_descriptors_init()
 	descriptor_array[20] = _kds_s2000w_option_descriptor_background_smoothing_aggressiveness();
 	descriptor_array[21] = _kds_s2000w_option_descriptor_binarization_contrast();
 	descriptor_array[22] = _kds_s2000w_option_descriptor_multifeed_sensitivity();
-	descriptor_array[23] = _kds_s2000w_option_descriptor_config_reset();
+	descriptor_array[23] = _kds_s2000w_option_descriptor_multifeed_response();
+	descriptor_array[24] = _kds_s2000w_option_descriptor_config_reset();
 }
 
 void kds_s2000w_option_descriptors_free()
@@ -606,6 +632,8 @@ void kds_s2000w_option_descriptors_free()
 	constraint_color_sharpen = NULL;
 	free(constraint_multifeed_sensitivity);
 	constraint_multifeed_sensitivity = NULL;
+	free(constraint_multifeed_response);
+	constraint_multifeed_response = NULL;
 	free(descriptor_array);
 	descriptor_array = NULL;
 }
diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 4e83306..056e18e 100644
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -4,7 +4,7 @@
 #include "kds_s2000w_client_mock.h"
 #include "../src/kds_s2000w_option_descriptors.h"
 
-#define MAX_OPTION_COUNT 24
+#define MAX_OPTION_COUNT 25
 
 int setup(void** state)
 {
@@ -422,6 +422,23 @@ void kds_s2000w_option_get_descriptor_twentythree_test()
 {
 	SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(23);
 
+	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*) * 3, option->size);
+	assert_int_equal(SANE_CAP_SOFT_DETECT | SANE_CAP_SOFT_SELECT, 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]);
+}
+
+void kds_s2000w_option_get_descriptor_twentyfour_test()
+{
+	SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(24);
+
 	assert_string_equal("config-reset", option->name);
 	assert_string_equal("reset config", option->title);
 	assert_string_equal("load default configuration from scanner", option->desc);
diff --git a/tests/kds_s2000w_option_descriptor_tests.h b/tests/kds_s2000w_option_descriptor_tests.h
index a6457cb..6136353 100644
--- a/tests/kds_s2000w_option_descriptor_tests.h
+++ b/tests/kds_s2000w_option_descriptor_tests.h
@@ -32,5 +32,6 @@ void kds_s2000w_option_get_descriptor_twenty_test();
 void kds_s2000w_option_get_descriptor_twentyone_test();
 void kds_s2000w_option_get_descriptor_twentytwo_test();
 void kds_s2000w_option_get_descriptor_twentythree_test();
+void kds_s2000w_option_get_descriptor_twentyfour_test();
 void kds_s2000w_option_get_descriptor_over_max_options_test();
 #endif
\ No newline at end of file
diff --git a/tests/kds_s2000w_option_descriptor_tests_run.c b/tests/kds_s2000w_option_descriptor_tests_run.c
index 2696251..958baab 100644
--- a/tests/kds_s2000w_option_descriptor_tests_run.c
+++ b/tests/kds_s2000w_option_descriptor_tests_run.c
@@ -27,6 +27,7 @@ int main()
 		cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyone_test, setup, teardown),
 		cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentytwo_test, setup, teardown),
 		cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentythree_test, setup, teardown),
+		cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyfour_test, setup, teardown),
 		cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options_test, setup, teardown)
 	};