From 23172411c1d119b49e52d9edc780131c5747082b Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 24 Feb 2023 08:51:40 -0500 Subject: [PATCH] Remove unused BLE defines. (#25282) Nothing was checking the values of CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG or CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY. --- .../Darwin/CHIPDevicePlatformConfig.h | 20 ------------------- src/platform/Linux/CHIPDevicePlatformConfig.h | 20 ------------------- .../android/CHIPDevicePlatformConfig.h | 20 ------------------- .../nxp/k32w/k32w0/CHIPDevicePlatformConfig.h | 20 ------------------- src/platform/webos/CHIPDevicePlatformConfig.h | 20 ------------------- 5 files changed, 100 deletions(-) diff --git a/src/platform/Darwin/CHIPDevicePlatformConfig.h b/src/platform/Darwin/CHIPDevicePlatformConfig.h index b25c7afbf7e920..e63a0ac2f8bedc 100644 --- a/src/platform/Darwin/CHIPDevicePlatformConfig.h +++ b/src/platform/Darwin/CHIPDevicePlatformConfig.h @@ -39,26 +39,6 @@ // These are configuration options that are unique to Darwin platforms. // These can be overridden by the application as needed. -/** - * @def CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - * - * The priority of the SoftDevice observer event handler registered by the - * CHIP BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY -#define CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY 3 -#endif // CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - -/** - * @def CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - * - * The SoftDevice BLE connection configuration tag used by the CHIP - * BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG -#define CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG 1 -#endif // CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - // ========== Platform-specific Configuration Overrides ========= #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE diff --git a/src/platform/Linux/CHIPDevicePlatformConfig.h b/src/platform/Linux/CHIPDevicePlatformConfig.h index 05cdd7b983b86f..4e4c8ca0ec7d32 100644 --- a/src/platform/Linux/CHIPDevicePlatformConfig.h +++ b/src/platform/Linux/CHIPDevicePlatformConfig.h @@ -54,26 +54,6 @@ // These are configuration options that are unique to Linux platforms. // These can be overridden by the application as needed. -/** - * @def CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - * - * The priority of the SoftDevice observer event handler registered by the - * CHIP BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY -#define CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY 3 -#endif // CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - -/** - * @def CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - * - * The SoftDevice BLE connection configuration tag used by the CHIP - * BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG -#define CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG 1 -#endif // CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - // ========== Platform-specific Configuration Overrides ========= #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE diff --git a/src/platform/android/CHIPDevicePlatformConfig.h b/src/platform/android/CHIPDevicePlatformConfig.h index a5d8b18a22863f..83822a159183e6 100644 --- a/src/platform/android/CHIPDevicePlatformConfig.h +++ b/src/platform/android/CHIPDevicePlatformConfig.h @@ -48,26 +48,6 @@ // These are configuration options that are unique to Linux platforms. // These can be overridden by the application as needed. -/** - * @def CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - * - * The priority of the SoftDevice observer event handler registered by the - * CHIP BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY -#define CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY 3 -#endif // CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - -/** - * @def CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - * - * The SoftDevice BLE connection configuration tag used by the CHIP - * BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG -#define CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG 1 -#endif // CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - // ========== Platform-specific Configuration Overrides ========= #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE diff --git a/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h b/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h index 99fe94fd38255e..40a345c6249f2c 100644 --- a/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h +++ b/src/platform/nxp/k32w/k32w0/CHIPDevicePlatformConfig.h @@ -42,26 +42,6 @@ // These are configuration options that are unique to the K32W platform. // These can be overridden by the application as needed. -/** - * @def CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - * - * The priority of the SoftDevice observer event handler registered by the - * chip BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY -#define CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY 3 -#endif // CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - -/** - * @def CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - * - * The SoftDevice BLE connection configuration tag used by the chip - * BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG -#define CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG 1 -#endif // CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - #ifndef CHIP_DEVICE_CONFIG_CERTIFICATION_DECLARATION //-> format_version = 1 //-> vendor_id = 0xFFF1 diff --git a/src/platform/webos/CHIPDevicePlatformConfig.h b/src/platform/webos/CHIPDevicePlatformConfig.h index cd5e734c233777..3c699dcc73bd37 100644 --- a/src/platform/webos/CHIPDevicePlatformConfig.h +++ b/src/platform/webos/CHIPDevicePlatformConfig.h @@ -54,26 +54,6 @@ // These are configuration options that are unique to webOS platforms. // These can be overridden by the application as needed. -/** - * @def CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - * - * The priority of the SoftDevice observer event handler registered by the - * CHIP BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY -#define CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY 3 -#endif // CHIP_DEVICE_LAYER_BLE_OBSERVER_PRIORITY - -/** - * @def CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - * - * The SoftDevice BLE connection configuration tag used by the CHIP - * BleLayer. - */ -#ifndef CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG -#define CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG 1 -#endif // CHIP_DEVICE_LAYER_BLE_CONN_CFG_TAG - // ========== Platform-specific Configuration Overrides ========= #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE