From f28d0f1b7b663a298f3222ab4083eb0f745dc64b Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 15:03:42 +0200 Subject: [PATCH 01/14] sys: add Kconfig support for clif --- sys/Kconfig | 1 + sys/clif/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 sys/clif/Kconfig diff --git a/sys/Kconfig b/sys/Kconfig index 5f986c5c4b..49eed6ded2 100644 --- a/sys/Kconfig +++ b/sys/Kconfig @@ -19,6 +19,7 @@ rsource "bus/Kconfig" rsource "cb_mux/Kconfig" rsource "checksum/Kconfig" rsource "chunked_ringbuffer/Kconfig" +rsource "clif/Kconfig" rsource "color/Kconfig" rsource "crypto/Kconfig" rsource "congure/Kconfig" diff --git a/sys/clif/Kconfig b/sys/clif/Kconfig new file mode 100644 index 0000000000..6634c0952c --- /dev/null +++ b/sys/clif/Kconfig @@ -0,0 +1,10 @@ +# Copyright (c) 2023 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +config MODULE_CLIF + bool "CoRE Link format encoding and decoding library" + depends on TEST_KCONFIG From 5d351632d112f8a3c8ff0beae2c0e358d53d19e5 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 21 Apr 2023 10:34:36 +0200 Subject: [PATCH 02/14] sys/coding: add missing Kconfig --- sys/Kconfig | 1 + sys/coding/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 sys/coding/Kconfig diff --git a/sys/Kconfig b/sys/Kconfig index 5f986c5c4b..724181f3ad 100644 --- a/sys/Kconfig +++ b/sys/Kconfig @@ -72,6 +72,7 @@ choice LOG #modules log_color and log_printfnoformat describe their options endchoice +rsource "coding/Kconfig" rsource "log_color/Kconfig" rsource "log_printfnoformat/Kconfig" rsource "luid/Kconfig" diff --git a/sys/coding/Kconfig b/sys/coding/Kconfig new file mode 100644 index 0000000000..f2223eff2b --- /dev/null +++ b/sys/coding/Kconfig @@ -0,0 +1,12 @@ +# Copyright (c) 2023 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +config MODULE_CODING + bool "Error correction codes" + depends on TEST_KCONFIG + + select MODULE_BITFIELD From 4c9d6c0b4921fb4cf4d0c85e61db89dc3d194ea0 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 21 Apr 2023 10:38:24 +0200 Subject: [PATCH 03/14] sys/sema_inv: add missing Kconfig --- sys/Kconfig | 1 + sys/sema_inv/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 sys/sema_inv/Kconfig diff --git a/sys/Kconfig b/sys/Kconfig index 724181f3ad..f658d7e1be 100644 --- a/sys/Kconfig +++ b/sys/Kconfig @@ -95,6 +95,7 @@ rsource "rust_riotmodules/Kconfig" rsource "saul_reg/Kconfig" rsource "schedstatistics/Kconfig" rsource "sema/Kconfig" +rsource "sema_inv/Kconfig" rsource "senml/Kconfig" rsource "seq/Kconfig" rsource "shell/Kconfig" diff --git a/sys/sema_inv/Kconfig b/sys/sema_inv/Kconfig new file mode 100644 index 0000000000..50ac0c0890 --- /dev/null +++ b/sys/sema_inv/Kconfig @@ -0,0 +1,12 @@ +# Copyright (c) 2023 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +config MODULE_SEMA_INV + bool "inverse Semaphores" + depends on TEST_KCONFIG + + select MODULE_ATOMIC_UTILS From 67391afe1a45cc00dce72dcebf4eed96bcf76380 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 21 Apr 2023 10:40:19 +0200 Subject: [PATCH 04/14] sys/ssp: add missing Kconfig --- sys/Kconfig | 1 + sys/ssp/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 sys/ssp/Kconfig diff --git a/sys/Kconfig b/sys/Kconfig index f658d7e1be..ebc94da3ed 100644 --- a/sys/Kconfig +++ b/sys/Kconfig @@ -99,6 +99,7 @@ rsource "sema_inv/Kconfig" rsource "senml/Kconfig" rsource "seq/Kconfig" rsource "shell/Kconfig" +rsource "ssp/Kconfig" rsource "test_utils/Kconfig" rsource "timex/Kconfig" rsource "tiny_strerror/Kconfig" diff --git a/sys/ssp/Kconfig b/sys/ssp/Kconfig new file mode 100644 index 0000000000..aa55cd105e --- /dev/null +++ b/sys/ssp/Kconfig @@ -0,0 +1,12 @@ +# Copyright (c) 2023 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +config MODULE_SSP + bool "Stack Smashing Protector (SSP) helper functions" + depends on TEST_KCONFIG + + select HAS_SSP From d39af661764c73cf4edc8b4dcc9840f48d2b1bfa Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 21 Apr 2023 10:42:12 +0200 Subject: [PATCH 05/14] sys/uuid: add missing Kconfig --- sys/Kconfig | 1 + sys/uuid/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 sys/uuid/Kconfig diff --git a/sys/Kconfig b/sys/Kconfig index ebc94da3ed..ea694da25b 100644 --- a/sys/Kconfig +++ b/sys/Kconfig @@ -109,6 +109,7 @@ rsource "tsrb/Kconfig" rsource "uri_parser/Kconfig" rsource "usb/Kconfig" rsource "usb_board_reset/Kconfig" +rsource "uuid/Kconfig" rsource "vfs/Kconfig" rsource "xtimer/Kconfig" rsource "ztimer/Kconfig" diff --git a/sys/uuid/Kconfig b/sys/uuid/Kconfig new file mode 100644 index 0000000000..7def459c7a --- /dev/null +++ b/sys/uuid/Kconfig @@ -0,0 +1,14 @@ +# Copyright (c) 2023 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +config MODULE_UUID + bool "RFC 4122 compliant UUID's" + depends on TEST_KCONFIG + + select MODULE_HASHES + select MODULE_RANDOM + select MODULE_FMT From 27cf550f74736144d2b0b65534630edd06c446fb Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 21 Apr 2023 12:31:13 +0200 Subject: [PATCH 06/14] sys/ut_process: add missing Kconfig --- sys/Kconfig | 1 + sys/ut_process/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 sys/ut_process/Kconfig diff --git a/sys/Kconfig b/sys/Kconfig index ea694da25b..9025bf2662 100644 --- a/sys/Kconfig +++ b/sys/Kconfig @@ -109,6 +109,7 @@ rsource "tsrb/Kconfig" rsource "uri_parser/Kconfig" rsource "usb/Kconfig" rsource "usb_board_reset/Kconfig" +rsource "ut_process/Kconfig" rsource "uuid/Kconfig" rsource "vfs/Kconfig" rsource "xtimer/Kconfig" diff --git a/sys/ut_process/Kconfig b/sys/ut_process/Kconfig new file mode 100644 index 0000000000..d7b8bd7b2b --- /dev/null +++ b/sys/ut_process/Kconfig @@ -0,0 +1,12 @@ +# Copyright (c) 2023 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +config MODULE_UT_PROCESS + bool "URI template processor" + depends on TEST_KCONFIG + + select MODULE_FMT From d7f14e4a87acff174e62551fe69eeeb046cc049b Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 15:14:26 +0200 Subject: [PATCH 07/14] tests/sys/sema_inv: switch to ztimer --- tests/sys/sema_inv/Makefile | 3 ++- tests/sys/sema_inv/main.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/sys/sema_inv/Makefile b/tests/sys/sema_inv/Makefile index 4b55e60aa6..3cf52ac608 100644 --- a/tests/sys/sema_inv/Makefile +++ b/tests/sys/sema_inv/Makefile @@ -1,6 +1,7 @@ include ../Makefile.sys_common USEMODULE += sema_inv -USEMODULE += xtimer +USEMODULE += ztimer +USEMODULE += ztimer_msec include $(RIOTBASE)/Makefile.include diff --git a/tests/sys/sema_inv/main.c b/tests/sys/sema_inv/main.c index b9b05ff58c..c213be18d2 100644 --- a/tests/sys/sema_inv/main.c +++ b/tests/sys/sema_inv/main.c @@ -21,7 +21,7 @@ #include #include "sema_inv.h" -#include "xtimer.h" +#include "ztimer.h" char t1_stack[THREAD_STACKSIZE_SMALL]; char t2_stack[THREAD_STACKSIZE_SMALL]; @@ -38,7 +38,7 @@ static void *thread_count(void *arg) printf("THREAD %u start\n", ctx->id); - xtimer_msleep(5); + ztimer_sleep(ZTIMER_MSEC, 5); if (sema_inv_post(ctx->sync)) { printf("THREAD %u woke main thread\n", ctx->id); @@ -53,7 +53,7 @@ static void *thread_bit(void *arg) printf("THREAD %u start\n", ctx->id); - xtimer_msleep(5); + ztimer_sleep(ZTIMER_MSEC, 5); if (sema_inv_post_mask(ctx->sync, 1 << ctx->id)) { printf("THREAD %u woke main thread\n", ctx->id); @@ -86,7 +86,7 @@ static void test_counter_mode(void) puts("thread synced"); /* wait for all threads to terminate, we are going to re-use the stack */ - xtimer_msleep(50); + ztimer_sleep(ZTIMER_MSEC, 50); } static void test_mask_mode(void) @@ -113,7 +113,7 @@ static void test_mask_mode(void) puts("thread synced"); /* wait for all threads to terminate, we are going to re-use the stack */ - xtimer_msleep(50); + ztimer_sleep(ZTIMER_MSEC, 50); } int main(void) From b747a214504c5921b4beca8165ebeffa5b5be86c Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 15:14:51 +0200 Subject: [PATCH 08/14] tests/sys/sema_inv: add kconfig dependency file --- tests/sys/sema_inv/app.config.test | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests/sys/sema_inv/app.config.test diff --git a/tests/sys/sema_inv/app.config.test b/tests/sys/sema_inv/app.config.test new file mode 100644 index 0000000000..214cd33b44 --- /dev/null +++ b/tests/sys/sema_inv/app.config.test @@ -0,0 +1,3 @@ +CONFIG_MODULE_SEMA_INV=y +CONFIG_MODULE_ZTIMER=y +CONFIG_MODULE_ZTIMER_MSEC=y From 12a6ed0dda3f0b41c8b0de7b15ce735259dfb9ac Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 15:16:35 +0200 Subject: [PATCH 09/14] tests/sys/ssp: add kconfig dependency file --- tests/sys/ssp/app.config.test | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/sys/ssp/app.config.test diff --git a/tests/sys/ssp/app.config.test b/tests/sys/ssp/app.config.test new file mode 100644 index 0000000000..7a73919bdd --- /dev/null +++ b/tests/sys/ssp/app.config.test @@ -0,0 +1 @@ +CONFIG_MODULE_SSP=y From ca5ac761996632e39e837f943df11339bb7ee378 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 15:40:44 +0200 Subject: [PATCH 10/14] pkg/libbase58: add Kconfig support --- pkg/Kconfig | 1 + pkg/libbase58/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkg/libbase58/Kconfig diff --git a/pkg/Kconfig b/pkg/Kconfig index cdb00d2bda..e150bac93e 100644 --- a/pkg/Kconfig +++ b/pkg/Kconfig @@ -36,6 +36,7 @@ rsource "heatshrink/Kconfig" rsource "jerryscript/Kconfig" rsource "jsmn/Kconfig" rsource "libb2/Kconfig" +rsource "libbase58/Kconfig" rsource "libcose/Kconfig" rsource "libfixmath/Kconfig" rsource "libhydrogen/Kconfig" diff --git a/pkg/libbase58/Kconfig b/pkg/libbase58/Kconfig new file mode 100644 index 0000000000..4ad2e30321 --- /dev/null +++ b/pkg/libbase58/Kconfig @@ -0,0 +1,12 @@ +# Copyright (c) 2023 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. +# + +config PACKAGE_LIBBASE58 + bool "Bitcoin's base58 encoding" + depends on TEST_KCONFIG + + select MODULE_POSIX_HEADERS From 609ba37b81e7e04e8c73b5fee95bf2a8dc679f9e Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 15:40:57 +0200 Subject: [PATCH 11/14] tests/pkg/libbase58: add Kconfig config --- tests/pkg/libbase58/app.config.test | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tests/pkg/libbase58/app.config.test diff --git a/tests/pkg/libbase58/app.config.test b/tests/pkg/libbase58/app.config.test new file mode 100644 index 0000000000..3e6e71f2b5 --- /dev/null +++ b/tests/pkg/libbase58/app.config.test @@ -0,0 +1,2 @@ +CONFIG_MODULE_EMBUNIT=y +CONFIG_PACKAGE_LIBBASE58=y From cfb5000d5c481a4f14286b54ac05863f9e067433 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 16:06:53 +0200 Subject: [PATCH 12/14] sys/gnrc/lorawan: remove handling of deprecated tx port --- sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c b/sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c index 4cbf3f7a66..b151c6c52c 100644 --- a/sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c +++ b/sys/net/gnrc/netif/lorawan/gnrc_netif_lorawan.c @@ -506,10 +506,6 @@ static int _set(gnrc_netif_t *netif, const gnrc_netapi_opt_t *opt) } netif->lorawan.datarate = *((uint8_t *)opt->data); break; - case NETOPT_LORAWAN_TX_PORT: - assert(opt->data_len == sizeof(uint8_t)); - netif->lorawan.port = *((uint8_t *)opt->data); - break; case NETOPT_ACK_REQ: assert(opt->data_len == sizeof(netopt_enable_t)); netif->lorawan.ack_req = *((netopt_enable_t *)opt->data); From 889d753ed61856840457c07d40282a508a118894 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 16:07:01 +0200 Subject: [PATCH 13/14] sys/ --- sys/include/net/netopt.h | 20 -------------------- sys/net/crosslayer/netopt/netopt.c | 1 - 2 files changed, 21 deletions(-) diff --git a/sys/include/net/netopt.h b/sys/include/net/netopt.h index 561fe19ee6..a2b367b9b6 100644 --- a/sys/include/net/netopt.h +++ b/sys/include/net/netopt.h @@ -652,26 +652,6 @@ typedef enum { */ NETOPT_LORAWAN_PUBLIC_NETWORK, - /** - * @brief (uint8_t) LoRaWAN TX application port - * - LoRaWAN: between 1 and 223 (included) - * - * @deprecated This option is deprecated and will be removed in the - * 2022.01 Release. - * The port is encoded now as a one byte - * destination address in a @ref net_gnrc_netif_hdr snip - * prepended in the packet. - * The user must take care of prepending the required snip - * during transmission. On reception, the - * snip is prepended automatically by the stack and shall be - * consumed by the user. - * During the deprecation period it is required to - * compile with @ref - * CONFIG_GNRC_NETIF_LORAWAN_NETIF_HDR - * - */ - NETOPT_LORAWAN_TX_PORT, - /** * @brief (loramac_dr_idx_t) LoRaWAN datarate for second RX window * - LoRaWAN: @ref loramac_dr_idx_t diff --git a/sys/net/crosslayer/netopt/netopt.c b/sys/net/crosslayer/netopt/netopt.c index 22ca26515f..c09b5959e0 100644 --- a/sys/net/crosslayer/netopt/netopt.c +++ b/sys/net/crosslayer/netopt/netopt.c @@ -106,7 +106,6 @@ static const char *_netopt_strmap[] = { [NETOPT_LORAWAN_DR] = "NETOPT_LORAWAN_DR", [NETOPT_LORAWAN_ADR] = "NETOPT_LORAWAN_ADR", [NETOPT_LORAWAN_PUBLIC_NETWORK]= "NETOPT_LORAWAN_PUBLIC_NETWORK", - [NETOPT_LORAWAN_TX_PORT] = "NETOPT_LORAWAN_TX_PORT", [NETOPT_LORAWAN_RX2_DR] = "NETOPT_LORAWAN_RX2_DR", [NETOPT_LORAWAN_RX2_FREQ] = "NETOPT_LORAWAN_RX2_FREQ", [NETOPT_LORAWAN_MAX_RX_ERROR] = "NETOPT_LORAWAN_MAX_RX_ERROR", From 558d7dd8f273bfd243dd0a54f8d734d98e055978 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 19 May 2023 16:15:10 +0200 Subject: [PATCH 14/14] makefiles/pseudomodules: remove deprecated event_thread_lowest module --- makefiles/deprecated_modules.inc.mk | 1 - makefiles/pseudomodules.inc.mk | 7 ------- sys/include/event/thread.h | 3 --- 3 files changed, 11 deletions(-) diff --git a/makefiles/deprecated_modules.inc.mk b/makefiles/deprecated_modules.inc.mk index 1e6d34065b..525439f3de 100644 --- a/makefiles/deprecated_modules.inc.mk +++ b/makefiles/deprecated_modules.inc.mk @@ -1,6 +1,5 @@ # Add deprecated modules here # Keep this list ALPHABETICALLY SORTED!!!!111elven -DEPRECATED_MODULES += event_thread_lowest DEPRECATED_MODULES += gnrc_netdev_default DEPRECATED_MODULES += gnrc_netif_cmd_lora # use shell_cmd_gnrc_netif_lorawan instead DEPRECATED_MODULES += gnrc_pktbuf_cmd # use shell_cmd_gnrc_pktbuf instead diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk index 24f3228f02..e7ec63fc27 100644 --- a/makefiles/pseudomodules.inc.mk +++ b/makefiles/pseudomodules.inc.mk @@ -61,13 +61,6 @@ PSEUDOMODULES += dns_msg PSEUDOMODULES += ecc_% PSEUDOMODULES += ethos_stdio PSEUDOMODULES += event_% -## @defgroup sys_event_thread_lowest event_thread_lowest -## @ingroup sys_event -## @{ -## @deprecated Use module `event_thread` instead (see @ref event/thread.h); -## Will be removed after 2021.10 release. -PSEUDOMODULES += event_thread_lowest -## @} PSEUDOMODULES += event_timeout PSEUDOMODULES += event_timeout_ztimer PSEUDOMODULES += evtimer_mbox diff --git a/sys/include/event/thread.h b/sys/include/event/thread.h index 2ce26e44b4..82ea171161 100644 --- a/sys/include/event/thread.h +++ b/sys/include/event/thread.h @@ -42,9 +42,6 @@ * event queue gets its own thread. So higher priority events will always * preempt events of lower priority in this case. * - * Finally, the module [event_thread_lowest](@ref sys_event_thread_lowest) is - * provided for backward compatibility and has no effect. - * * @{ * * @file