From 6169268a3580c9fd249e1ece53aca7a8119e0af0 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Tue, 11 Oct 2022 19:15:03 +0530 Subject: [PATCH] Removed few unused config options (#23086) * Removing the unused config options for ESP32 - MAX_SESSION_KEYS - DISABLE_PROVISIONING_AUTH - SERVICE_DIRECTORY_CACHE_SIZE - EVENT_LOGGING_PROD_BUFFER_SIZE * Remove unused config option CHIP_DEVICE_CONFIG_ENABLE_TRAIT_MANAGER --- config/esp32/components/chip/Kconfig | 47 ------------------- src/include/platform/CHIPDeviceConfig.h | 13 ----- src/platform/ESP32/CHIPDevicePlatformConfig.h | 1 - src/platform/ESP32/CHIPPlatformConfig.h | 1 - 4 files changed, 62 deletions(-) diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig index 3ce6c9cf014bd6..1a637694d36b12 100644 --- a/config/esp32/components/chip/Kconfig +++ b/config/esp32/components/chip/Kconfig @@ -175,13 +175,6 @@ menu "CHIP Core" menu "Security Options" - config MAX_SESSION_KEYS - int "Max Session Keys" - range 0 65535 - default 8 - help - The maximum number of simultaneously active session keys. - menu "Debugging" config SECURITY_TEST_MODE @@ -193,17 +186,6 @@ menu "CHIP Core" WARNING: This option makes it possible to circumvent basic CHIP security functionality, including message encryption. Because of this it SHOULD NEVER BE ENABLED IN PRODUCTION BUILDS. - config DISABLE_PROVISIONING_AUTH - bool "Disable Provisioning Authentication Checks" - default n - help - Disable authentication checks for CHIP provisioning operations. This makes it possible to - perform device provisioning operations (e.g. adding a network or joining a fabric) without - establishing a secure session. - - WARNING: This option makes it possible to circumvent basic CHIP security functionality. - Because of this it SHOULD NEVER BE ENABLED IN PRODUCTION BUILDS. - endmenu # "Debugging" endmenu # "Security Options" @@ -245,14 +227,6 @@ menu "CHIP Device Layer" default 25 help The maximum number of events that can be held in the CHIP Platform event queue. - - config SERVICE_DIRECTORY_CACHE_SIZE - int "CHIP Service Directory Cache Size" - range 0 65535 - default 512 - help - The size (in bytes) of the service directory cache. This limits the maximum size of the directory - that can be returned in response to a service directory query. config ENABLE_EXTENDED_DISCOVERY bool "Enable Extended discovery Support" @@ -570,18 +544,6 @@ menu "CHIP Device Layer" endmenu - menu "CHIP Trait Manager" - - config ENABLE_TRAIT_MANAGER - bool "Enable Trait Manager" - default y - help - Enable support for the CHIP Trait Manager. - - The Trait Manager is an experimental feature of the CHIP Device Layer. - - endmenu - menu "Time Sync Options" config ENABLE_SERVICE_DIRECTORY_TIME_SYNC @@ -811,15 +773,6 @@ menu "CHIP Device Layer" This critical production event buffer must exist. - config EVENT_LOGGING_PROD_BUFFER_SIZE - int "Event Logging Production Buffer Size" - range 0 65535 - default 2048 - help - A size, in bytes, of the individual production event logging buffer. - - This critical production event buffer must exist. - config EVENT_LOGGING_INFO_BUFFER_SIZE int "Event Logging Info Buffer Size" range 0 65535 diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h index 2457f573ba122d..f0e6f92fdce9fb 100644 --- a/src/include/platform/CHIPDeviceConfig.h +++ b/src/include/platform/CHIPDeviceConfig.h @@ -791,19 +791,6 @@ #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT 0 #endif -// -------------------- Trait Manager Configuration -------------------- - -/** - * CHIP_DEVICE_CONFIG_ENABLE_TRAIT_MANAGER - * - * Enable or disable the chip Trait Manager. - * - * NOTE: The Trait Manager is an experimental feature of the chip Device Layer. - */ -#ifndef CHIP_DEVICE_CONFIG_ENABLE_TRAIT_MANAGER -#define CHIP_DEVICE_CONFIG_ENABLE_TRAIT_MANAGER 0 -#endif - // -------------------- Network Telemetry Configuration -------------------- /** diff --git a/src/platform/ESP32/CHIPDevicePlatformConfig.h b/src/platform/ESP32/CHIPDevicePlatformConfig.h index f39255bf815920..e67623ad959e49 100644 --- a/src/platform/ESP32/CHIPDevicePlatformConfig.h +++ b/src/platform/ESP32/CHIPDevicePlatformConfig.h @@ -90,7 +90,6 @@ #define CHIP_DEVICE_CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT CONFIG_SERVICE_PROVISIONING_REQUEST_TIMEOUT #define CHIP_DEVICE_CONFIG_ENABLE_TEST_SETUP_PARAMS CONFIG_ENABLE_TEST_SETUP_PARAMS #define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_USE_TEST_SERIAL_NUMBER -#define CHIP_DEVICE_CONFIG_ENABLE_TRAIT_MANAGER CONFIG_ENABLE_TRAIT_MANAGER #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY CONFIG_ENABLE_THREAD_TELEMETRY #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL CONFIG_ENABLE_THREAD_TELEMETRY_FULL #define CHIP_DEVICE_CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE diff --git a/src/platform/ESP32/CHIPPlatformConfig.h b/src/platform/ESP32/CHIPPlatformConfig.h index f401e6f1200f35..e413858beed6c8 100644 --- a/src/platform/ESP32/CHIPPlatformConfig.h +++ b/src/platform/ESP32/CHIPPlatformConfig.h @@ -53,7 +53,6 @@ #define CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS #define CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS CONFIG_MAX_EXCHANGE_CONTEXTS -#define CHIP_CONFIG_MAX_SESSION_KEYS CONFIG_MAX_SESSION_KEYS #define CHIP_CONFIG_MAX_FABRICS CONFIG_MAX_FABRICS #define CHIP_CONFIG_SECURITY_TEST_MODE CONFIG_SECURITY_TEST_MODE