Remove unused CLUSTER_MASK bits. (#25212)

Fixes #24984
project-chip · Feb 5, 2024 · 1274158 · 1274158
1 parent b408d87
commit 1274158
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git 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
@@ -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