From ee660c1ceb6effecdbc4eb9d3ce14c524e41fa8f Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 9 Feb 2025 19:52:51 +0100 Subject: [PATCH] add enum for feeder --- src/kds_s2000w_handler.c | 2 +- src/kds_s2000w_handler.h | 6 ++++++ src/kds_s2000w_handler_opts.c | 12 ++++++------ tests/kds_s2000w_net_get_opt_tests.c | 2 +- tests/kds_s2000w_net_tests.c | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 99bd7f5..46500c8 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -49,7 +49,7 @@ handler* kds_s2000w_handler_init() h->current_scan_status->available_images = 0; h->current_scan_status->downloaded_images = 0; h->current_scan_status->complete_scanned = false; - h->current_scan_status->feeder = 1; + h->current_scan_status->feeder = DocumentFeeder; h->read_info->scan_started = false; h->read_info->cancel = false; h->read_info->read_size = 0; diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h index 2fd321f..67e3312 100644 --- a/src/kds_s2000w_handler.h +++ b/src/kds_s2000w_handler.h @@ -15,6 +15,12 @@ enum { RELOAD_PARAMS = 4 }; +enum { + Flatbed, + DocumentFeeder, + Automatic +}; + typedef struct { size_t size; void* data; diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index fa9d3b8..4db71ab 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -120,13 +120,13 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_value(value_object, value); if (strcmp(value, "Flatbed") == 0) - h->current_scan_status->feeder = 0; + h->current_scan_status->feeder = Flatbed; if (strcmp(value, "DocumentFeeder") == 0) - h->current_scan_status->feeder = 1; + h->current_scan_status->feeder = DocumentFeeder; if (strcmp(value, "Automatic") == 0) - h->current_scan_status->feeder = 2; + h->current_scan_status->feeder = Automatic; break; case 3: @@ -221,13 +221,13 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_string_value_to_json(value_object, value); if (strcmp(value, "Flatbed") == 0) - h->current_scan_status->feeder = 0; + h->current_scan_status->feeder = Flatbed; if (strcmp(value, "DocumentFeeder") == 0) - h->current_scan_status->feeder = 1; + h->current_scan_status->feeder = DocumentFeeder; if (strcmp(value, "Automatic") == 0) - h->current_scan_status->feeder = 2; + h->current_scan_status->feeder = Automatic; break; case 3: diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index 41dc5f0..a77cd17 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -38,7 +38,7 @@ void sane_kds_s2000w_net_control_get_option_two_test(void** state) sane_kds_s2000w_net_control_option(h, 2, SANE_ACTION_GET_VALUE, &value, NULL); assert_string_equal(value, "DocumentFeeder"); - assert_int_equal(h->current_scan_status->feeder, 1); + assert_int_equal(h->current_scan_status->feeder, DocumentFeeder); kds_s2000w_handler_free(h); h = NULL; diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index 8d0e21e..adbc2e1 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -282,7 +282,7 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state) expect_function_call(__wrap_kds_s2000w_client_get_image); expect_function_call(__wrap_kds_s2000w_client_delete_image); handler* h = kds_s2000w_handler_init(); - h->current_scan_status->feeder = 0; + h->current_scan_status->feeder = Flatbed; const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }"; h->current_scanner_config = json_tokener_parse(test_config); -- 2.39.5