From b9ee87aed4575da019cfb2cbcbf95f0ca0c654f0 Mon Sep 17 00:00:00 2001 From: Marvin Friedrich Date: Tue, 22 Sep 2026 23:12:49 +0200 Subject: [PATCH] cmdline fixes --- dev/block/nvme/meson.build | 2 +- include/zinnia/cmdline.h | 8 ++++---- meson.build | 2 +- scripts/get_options.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/block/nvme/meson.build b/dev/block/nvme/meson.build index 28afd8a..624df93 100644 --- a/dev/block/nvme/meson.build +++ b/dev/block/nvme/meson.build @@ -6,7 +6,7 @@ endif modules += { 'nvme': { - 'modular': true, #kconfig.get('CONFIG_NVME_CORE') == 'm', + 'modular': kconfig.get('CONFIG_NVME_CORE') == 'm', 'sources': nvme_sources, }, } diff --git a/include/zinnia/cmdline.h b/include/zinnia/cmdline.h index dd57a29..5fe91af 100644 --- a/include/zinnia/cmdline.h +++ b/include/zinnia/cmdline.h @@ -21,8 +21,8 @@ static_assert(_Generic( \ (opt_limit), \ const char**: true, \ - const struct cmdline_option_limit_int*: true, \ - const struct cmdline_option_limit_uint*: true, \ + const struct cmdline_range_int*: true, \ + const struct cmdline_range_uint*: true, \ void*: true \ )); \ [[__used, __section(".cmdline")]] \ @@ -57,10 +57,10 @@ struct cmdline_option { }; union { const char** str_limit; - struct cmdline_limit_int { + struct cmdline_range_int { intptr_t min, max; }* intptr_limit; - struct cmdline_limit_uint { + struct cmdline_range_uint { uintptr_t min, max; }* uintptr_limit; void* limit; diff --git a/meson.build b/meson.build index fc6c7b2..c70c3a9 100644 --- a/meson.build +++ b/meson.build @@ -161,5 +161,5 @@ executable( ) # Print a summary -summary(mod_summary, section: 'Driver configuration') +summary(mod_summary, bool_yn: true, section: 'Driver configuration') summary(kconfig, bool_yn: true, section: 'Kernel configuration') diff --git a/scripts/get_options.py b/scripts/get_options.py index 76d940c..256b1c6 100755 --- a/scripts/get_options.py +++ b/scripts/get_options.py @@ -61,8 +61,8 @@ if __name__ == "__main__": case 1: kind_str = "bool" case 2: - kind_str = "integer" - case 2: + kind_str = "signed integer" + case 3: kind_str = "unsigned integer" # Skip function pointer