Remove EmberAfClusterCommand and a bunch of things it entrained. (#25145

)
project-chip · Jun 29, 2023 · 2902338 · 2902338
1 parent ea35d73
commit 2902338
Show file tree

Hide file tree

Showing 31 changed files with 26 additions and 3,002 deletions.
diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
@@ -24,7 +24,6 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/EventLogging.h>
-#include <app/chip-zcl-zpro-codec.h>
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/reporting/reporting.h>
 #include <app/util/af-types.h>

diff --git a/examples/dynamic-bridge-app/linux/main.cpp b/examples/dynamic-bridge-app/linux/main.cpp
@@ -23,7 +23,6 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/EventLogging.h>
-#include <app/chip-zcl-zpro-codec.h>
 #include <app/reporting/reporting.h>
 #include <app/util/af-types.h>
 #include <app/util/af.h>

diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/IMClusterCommandHandler.cpp
@@ -30,9 +30,6 @@
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/TypeTraits.h>
 
-// Currently we need some work to keep compatible with ember lib.
-#include <app/util/ember-compatibility-functions.h>
-
 namespace chip {
 namespace app {
 
@@ -2052,8 +2049,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj)
 {
-    Compatibility::SetupEmberAfCommandHandler(apCommandObj, aCommandPath);
-
     switch (aCommandPath.mClusterId)
     {
     case Clusters::AdministratorCommissioning::Id:
@@ -2148,8 +2143,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
         apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCluster);
         break;
     }
-
-    Compatibility::ResetEmberAfObjects();
 }
 
 } // namespace app

diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/IMClusterCommandHandler.cpp
@@ -30,9 +30,6 @@
 #include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/TypeTraits.h>
 
-// Currently we need some work to keep compatible with ember lib.
-#include <app/util/ember-compatibility-functions.h>
-
 namespace chip {
 namespace app {
 
@@ -1179,8 +1176,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP
 
 void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj)
 {
-    Compatibility::SetupEmberAfCommandHandler(apCommandObj, aCommandPath);
-
     switch (aCommandPath.mClusterId)
     {
     case Clusters::AdministratorCommissioning::Id:
@@ -1239,8 +1234,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV:
         apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCluster);
         break;
     }
-
-    Compatibility::ResetEmberAfObjects();
 }
 
 } // namespace app

diff --git a/src/app/chip-zcl-zpro-codec.h b/src/app/chip-zcl-zpro-codec.h
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -240,7 +240,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
 #endif // CHIP_CONFIG_ENABLE_SERVER_IM_EVENT
 
     // This initializes clusters, so should come after lower level initialization.
-    InitDataModelHandler(&mExchangeMgr);
+    InitDataModelHandler();
 
 #if defined(CHIP_APP_USE_ECHO)
     err = InitEchoHandler(&mExchangeMgr);

diff --git a/src/app/tests/TestCommissionManager.cpp b/src/app/tests/TestCommissionManager.cpp
@@ -35,7 +35,7 @@ using chip::CommissioningWindowManager;
 using chip::Server;
 
 // Mock function for linking
-void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeMgr) {}
+void InitDataModelHandler() {}
 
 namespace {
 bool sAdminFabricIndexDirty = false;

diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp
@@ -31,11 +31,11 @@
 
 using namespace ::chip;
 
-void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeManager)
+void InitDataModelHandler()
 {
 #ifdef USE_ZAP_CONFIG
     ChipLogProgress(Zcl, "Using ZAP configuration...");
     emberAfEndpointConfigure();
-    emberAfInit(exchangeManager);
+    emberAfInit();
 #endif
 }
diff --git a/src/app/util/DataModelHandler.h b/src/app/util/DataModelHandler.h
@@ -32,4 +32,4 @@
  * data model messages.
  *
  */
-void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeMgr);
+void InitDataModelHandler();