From 127415842c421e76424e88ac35f7d5fb6c2e9a63 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 21 Feb 2023 11:03:52 -0500 Subject: [PATCH] Remove unused CLUSTER_MASK bits. (#25212) Fixes https://github.com/project-chip/connectedhomeip/issues/24984 --- src/app/util/attribute-storage.h | 6 ------ src/app/zap-templates/templates/app/att-storage.zapt | 5 +---- .../app-common/app-common/zap-generated/att-storage.h | 5 +---- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h index 7e96265b72d188..423700f3bdf582 100644 --- a/src/app/util/attribute-storage.h +++ b/src/app/util/attribute-storage.h @@ -89,12 +89,6 @@ void emAfCallInits(void); #define emberAfClusterIsClient(cluster) ((bool) (((cluster)->mask & CLUSTER_MASK_CLIENT) != 0)) #define emberAfClusterIsServer(cluster) ((bool) (((cluster)->mask & CLUSTER_MASK_SERVER) != 0)) -#define emberAfDoesClusterHaveInitFunction(cluster) ((bool) (((cluster)->mask & CLUSTER_MASK_INIT_FUNCTION) != 0)) -#define emberAfDoesClusterHaveAttributeChangedFunction(cluster) \ - ((bool) (((cluster)->mask & CLUSTER_MASK_ATTRIBUTE_CHANGED_FUNCTION) != 0)) -#define emberAfDoesClusterHaveDefaultResponseFunction(cluster) \ - ((bool) (((cluster)->mask & CLUSTER_MASK_DEFAULT_RESPONSE_FUNCTION) != 0)) -#define emberAfDoesClusterHaveMessageSentFunction(cluster) ((bool) (((cluster)->mask & CLUSTER_MASK_MESSAGE_SENT_FUNCTION) != 0)) // Initial configuration void emberAfEndpointConfigure(void); diff --git a/src/app/zap-templates/templates/app/att-storage.zapt b/src/app/zap-templates/templates/app/att-storage.zapt index d76a89be323409..a40ab76e0846be 100644 --- a/src/app/zap-templates/templates/app/att-storage.zapt +++ b/src/app/zap-templates/templates/app/att-storage.zapt @@ -9,10 +9,7 @@ #define CLUSTER_MASK_INIT_FUNCTION (0x01) // Does this cluster have attribute changed function? #define CLUSTER_MASK_ATTRIBUTE_CHANGED_FUNCTION (0x02) -// Does this cluster have default response function? -#define CLUSTER_MASK_DEFAULT_RESPONSE_FUNCTION (0x04) -// Does this cluster have message sent function? -#define CLUSTER_MASK_MESSAGE_SENT_FUNCTION (0x08) +// Bits 0x04 and 0x08 are free. // Does this cluster have shutdown function? #define CLUSTER_MASK_SHUTDOWN_FUNCTION (0x10) // Does this cluster have pre-attribute changed function? diff --git a/zzz_generated/app-common/app-common/zap-generated/att-storage.h b/zzz_generated/app-common/app-common/zap-generated/att-storage.h index 0a21cc144e4871..60559813a3fc99 100644 --- a/zzz_generated/app-common/app-common/zap-generated/att-storage.h +++ b/zzz_generated/app-common/app-common/zap-generated/att-storage.h @@ -26,10 +26,7 @@ #define CLUSTER_MASK_INIT_FUNCTION (0x01) // Does this cluster have attribute changed function? #define CLUSTER_MASK_ATTRIBUTE_CHANGED_FUNCTION (0x02) -// Does this cluster have default response function? -#define CLUSTER_MASK_DEFAULT_RESPONSE_FUNCTION (0x04) -// Does this cluster have message sent function? -#define CLUSTER_MASK_MESSAGE_SENT_FUNCTION (0x08) +// Bits 0x04 and 0x08 are free. // Does this cluster have shutdown function? #define CLUSTER_MASK_SHUTDOWN_FUNCTION (0x10) // Does this cluster have pre-attribute changed function?