Cleanup some unused functionality from app/util/util.cpp (project-c…

…hip#32382) * Remove unused zclClusterNames method and usage. Intent is to make util.cpp less dependent on generated code * Remove one more undefined and never used definition
erwinpan1 · Mar 1, 2024 · a986606 · a986606
1 parent 42727b1
commit a986606
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 999 deletions.
diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json
@@ -45,11 +45,6 @@
             "name": "ZCL callback header",
             "output": "callback.h"
         },
-        {
-            "path": "../../zap-templates/templates/app/print-cluster.zapt",
-            "name": "ZCL print-cluster header",
-            "output": "print-cluster.h"
-        },
         {
             "path": "../../zap-templates/templates/app/attributes/Accessors.zapt",
             "name": "Attributes Accessors header",

diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
@@ -20,7 +20,6 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app-common/zap-generated/print-cluster.h>
 #include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <app/util/config.h>
@@ -41,23 +40,6 @@ using namespace chip;
 
 using chip::Protocols::InteractionModel::Status;
 
-//------------------------------------------------------------------------------
-// Forward Declarations
-
-//------------------------------------------------------------------------------
-// Globals
-
-const EmberAfClusterName zclClusterNames[] = {
-    CLUSTER_IDS_TO_NAMES            // defined in print-cluster.h
-    { kInvalidClusterId, nullptr }, // terminator
-};
-
-#ifdef MATTER_DM_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS
-MATTER_DM_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS
-#endif
-
-//------------------------------------------------------------------------------
-
 // Is the device identifying?
 bool emberAfIsDeviceIdentifying(EndpointId endpoint)
 {
@@ -174,25 +156,6 @@ void MatterPowerTopologyPluginServerInitCallback() {}
 void MatterElectricalEnergyMeasurementPluginServerInitCallback() {}
 void MatterElectricalPowerMeasurementPluginServerInitCallback() {}
 
-// ****************************************
-// Print out information about each cluster
-// ****************************************
-
-uint16_t emberAfFindClusterNameIndex(ClusterId cluster)
-{
-    static_assert(sizeof(ClusterId) == 4, "May need to adjust our index type or somehow define it in terms of cluster id type");
-    uint16_t index = 0;
-    while (zclClusterNames[index].id != kInvalidClusterId)
-    {
-        if (zclClusterNames[index].id == cluster)
-        {
-            return index;
-        }
-        index++;
-    }
-    return 0xFFFF;
-}
-
 #if (CHIP_CONFIG_BIG_ENDIAN_TARGET)
 #define EM_BIG_ENDIAN true
 #else

diff --git a/src/app/util/util.h b/src/app/util/util.h
@@ -22,17 +22,7 @@
 #include <app/util/af-types.h>
 #include <app/util/endpoint-config-api.h>
 
-// Cluster name structure
-typedef struct
-{
-    chip::ClusterId id;
-    const char * name;
-} EmberAfClusterName;
-
-extern const EmberAfClusterName zclClusterNames[];
-
 void emberAfInit();
-uint16_t emberAfFindClusterNameIndex(chip::ClusterId cluster);
 
 /**
  * Retrieves the difference between the two passed values.

diff --git a/src/app/zap-templates/templates/app/print-cluster.zapt b/src/app/zap-templates/templates/app/print-cluster.zapt