From ff372536bb496da02eedf46971cb8abe58cc3ef3 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sat, 11 Dec 2021 12:54:50 +0100 Subject: [PATCH 01/14] pkg/driver_atwinc15x0: fix dependendies The package is a helper package required for the `atwinc15x0` driver module and cannot be used standalone. Therefore it should depend on the `atwinc15x0` driver module and only be visible and force selected when the `atwinc15x0` driver module is used. The dependencies of `periph_*` are ensured by the `atwinc15x0` driver module. --- pkg/driver_atwinc15x0/Kconfig | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/driver_atwinc15x0/Kconfig b/pkg/driver_atwinc15x0/Kconfig index e4ebe1e4fe8f..9e9f0ec0ffe8 100644 --- a/pkg/driver_atwinc15x0/Kconfig +++ b/pkg/driver_atwinc15x0/Kconfig @@ -8,12 +8,7 @@ config PACKAGE_DRIVER_ATWINC15X0 bool "ATWINC15x0 WiFi driver package" depends on TEST_KCONFIG - depends on HAS_PERIPH_SPI - depends on HAS_PERIPH_GPIO - depends on HAS_PERIPH_GPIO_IRQ - select MODULE_PERIPH_SPI - select MODULE_PERIPH_GPIO - select MODULE_PERIPH_GPIO_IRQ + depends on MODULE_ATWINC15X0 select MODULE_DRIVER_ATWINC15X0 select MODULE_DRIVER_ATWINC15X0_COMMON select MODULE_DRIVER_ATWINC15X0_SPI_FLASH @@ -30,3 +25,4 @@ config MODULE_DRIVER_ATWINC15X0_COMMON config MODULE_DRIVER_ATWINC15X0_SPI_FLASH bool + depends on TEST_KCONFIG From 503c94a9583a57bdad0451dacaf42887085ac893 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sat, 11 Dec 2021 12:55:28 +0100 Subject: [PATCH 02/14] drivers/atwinc15x0: add Kconfig --- drivers/Kconfig.net | 1 + drivers/atwinc15x0/Kconfig | 35 +++++++++++++++++++ .../atwinc15x0/include/atwinc15x0_params.h | 16 ++++++--- 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 drivers/atwinc15x0/Kconfig diff --git a/drivers/Kconfig.net b/drivers/Kconfig.net index 063412226748..452a579c512a 100644 --- a/drivers/Kconfig.net +++ b/drivers/Kconfig.net @@ -7,6 +7,7 @@ menu "Network Device Drivers" rsource "at86rf215/Kconfig" rsource "ata8520e/Kconfig" +rsource "atwinc15x0/Kconfig" rsource "can_trx/Kconfig" rsource "cc110x/Kconfig" rsource "$(RIOTCPU)/cc2538/radio/Kconfig" diff --git a/drivers/atwinc15x0/Kconfig b/drivers/atwinc15x0/Kconfig new file mode 100644 index 000000000000..fc1cb5f4fba6 --- /dev/null +++ b/drivers/atwinc15x0/Kconfig @@ -0,0 +1,35 @@ +# Copyright (c) 2020 HAW Hamburg +# +# 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_ATWINC15X0 + bool "ATWINC15x0 WiFi module" + depends on HAS_PERIPH_GPIO + depends on HAS_PERIPH_GPIO_IRQ + depends on HAS_PERIPH_SPI + depends on TEST_KCONFIG + select PACKAGE_DRIVER_ATWINC15X0 + select MODULE_PERIPH_GPIO + select MODULE_PERIPH_GPIO_IRQ + select MODULE_PERIPH_SPI + select MODULE_NETDEV_ETH + select MODULE_ZTIMER_MSEC + +if MODULE_ATWINC15X0 + +config WIFI_SSID + string "WiFi SSID" + default "my_ssid" + help + SSID of the AP to be used. + +config WIFI_PASS + string "WiFi passphrase" + default "my_pass" + help + Passphrase used for the AP as clear text (max. 64 chars). + +endif # MODULE_ATWINC15X0 diff --git a/drivers/atwinc15x0/include/atwinc15x0_params.h b/drivers/atwinc15x0/include/atwinc15x0_params.h index 5fa220a45f94..c178e888f669 100644 --- a/drivers/atwinc15x0/include/atwinc15x0_params.h +++ b/drivers/atwinc15x0/include/atwinc15x0_params.h @@ -29,15 +29,23 @@ extern "C" { * @brief SSID of the AP to be used. */ #ifndef WIFI_SSID +#ifdef CONFIG_WIFI_SSID +#define WIFI_SSID CONFIG_WIFI_SSID +#else /* CONFIG_WIFI_SSID */ #define WIFI_SSID "RIOT_AP" -#endif +#endif /* CONFIG_WIFI_SSID */ +#endif /* WIFI_SSID */ /** * @brief Passphrase used for the AP as clear text (max. 64 chars). */ -#ifdef DOXYGEN -#define WIFI_PASS "ThisistheRIOTporttoESP" -#endif +#ifndef WIFI_PASS +#ifdef CONFIG_WIFI_PATH +#define WIFI_PASS CONFIG_WIFI_PATH +#else /* CONFIG_WIFI_PATH */ +#define WIFI_PASS "This is RIOT-OS" +#endif /* CONFIG_WIFI_PATH */ +#endif /* WIFI_PASS */ /** * @name Set default configuration parameters From 6befb7dc5b6c69ffb03c4ceca982c44ae374b3aa Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sat, 11 Dec 2021 14:33:15 +0100 Subject: [PATCH 03/14] tests/driver_netdev_common: add Kconfig tmp --- tests/driver_netdev_common/Kconfig | 14 ++++++++++ tests/driver_netdev_common/Kconfig.netdev | 31 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 tests/driver_netdev_common/Kconfig create mode 100644 tests/driver_netdev_common/Kconfig.netdev diff --git a/tests/driver_netdev_common/Kconfig b/tests/driver_netdev_common/Kconfig new file mode 100644 index 000000000000..cace9d856588 --- /dev/null +++ b/tests/driver_netdev_common/Kconfig @@ -0,0 +1,14 @@ +# Copyright (c) 2021 Gunar Schorcht +# +# 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 APPLICATION + bool + default y + select DRIVER_NETDEV_COMMON + depends on TEST_KCONFIG + +rsource "Kconfig.netdev" diff --git a/tests/driver_netdev_common/Kconfig.netdev b/tests/driver_netdev_common/Kconfig.netdev new file mode 100644 index 000000000000..039ea12c71a0 --- /dev/null +++ b/tests/driver_netdev_common/Kconfig.netdev @@ -0,0 +1,31 @@ +# Copyright (c) 2021 Gunar Schorcht +# +# 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 DRIVER_NETDEV_COMMON + bool + default y + + imply MODULE_NETDEV_DEFAULT + + # Modules to include: + imply MODULE_SHELL + imply MODULE_SHELL_COMMANDS + imply MODULE_PS + + # gnrc is a meta module including all required, basic gnrc networking modules + imply MODULE_GNRC + + # automatically initialize the network interface + imply MODULE_AUTO_INIT_GNRC_NETIF + + # shell command to send L2 packets with a simple string + imply MODULE_GNRC_TXTSND + + # the application dumps received packets to stdout + select MODULE_GNRC_PKTDUMP + + # TODO: parameters defined in default-radio-settings.inc.mk From 047c60a6ddddd94917c554896e1639214973f2da Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sat, 11 Dec 2021 14:45:24 +0100 Subject: [PATCH 04/14] tests/driver_atwinc15x0: add Kconfig --- tests/driver_atwinc15x0/Kconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tests/driver_atwinc15x0/Kconfig diff --git a/tests/driver_atwinc15x0/Kconfig b/tests/driver_atwinc15x0/Kconfig new file mode 100644 index 000000000000..a20fa55a61fb --- /dev/null +++ b/tests/driver_atwinc15x0/Kconfig @@ -0,0 +1,15 @@ +# Copyright (c) 2021 Gunar Schorcht +# +# 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 APPLICATION + bool + default y + imply MODULE_ATWINC15X0 + imply DRIVER_NETDEV_COMMON + depends on TEST_KCONFIG + +rsource "../driver_netdev_common/Kconfig.netdev" From 14a3792ba5a7b4ade24133748ab07856ccaf1dba Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sun, 12 Dec 2021 12:32:17 +0100 Subject: [PATCH 05/14] fixup! drivers/atwinc15x0: add Kconfig --- pkg/driver_atwinc15x0/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/driver_atwinc15x0/Kconfig b/pkg/driver_atwinc15x0/Kconfig index 9e9f0ec0ffe8..c06d5e57470d 100644 --- a/pkg/driver_atwinc15x0/Kconfig +++ b/pkg/driver_atwinc15x0/Kconfig @@ -6,7 +6,7 @@ # config PACKAGE_DRIVER_ATWINC15X0 - bool "ATWINC15x0 WiFi driver package" + bool depends on TEST_KCONFIG depends on MODULE_ATWINC15X0 select MODULE_DRIVER_ATWINC15X0 @@ -14,6 +14,7 @@ config PACKAGE_DRIVER_ATWINC15X0 select MODULE_DRIVER_ATWINC15X0_SPI_FLASH help ATWINC15x0 WiFi vendor driver from the Arduino WiFi101 library. + This is needed by the RIOT ATWINC15x0 driver. config MODULE_DRIVER_ATWINC15X0 bool From e21f57578e6c1305592cbb435d37867437767a48 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sun, 12 Dec 2021 12:42:00 +0100 Subject: [PATCH 06/14] fixup! drivers/atwinc15x0: add Kconfig --- drivers/atwinc15x0/Kconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/atwinc15x0/Kconfig b/drivers/atwinc15x0/Kconfig index fc1cb5f4fba6..c61740859100 100644 --- a/drivers/atwinc15x0/Kconfig +++ b/drivers/atwinc15x0/Kconfig @@ -5,8 +5,10 @@ # directory for more details. # -config MODULE_ATWINC15X0 - bool "ATWINC15x0 WiFi module" +menuconfig MODULE_ATWINC15X0 + bool + prompt "ATWINC15x0 WiFi module" if !(MODULE_NETDEV_DEFAULT && HAVE_ATWINC15X0) + default (MODULE_NETDEV_DEFAULT && HAVE_ATWINC15X0) depends on HAS_PERIPH_GPIO depends on HAS_PERIPH_GPIO_IRQ depends on HAS_PERIPH_SPI @@ -33,3 +35,9 @@ config WIFI_PASS Passphrase used for the AP as clear text (max. 64 chars). endif # MODULE_ATWINC15X0 + +config HAVE_ATWINC15X0 + bool + help + Indicates that a ATWINC15x0 module is present. + From 40916114e4e6bdc03cb0a3477c4064e9c70140ed Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sun, 12 Dec 2021 13:03:34 +0100 Subject: [PATCH 07/14] fixup! drivers/atwinc15x0: add Kconfig --- drivers/atwinc15x0/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/atwinc15x0/Kconfig b/drivers/atwinc15x0/Kconfig index c61740859100..cd4b335a83ae 100644 --- a/drivers/atwinc15x0/Kconfig +++ b/drivers/atwinc15x0/Kconfig @@ -19,6 +19,10 @@ menuconfig MODULE_ATWINC15X0 select MODULE_PERIPH_SPI select MODULE_NETDEV_ETH select MODULE_ZTIMER_MSEC + help + This netdev device driver is used for the Microchip ATWINC15x0 + WiFi module. The ATWINC15x0 WiFi module is widely used as WiFi + interface on various boards and extension boards. if MODULE_ATWINC15X0 From 57fc6f8d2ef589c4af56bd37da4447ad44179e71 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Fri, 24 Dec 2021 07:29:44 +0100 Subject: [PATCH 08/14] fixup! drivers/atwinc15x0: add Kconfig --- drivers/atwinc15x0/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/atwinc15x0/Kconfig b/drivers/atwinc15x0/Kconfig index cd4b335a83ae..a1f758b35980 100644 --- a/drivers/atwinc15x0/Kconfig +++ b/drivers/atwinc15x0/Kconfig @@ -8,7 +8,7 @@ menuconfig MODULE_ATWINC15X0 bool prompt "ATWINC15x0 WiFi module" if !(MODULE_NETDEV_DEFAULT && HAVE_ATWINC15X0) - default (MODULE_NETDEV_DEFAULT && HAVE_ATWINC15X0) + default y if (MODULE_NETDEV_DEFAULT && HAVE_ATWINC15X0) depends on HAS_PERIPH_GPIO depends on HAS_PERIPH_GPIO_IRQ depends on HAS_PERIPH_SPI From 9c4ee958c67065851388c41351e27b6511361927 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Fri, 24 Dec 2021 08:30:11 +0100 Subject: [PATCH 09/14] fixup! tests/driver_netdev_common: add Kconfig --- tests/driver_netdev_common/Kconfig | 25 +++++++++++++---- tests/driver_netdev_common/Kconfig.netdev | 31 ---------------------- tests/driver_netdev_common/app.config.test | 4 +++ 3 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 tests/driver_netdev_common/Kconfig.netdev create mode 100644 tests/driver_netdev_common/app.config.test diff --git a/tests/driver_netdev_common/Kconfig b/tests/driver_netdev_common/Kconfig index cace9d856588..3cef93501d0d 100644 --- a/tests/driver_netdev_common/Kconfig +++ b/tests/driver_netdev_common/Kconfig @@ -5,10 +5,25 @@ # directory for more details. # -config APPLICATION +config DRIVER_NETDEV_COMMON bool - default y - select DRIVER_NETDEV_COMMON - depends on TEST_KCONFIG + default y if TEST_KCONFIG -rsource "Kconfig.netdev" + # Modules to include: + select MODULE_SHELL + select MODULE_SHELL_COMMANDS + select MODULE_PS + + # gnrc is a meta module including all required, basic gnrc networking modules + select MODULE_GNRC + + # automatically initialize the network interface + select MODULE_AUTO_INIT_GNRC_NETIF + + # shell command to send L2 packets with a simple string + select MODULE_GNRC_TXTSND + + # the application dumps received packets to stdout + select MODULE_GNRC_PKTDUMP + + # TODO: parameters defined in default-radio-settings.inc.mk diff --git a/tests/driver_netdev_common/Kconfig.netdev b/tests/driver_netdev_common/Kconfig.netdev deleted file mode 100644 index 039ea12c71a0..000000000000 --- a/tests/driver_netdev_common/Kconfig.netdev +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2021 Gunar Schorcht -# -# 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 DRIVER_NETDEV_COMMON - bool - default y - - imply MODULE_NETDEV_DEFAULT - - # Modules to include: - imply MODULE_SHELL - imply MODULE_SHELL_COMMANDS - imply MODULE_PS - - # gnrc is a meta module including all required, basic gnrc networking modules - imply MODULE_GNRC - - # automatically initialize the network interface - imply MODULE_AUTO_INIT_GNRC_NETIF - - # shell command to send L2 packets with a simple string - imply MODULE_GNRC_TXTSND - - # the application dumps received packets to stdout - select MODULE_GNRC_PKTDUMP - - # TODO: parameters defined in default-radio-settings.inc.mk diff --git a/tests/driver_netdev_common/app.config.test b/tests/driver_netdev_common/app.config.test new file mode 100644 index 000000000000..55c768537e92 --- /dev/null +++ b/tests/driver_netdev_common/app.config.test @@ -0,0 +1,4 @@ +# this file enables modules defined in Kconfig. Do not use this file for +# application configuration. This is only needed during migration. +CONFIG_MODULE_NETDEV_DEFAULT=y +CONFIG_DRIVER_NETDEV_COMMON=y From bac0efb6ff74f3dbba38c235090ae16a9f6875f7 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Fri, 24 Dec 2021 08:31:40 +0100 Subject: [PATCH 10/14] fixup! tests/driver_atwinc15x0: add Kconfig --- tests/driver_atwinc15x0/Kconfig | 9 +-------- tests/driver_atwinc15x0/app.config.test | 4 ++++ 2 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 tests/driver_atwinc15x0/app.config.test diff --git a/tests/driver_atwinc15x0/Kconfig b/tests/driver_atwinc15x0/Kconfig index a20fa55a61fb..f5817f909f2b 100644 --- a/tests/driver_atwinc15x0/Kconfig +++ b/tests/driver_atwinc15x0/Kconfig @@ -5,11 +5,4 @@ # directory for more details. # -config APPLICATION - bool - default y - imply MODULE_ATWINC15X0 - imply DRIVER_NETDEV_COMMON - depends on TEST_KCONFIG - -rsource "../driver_netdev_common/Kconfig.netdev" +rsource "../driver_netdev_common/Kconfig" diff --git a/tests/driver_atwinc15x0/app.config.test b/tests/driver_atwinc15x0/app.config.test new file mode 100644 index 000000000000..674b7bae6248 --- /dev/null +++ b/tests/driver_atwinc15x0/app.config.test @@ -0,0 +1,4 @@ +# this file enables modules defined in Kconfig. Do not use this file for +# application configuration. This is only needed during migration. +CONFIG_DRIVER_NETDEV_COMMON=y +CONFIG_MODULE_ATWINC15X0=y From de96ed6bb5abd9fc4449b6869683197457f599a9 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 27 Dec 2021 07:43:35 +0100 Subject: [PATCH 11/14] fixup! drivers/atwinc15x0: add Kconfig --- drivers/atwinc15x0/Kconfig | 23 ++++++++++++++----- .../atwinc15x0/include/atwinc15x0_params.h | 16 ++++++------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/drivers/atwinc15x0/Kconfig b/drivers/atwinc15x0/Kconfig index a1f758b35980..366b6b036877 100644 --- a/drivers/atwinc15x0/Kconfig +++ b/drivers/atwinc15x0/Kconfig @@ -28,15 +28,26 @@ if MODULE_ATWINC15X0 config WIFI_SSID string "WiFi SSID" - default "my_ssid" + default "RIOT_AP" help - SSID of the AP to be used. + SSID of the AP to be used. The SSID must not contain more + than 32 characters. + +config WIFI_USE_WPA2 + bool "Use WPA2 authentication" + default n + help + Specify whether WPA2 authentication is used to connect to the + AP. If WPA2 authentication is enabled, the passphrase has to be + defined. config WIFI_PASS - string "WiFi passphrase" - default "my_pass" - help - Passphrase used for the AP as clear text (max. 64 chars). + string "Passphrase for WPA2 Personal Mode authentication" + depends on WIFI_USE_WPA2 + default "This is RIOT-OS" + help + The passphrase is defined as a clear text string with a maximum + of 64 characters. It is used for WPA2 personal mode authentication. endif # MODULE_ATWINC15X0 diff --git a/drivers/atwinc15x0/include/atwinc15x0_params.h b/drivers/atwinc15x0/include/atwinc15x0_params.h index c178e888f669..30abd8cc6805 100644 --- a/drivers/atwinc15x0/include/atwinc15x0_params.h +++ b/drivers/atwinc15x0/include/atwinc15x0_params.h @@ -29,23 +29,21 @@ extern "C" { * @brief SSID of the AP to be used. */ #ifndef WIFI_SSID -#ifdef CONFIG_WIFI_SSID -#define WIFI_SSID CONFIG_WIFI_SSID -#else /* CONFIG_WIFI_SSID */ +#ifndef CONFIG_WIFI_SSID #define WIFI_SSID "RIOT_AP" +#else /* CONFIG_WIFI_SSID */ +#define WIFI_SSID CONFIG_WIFI_SSID #endif /* CONFIG_WIFI_SSID */ #endif /* WIFI_SSID */ /** * @brief Passphrase used for the AP as clear text (max. 64 chars). */ -#ifndef WIFI_PASS -#ifdef CONFIG_WIFI_PATH -#define WIFI_PASS CONFIG_WIFI_PATH -#else /* CONFIG_WIFI_PATH */ +#if DOXYGEN #define WIFI_PASS "This is RIOT-OS" -#endif /* CONFIG_WIFI_PATH */ -#endif /* WIFI_PASS */ +#elif defined(CONFIG_WIFI_PASS) +#define WIFI_PASS CONFIG_WIFI_PASS +#endif /** * @name Set default configuration parameters From 29f8ab6c84d078f8ff3cc9dbd761d91172ebb924 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 27 Dec 2021 07:42:26 +0100 Subject: [PATCH 12/14] drivers/atwinc15x0: small doc improvements --- drivers/atwinc15x0/doc.txt | 11 +++++++---- drivers/atwinc15x0/include/atwinc15x0_params.h | 8 ++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/atwinc15x0/doc.txt b/drivers/atwinc15x0/doc.txt index a51ea86894e8..cc359b3493d3 100644 --- a/drivers/atwinc15x0/doc.txt +++ b/drivers/atwinc15x0/doc.txt @@ -156,10 +156,13 @@ Symbol | Default | Description At the moment only WPA2 Personal Mode is supported. The required settings are: -Parameter | Default | Description -:---------|:----------|:------------ -WIFI_SSID | "RIOT_AP" | SSID of the AP to be used. -WIFI_PASS | - | Passphrase used for the AP as clear text (max. 64 chars). +Parameter | Default | Description +:----------|:----------|:------------ +#WIFI_SSID | "RIOT_AP" | SSID of the AP to be used. +#WIFI_PASS | - | Passphrase used for the AP as clear text (max. 64 chars) [1]. + + +1. Leave `WIFI_PASS` undefined to connect to an open WiFi access point. The following example shows the make command with the setting of different GPIOs and the WiFi parameters. ``` diff --git a/drivers/atwinc15x0/include/atwinc15x0_params.h b/drivers/atwinc15x0/include/atwinc15x0_params.h index 30abd8cc6805..f42c750ac0e3 100644 --- a/drivers/atwinc15x0/include/atwinc15x0_params.h +++ b/drivers/atwinc15x0/include/atwinc15x0_params.h @@ -27,6 +27,8 @@ extern "C" { /** * @brief SSID of the AP to be used. + * + * The SSID must not contain more than 32 characters. */ #ifndef WIFI_SSID #ifndef CONFIG_WIFI_SSID @@ -38,6 +40,12 @@ extern "C" { /** * @brief Passphrase used for the AP as clear text (max. 64 chars). + * + * The passphrase is defined as a clear text string with a maximum + * of 64 characters. It is used for WPA2 personal mode authentication. + * + * If passphrase is not defined, an "open" AP without WPA2 authentication is + * used. */ #if DOXYGEN #define WIFI_PASS "This is RIOT-OS" From c533b6c87bace9c7b4a382acb8dec3d010bb5ed0 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Sun, 26 Dec 2021 15:44:59 +0100 Subject: [PATCH 13/14] REMOVEME --- tests/driver_netdev_common/Kconfig | 88 ++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/tests/driver_netdev_common/Kconfig b/tests/driver_netdev_common/Kconfig index 3cef93501d0d..fbc7950b0709 100644 --- a/tests/driver_netdev_common/Kconfig +++ b/tests/driver_netdev_common/Kconfig @@ -27,3 +27,91 @@ config DRIVER_NETDEV_COMMON select MODULE_GNRC_PKTDUMP # TODO: parameters defined in default-radio-settings.inc.mk + +# the following is just for testing and is removed before merge + +config MODULE_NETOPT + bool + +config MODULE_NETDEV + bool + +config MODULE_NETDEV_REGISTER + bool + +config MODULE_NETDEV_ETH + bool + select MODULE_EUI_PROVIDER + select MODULE_NETDEV + select MODULE_NETDEV_REGISTER if !MODULE_GNRC_NETIF_SINGLE + +config MODULE_AUTO_INIT_GNRC_NETIF + bool + +config MODULE_AUTO_INIT_GNRC_PKTBUF + bool + +config MODULE_AUTO_INIT_GNRC_PKTDUMP + bool + +config MODULE_GNRC + bool + select MODULE_GNRC_NETAPI + select MODULE_GNRC_NETIF_ETHERNET if MODULE_NETDEV_ETH + select MODULE_GNRC_NETREG + select MODULE_GNRC_NETIF + select MODULE_GNRC_NETIF_HDR + select MODULE_GNRC_PKTBUF + +config MODULE_GNRC_NETAPI + bool + +config MODULE_GNRC_NETREG + bool + +config MODULE_GNRC_NETIF + bool + select MODULE_NETIF + select MODULE_L2UTIL + select MODULE_FMT + +config MODULE_GNRC_NETIF_ETHERNET + bool + select MODULE_NETIF + +config MODULE_GNRC_NETIF_HDR + bool + +config MODULE_GNRC_NETIF_INIT_DEVS + bool + default y if MODULE_AUTO_INIT_GNRC_NETIF + +config MODULE_GNRC_PKT + bool + +config MODULE_GNRC_PKTBUF + bool + select MODULE_GNRC_PKTBUF_STATIC + select MODULE_AUTO_INIT_GNRC_PKTBUF + select MODULE_GNRC_PKT + +config MODULE_GNRC_PKTBUF_STATIC + bool + +config MODULE_GNRC_PKTDUMP + bool + select MODULE_AUTO_INIT_GNRC_PKTDUMP + select MODULE_OD + select MODULE_GNRC_PKTBUF + +config MODULE_GNRC_TXTSND + bool + +config MODULE_L2UTIL + bool + +config MODULE_NETIF + bool + +config MODULE_OD + bool From ae17fcc77795a1cdfad9a0295d1a9f9fbf8877f4 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Wed, 29 Dec 2021 13:08:47 +0100 Subject: [PATCH 14/14] REMOVEME Just for test compilations in CI. --- cpu/nrf5x_common/radio/Kconfig.nrf5x | 2 +- sys/random/Kconfig | 2 +- tests/driver_netdev_common/Kconfig | 264 ++++++++++++++++++++++++++- 3 files changed, 263 insertions(+), 5 deletions(-) diff --git a/cpu/nrf5x_common/radio/Kconfig.nrf5x b/cpu/nrf5x_common/radio/Kconfig.nrf5x index c98a0059b6d3..c96e474e8639 100644 --- a/cpu/nrf5x_common/radio/Kconfig.nrf5x +++ b/cpu/nrf5x_common/radio/Kconfig.nrf5x @@ -7,7 +7,7 @@ config HAVE_NRF5X_RADIO bool - select NRF5X_RADIO if MODULE_NETDEV_DEFAULT + select NRF5X_RADIO if MODULE_NETDEV_DEFAULT && !PACKAGE_NIMBLE help Indicates that an NRF5X radio is present. diff --git a/sys/random/Kconfig b/sys/random/Kconfig index e076ac161e11..4c905fa35f49 100644 --- a/sys/random/Kconfig +++ b/sys/random/Kconfig @@ -16,7 +16,7 @@ if MODULE_RANDOM choice RANDOM_IMPLEMENTATION bool "PRNG Implementation" depends on TEST_KCONFIG - default MODULE_PRNG_HWRNG if HAS_PERIPH_HWRNG + default MODULE_PRNG_HWRNG if HAS_PERIPH_HWRNG && !MODULE_NETDEV_DEFAULT default MODULE_PRNG_MUSL_LCG menuconfig MODULE_PRNG_FORTUNA diff --git a/tests/driver_netdev_common/Kconfig b/tests/driver_netdev_common/Kconfig index fbc7950b0709..4e82ca32da9e 100644 --- a/tests/driver_netdev_common/Kconfig +++ b/tests/driver_netdev_common/Kconfig @@ -30,20 +30,93 @@ config DRIVER_NETDEV_COMMON # the following is just for testing and is removed before merge +if TEST_KCONFIG + config MODULE_NETOPT bool config MODULE_NETDEV bool + default y if BOARD_ATXMEGA_A1_XPLAINED && MODULE_NETDEV_DEFAULT + default y if BOARD_ATXMEGA_A3BU_XPLAINED && MODULE_NETDEV_DEFAULT + select MODULE_EUI_PROVIDER -config MODULE_NETDEV_REGISTER +config MODULE_NETDEV_ETH bool + default y if HAS_PERIPH_ETH + select MODULE_NATIVE_CLI_EUI_PROVIDER if BOARD_NATIVE + select MODULE_NETDEV + select MODULE_NETDEV_REGISTER if !MODULE_GNRC_NETIF_SINGLE -config MODULE_NETDEV_ETH + select MODULE_STM32_ETH if HAS_PERIPH_ETH && HAS_CPU_STM32 && !MODULE_ATWINC15X0 + select MODULE_SAM0_ETH if HAS_PERIPH_ETH && HAS_CPU_SAMD5X && !MODULE_ATWINC15X0 + +config MODULE_NETDEV_IEEE802154 bool - select MODULE_EUI_PROVIDER select MODULE_NETDEV select MODULE_NETDEV_REGISTER if !MODULE_GNRC_NETIF_SINGLE + select MODULE_RANDOM + +config MODULE_NETDEV_IEEE802154_OQPSK + bool + +config MODULE_NETDEV_IEEE802154_SUBMAC + bool + default y if HAS_RADIO_NRF802154 && MODULE_NETDEV_DEFAULT + default y if MODULE_CC2538_RF && MODULE_NETDEV_DEFAULT + select MODULE_GNRC_NETIF_PKTQ + select MODULE_IEEE802154 + select MODULE_IEEE802154_SUBMAC + select MODULE_NETDEV_IEEE802154 + select NRF5X_RADIO if HAS_RADIO_NRF802154 + +config MODULE_NETDEV_REGISTER + bool + +config MODULE_NETDEV_TAP + bool + default y if BOARD_NATIVE && MODULE_NETDEV_DEFAULT + select MODULE_NETDEV_ETH + select MODULE_IOLIST + +### + +config MODULE_AT86RF212B + bool + default y if BOARD_MULLE && MODULE_NETDEV_DEFAULT + select MODULE_AT86RF2XX + select MODULE_PERIPH_GPIO_IRQ + +config MODULE_AT86RF233 + bool + default y if BOARD_HAMILTON && MODULE_NETDEV_DEFAULT + default y if BOARD_SAMR21_XPRO && MODULE_NETDEV_DEFAULT + select MODULE_AT86RF2XX + select MODULE_PERIPH_GPIO_IRQ + select MODULE_PERIPH_SPI + +config MODULE_AT86RFA1 + bool + default y if HAS_CPU_ATMEGA128RFA1 && MODULE_NETDEV_DEFAULT + select MODULE_AT86RF2XX + +config MODULE_AT86RFR2 + bool + default y if HAS_CPU_ATMEGA256RFR2 && MODULE_NETDEV_DEFAULT + select MODULE_AT86RF2XX + +config MODULE_AT86RF2XX + bool + select MODULE_AUTO_INIT_AT86RF2XX + select MODULE_AUTO_INIT_RANDOM + select MODULE_NETDEV_IEEE802154 + select MODULE_NETDEV_IEEE802154_OQPSK + select MODULE_IEEE802154 + select MODULE_RANDOM + select MODULE_XTIMER + +config MODULE_AUTO_INIT_AT86RF2XX + bool config MODULE_AUTO_INIT_GNRC_NETIF bool @@ -54,10 +127,74 @@ config MODULE_AUTO_INIT_GNRC_PKTBUF config MODULE_AUTO_INIT_GNRC_PKTDUMP bool +config MODULE_CC1100 + bool + default y if BOARD_AVSEXTREM && MODULE_NETDEV_DEFAULT + select MODULE_CC110X + select MODULE_CC110X_868MHZ + select MODULE_NETDEV + +config MODULE_CC110X + bool + select MODULE_CC1XXX_COMMON + select MODULE_PERIPH_GPIO_IRQ + select MODULE_PERIPH_INIT_GPIO_IRQ + select MODULE_PERIPH_INIT_SPI + select MODULE_PERIPH_SPI + select MODULE_XTIMER + +config MODULE_CC110X_868MHZ + bool + +config MODULE_CC1XXX_COMMON + bool + +config MODULE_CC2420 + bool + default y if BOARD_Z1 && MODULE_NETDEV_DEFAULT + select MODULE_IEEE802154 + select MODULE_NETDEV_IEEE802154 + select MODULE_PERIPH_GPIO_IRQ + select MODULE_PERIPH_SPI + select MODULE_PERIPH_TIMER + select MODULE_XTIMER + +config MODULE_ESP_NOW + bool + default y if HAS_ESP_NOW && MODULE_NETDEV_DEFAULT + select MODULE_ESP_IDF_HEAP + select MODULE_ESP_IDF_NVS_FLASH + select MODULE_ESP_IDF_SPI_FLASH + select MODULE_ESP_IDF_WPA_SUPPLICANT_CRYPTO + select MODULE_ESP_IDF_WPA_SUPPLICANT_PORT + select MODULE_ESP_WIFI_ANY + select MODULE_NETDEV + select MODULE_NETOP + select MODULE_MTD + +config MODULE_ESP_IDF_HEAP + bool + +config MODULE_ESP_IDF_NVS_FLASH + bool + +config MODULE_ESP_IDF_SPI_FLASH + bool + +config MODULE_ESP_IDF_WPA_SUPPLICANT_CRYPTO + bool + +config MODULE_ESP_IDF_WPA_SUPPLICANT_PORT + bool + +config MODULE_ESP_WIFI_ANY + bool + config MODULE_GNRC bool select MODULE_GNRC_NETAPI select MODULE_GNRC_NETIF_ETHERNET if MODULE_NETDEV_ETH + select MODULE_GNRC_NETIF_IEEE802154 if MODULE_NETDEV_IEEE802154 select MODULE_GNRC_NETREG select MODULE_GNRC_NETIF select MODULE_GNRC_NETIF_HDR @@ -79,6 +216,10 @@ config MODULE_GNRC_NETIF_ETHERNET bool select MODULE_NETIF +config MODULE_GNRC_NETIF_IEEE802154 + bool + select MODULE_NETIF + config MODULE_GNRC_NETIF_HDR bool @@ -104,14 +245,131 @@ config MODULE_GNRC_PKTDUMP select MODULE_OD select MODULE_GNRC_PKTBUF +config MODULE_GNRC_NETIF_PKTQ + bool + config MODULE_GNRC_TXTSND bool config MODULE_L2UTIL bool +config MODULE_NATIVE_CLI_EUI_PROVIDER + bool + config MODULE_NETIF bool +config MODULE_NIMBLE_NETIF + bool + default y if BOARD_DWM1001 && MODULE_NETDEV_DEFAULT + depends on HAS_BLE_NIMBLE + select MODULE_AUTO_INIT_RANDOM + select MODULE_NETDEV + select PACKAGE_NIMBLE + select MODULE_NIMBLE_CONTROLLER + select MODULE_NIMBLE_DRIVERS_NRF5X if HAS_CPU_NRF52 + select MODULE_NIMBLE_HOST + select MODULE_NIMBLE_NPL_RIOT + select MODULE_NIMBLE_PORTING_NIMBLE + select MODULE_NIMBLE_RIOT_CONTRIB + select MODULE_NIMBLE_SCANLIST + select MODULE_NIMBLE_SCANNER + select MODULE_NIMBLE_TRANSPORT_RAM + select MODULE_RANDOM + +config MODULE_BLUETIL_AD + bool + +config MODULE_BLUETIL_ADDR + bool + +config PACKAGE_NIMBLE + bool "NIMBLE package" + select MODULE_SEMA + select MODULE_EVENT + select MODULE_EVENT_CALLBACK + select MODULE_ZTIMER_MSEC + select MODULE_ZTIMER_PERIPH_TIMER + +config MODULE_NIMBLE_ADDR + bool + select MODULE_BLUETIL_AD + select MODULE_BLUETIL_ADDR + +config MODULE_NIMBLE_CONTROLLER + bool + +config MODULE_NIMBLE_DRIVERS_NRF5X + bool + select MODULE_PERIPH_TIMER + select MODULE_PERIPH_INIT_TIMER + +config MODULE_NIMBLE_HOST + bool + select MODULE_NIMBLE_HOST_STORE_RAM + select MODULE_NIMBLE_HOST_UTIL + select PACKAGE_TINYCRYPT + +config MODULE_NIMBLE_HOST_STORE_RAM + bool + +config MODULE_NIMBLE_HOST_UTIL + bool + +config MODULE_NIMBLE_NPL_RIOT + bool + +config MODULE_NIMBLE_PORTING_NIMBLE + bool + +config MODULE_NIMBLE_RIOT_CONTRIB + bool + +config MODULE_NIMBLE_SCANLIST + bool + select MODULE_NIMBLE_ADDR + select MODULE_BLUETIL_AD + select MODULE_ZTIMER_USEC + +config MODULE_NIMBLE_SCANNER + bool + +config MODULE_NIMBLE_TRANSPORT_RAM + bool + config MODULE_OD bool + +config MODULE_PERIPH_ETH + bool + +config MODULE_PERIPH_ETH_COMMON + bool + +config MODULE_PERIPH_INIT_ETH + bool + +config MODULE_PERIPH_INIT_ETH_COMMON + bool + +config MODULE_SAM0_ETH + bool + select MODULE_IOLIST + select MODULE_NETOPT + select MODULE_PERIPH_ETH if HAS_PERIPH_ETH + select MODULE_PERIPH_ETH_COMMON if HAS_PERIPH_ETH + select MODULE_PERIPH_INIT_ETH if HAS_PERIPH_ETH + select MODULE_PERIPH_INIT_ETH_COMMON if HAS_PERIPH_ETH + +config MODULE_STM32_ETH + bool + select MODULE_IOLIST + select MODULE_PERIPH_ETH if HAS_PERIPH_ETH + select MODULE_PERIPH_ETH_COMMON if HAS_PERIPH_ETH + select MODULE_PERIPH_INIT_ETH if HAS_PERIPH_ETH + select MODULE_PERIPH_INIT_ETH_COMMON if HAS_PERIPH_ETH + select MODULE_ZTIMER + select MODULE_ZTIMER_MSEC + +endif # TEST_KCONFIG