Revert "Fix Descriptor cluster when linking statically. (#11392)" (#1…

…1445) This reverts commit abcae0d.
project-chip · Mar 23, 2022 · 3665740 · 3665740
1 parent dbc0344
commit 3665740
Show file tree

Hide file tree

Showing 37 changed files with 327 additions and 306 deletions.
diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -31,7 +31,6 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/reporting"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/administrator-commissioning-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/application-basic-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/test-cluster-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/descriptor"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/on-off-server"
@@ -55,7 +54,6 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/media-playback-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-provider"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/target-navigator-server"
-                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-server" 
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thread_network_diagnostics_server" 
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/tv-channel-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/scenes"

diff --git a/examples/all-clusters-app/mbed/CMakeLists.txt b/examples/all-clusters-app/mbed/CMakeLists.txt
@@ -84,7 +84,6 @@ target_sources(${APP_TARGET} PRIVATE
                ${APP_UTIL}/util.cpp
                ${APP_UTIL}/error-mapping.cpp
 
-               ${APP_CLUSTERS}/application-basic-server/application-basic-server.cpp
                ${APP_CLUSTERS}/basic/basic.cpp
                ${APP_CLUSTERS}/bindings/bindings.cpp
                ${APP_CLUSTERS}/on-off-server/on-off-server.cpp
@@ -117,7 +116,6 @@ target_sources(${APP_TARGET} PRIVATE
                ${APP_CLUSTERS}/ota-provider/ota-provider.cpp
                ${APP_CLUSTERS}/scenes/scenes.cpp
                ${APP_CLUSTERS}/target-navigator-server/target-navigator-server.cpp
-               ${APP_CLUSTERS}/thermostat-server/thermostat-server.cpp
                ${APP_CLUSTERS}/tv-channel-server/tv-channel-server.cpp
                ${APP_CLUSTERS}/operational-credentials-server/operational-credentials-server.cpp
                ${APP_CLUSTERS}/test-cluster-server/test-cluster-server.cpp

diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp
@@ -79,5 +79,3 @@ bool emberAfAccountLoginClusterLoginCallback(app::CommandHandler * command, cons
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterAccountLoginPluginServerInitCallback() {}
diff --git a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
@@ -114,5 +114,3 @@ bool emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(
     emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
     return true;
 }
-
-void MatterAdministratorCommissioningPluginServerInitCallback() {}
diff --git a/src/app/clusters/application-basic-server/application-basic-server.cpp b/src/app/clusters/application-basic-server/application-basic-server.cpp
@@ -46,5 +46,3 @@ bool emberAfApplicationBasicClusterChangeStatusCallback(app::CommandHandler * co
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterApplicationBasicPluginServerInitCallback() {}
diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
@@ -85,5 +85,3 @@ bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * co
     sendResponse(command, response);
     return true;
 }
-
-void MatterApplicationLauncherPluginServerInitCallback() {}
diff --git a/src/app/clusters/audio-output-server/audio-output-server.cpp b/src/app/clusters/audio-output-server/audio-output-server.cpp
@@ -55,5 +55,3 @@ bool emberAfAudioOutputClusterSelectOutputCallback(app::CommandHandler * command
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterAudioOutputPluginServerInitCallback() {}
diff --git a/src/app/clusters/barrier-control-server/barrier-control-server.cpp b/src/app/clusters/barrier-control-server/barrier-control-server.cpp
@@ -347,5 +347,3 @@ bool emberAfBarrierControlClusterBarrierControlStopCallback(app::CommandHandler
     sendDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
     return true;
 }
-
-void MatterBarrierControlPluginServerInitCallback() {}
diff --git a/src/app/clusters/basic/basic.cpp b/src/app/clusters/basic/basic.cpp
@@ -91,5 +91,3 @@ void emberAfBasicClusterServerInitCallback(chip::EndpointId endpoint)
         VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(Zcl, "Error setting Software Version: 0x%02x", status));
     }
 }
-
-void MatterBasicPluginServerInitCallback() {}
diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp
@@ -154,5 +154,3 @@ bool emberAfBindingClusterUnbindCallback(app::CommandHandler * commandObj, const
     emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
     return true;
 }
-
-void MatterBindingPluginServerInitCallback() {}
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -2585,5 +2585,3 @@ void emberAfPluginColorControlServerHueSatTransitionEventHandler(EndpointId endp
     ColorControlServer::Instance().updateHueSatCommand(endpoint);
 }
 #endif // EMBER_AF_PLUGIN_COLOR_CONTROL_SERVER_HSV
-
-void MatterColorControlPluginServerInitCallback() {}
diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp
@@ -56,5 +56,3 @@ bool emberAfContentLauncherClusterLaunchURLCallback(app::CommandHandler * comman
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterContentLauncherPluginServerInitCallback() {}
diff --git a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
@@ -31,5 +31,3 @@ bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(app::CommandHandler
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterDiagnosticLogsPluginServerInitCallback() {}
diff --git a/src/app/clusters/door-lock-server/door-lock-server-core.cpp b/src/app/clusters/door-lock-server/door-lock-server-core.cpp
@@ -137,5 +137,3 @@ EmberAfStatus emAfPluginDoorLockServerNoteDoorStateChanged(EmberAfDoorState stat
 
     return status;
 }
-
-void MatterDoorLockPluginServerInitCallback() {}
diff --git a/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp b/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp
@@ -144,7 +144,7 @@ bool emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(app::CommandHan
     return true;
 }
 
-void MatterEthernetNetworkDiagnosticsPluginServerInitCallback()
+void MatterEthernetNetworkDiagnosticsClusterServerInitCallback()
 {
     registerAttributeAccessOverride(&gAttrAccess);
 }
diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
@@ -69,5 +69,3 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(app::CommandH
 
     return true;
 }
-
-void MatterGeneralCommissioningPluginServerInitCallback() {}
diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
@@ -533,5 +533,3 @@ bool emberAfPluginGroupsServerGroupNamesSupportedCallback(EndpointId endpoint)
 }
 
 void emberAfPluginGroupsServerSetGroupNameCallback(EndpointId endpoint, GroupId groupId, const CharSpan & groupName) {}
-
-void MatterGroupsPluginServerInitCallback() {}
diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.cpp b/src/app/clusters/ias-zone-server/ias-zone-server.cpp
@@ -924,5 +924,3 @@ uint16_t computeElapsedTimeQs(IasZoneStatusQueueEntry * entry)
     return deltaTimeMs / MILLISECOND_TICKS_PER_QUARTERSECOND;
 }
 #endif
-
-void MatterIasZonePluginServerInitCallback() {}
diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
@@ -331,5 +331,3 @@ Identify::~Identify()
 {
     unreg(this);
 }
-
-void MatterIdentifyPluginServerInitCallback() {}
diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
@@ -65,5 +65,3 @@ bool emberAfKeypadInputClusterSendKeyCallback(app::CommandHandler * command, con
     sendResponse(command, status);
     return true;
 }
-
-void MatterKeypadInputPluginServerInitCallback() {}
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
@@ -1053,5 +1053,3 @@ static bool areStartUpLevelControlServerAttributesTokenized(EndpointId endpoint)
 #endif
 
 void emberAfPluginLevelControlClusterServerPostInitCallback(EndpointId endpoint) {}
-
-void MatterLevelControlPluginServerInitCallback() {}
diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp
@@ -40,5 +40,3 @@ bool emberAfLowPowerClusterSleepCallback(app::CommandHandler * command, const ap
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterLowPowerPluginServerInitCallback() {}
diff --git a/src/app/clusters/media-input-server/media-input-server.cpp b/src/app/clusters/media-input-server/media-input-server.cpp
@@ -92,5 +92,3 @@ bool emberAfMediaInputClusterRenameInputCallback(app::CommandHandler * command,
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterMediaInputPluginServerInitCallback() {}
diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp
@@ -193,5 +193,3 @@ bool emberAfMediaPlaybackClusterMediaStartOverCallback(app::CommandHandler * com
     sendResponse(command, "MediaStartOver", Commands::MediaStartOverResponse::Id, status);
     return true;
 }
-
-void MatterMediaPlaybackPluginServerInitCallback() {}
diff --git a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp
@@ -117,5 +117,3 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(app::CommandHan
 {
     return false;
 }
-
-void MatterNetworkCommissioningPluginServerInitCallback() {}
diff --git a/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp b/src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp
@@ -108,5 +108,3 @@ HalOccupancySensorType __attribute__((weak)) halOccupancyGetSensorType(EndpointI
 {
     return HAL_OCCUPANCY_SENSOR_TYPE_PIR;
 }
-
-void MatterOccupancySensingPluginServerInitCallback() {}
diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -286,5 +286,3 @@ static bool areStartUpOnOffServerAttributesTokenized(EndpointId endpoint)
 #endif
 
 void emberAfPluginOnOffClusterServerPostInitCallback(EndpointId endpoint) {}
-
-void MatterOnOffPluginServerInitCallback() {}
diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp
@@ -253,5 +253,3 @@ void SetDelegate(EndpointId endpoint, OTAProviderDelegate * delegate)
 } // namespace Clusters
 } // namespace app
 } // namespace chip
-
-void MatterOtaSoftwareUpdateProviderPluginServerInitCallback() {}
diff --git a/.../clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp b/.../clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
@@ -35,5 +35,3 @@ void MatterPumpConfigurationAndControlClusterServerAttributeChangedCallback(cons
                         (unsigned int) attributePath.mAttributeId);
     // TODO
 }
-
-void MatterPumpConfigurationAndControlPluginServerInitCallback() {}
diff --git a/src/app/clusters/scenes/scenes.cpp b/src/app/clusters/scenes/scenes.cpp
@@ -1314,5 +1314,3 @@ void emberAfScenesClusterRemoveScenesInGroupCallback(EndpointId endpoint, GroupI
         }
     }
 }
-
-void MatterScenesPluginServerInitCallback() {}
diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
@@ -66,5 +66,3 @@ bool emberAfTargetNavigatorClusterNavigateTargetCallback(app::CommandHandler * c
     sendResponse(command, response);
     return true;
 }
-
-void MatterTargetNavigatorPluginServerInitCallback() {}
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -774,5 +774,3 @@ bool emberAfThermostatClusterSetpointRaiseLowerCallback(app::CommandHandler * co
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterThermostatPluginServerInitCallback() {}
diff --git a/src/app/clusters/tv-channel-server/tv-channel-server.cpp b/src/app/clusters/tv-channel-server/tv-channel-server.cpp
@@ -108,5 +108,3 @@ bool emberAfTvChannelClusterSkipChannelCallback(app::CommandHandler * command, c
     emberAfSendImmediateDefaultResponse(status);
     return true;
 }
-
-void MatterTvChannelPluginServerInitCallback() {}
diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp
@@ -548,5 +548,3 @@ bool emberAfWindowCoveringClusterGoToTiltPercentageCallback(app::CommandHandler
     }
     return true;
 }
-
-void MatterWindowCoveringPluginServerInitCallback() {}
diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
@@ -289,27 +289,6 @@ void emberAfTick(void)
 #endif
 }
 
-// Cluster init functions that don't have a cluster implementation to define
-// them in.
-void MatterBooleanStatePluginServerInitCallback() {}
-void MatterBridgedDeviceBasicPluginServerInitCallback() {}
-void MatterElectricalMeasurementPluginServerInitCallback() {}
-void MatterOtaSoftwareUpdateRequestorPluginServerInitCallback() {}
-void MatterGroupKeyManagementPluginServerInitCallback() {}
-void MatterRelativeHumidityMeasurementPluginServerInitCallback() {}
-void MatterFixedLabelPluginServerInitCallback() {}
-void MatterSwitchPluginServerInitCallback() {}
-void MatterIlluminanceMeasurementPluginServerInitCallback() {}
-void MatterBinaryInputBasicPluginServerInitCallback() {}
-void MatterPressureMeasurementPluginServerInitCallback() {}
-void MatterTemperatureMeasurementPluginServerInitCallback() {}
-void MatterFlowMeasurementPluginServerInitCallback() {}
-void MatterWakeOnLanPluginServerInitCallback() {}
-void MatterBridgedActionsPluginServerInitCallback() {}
-void MatterOnOffSwitchConfigurationPluginServerInitCallback() {}
-void MatterPowerSourcePluginServerInitCallback() {}
-void MatterThermostatUserInterfaceConfigurationPluginServerInitCallback() {}
-
 // ****************************************
 // This function is called by the application when the stack goes down,
 // such as after a leave network. This allows zcl utils to clear state

diff --git a/src/app/zap-templates/templates/app/callbacks/PluginCallbacks.zapt b/src/app/zap-templates/templates/app/callbacks/PluginCallbacks.zapt
@@ -3,6 +3,7 @@
 #pragma once
 
 {{#zcl_clusters}}
-void __attribute__((weak))  Matter{{asUpperCamelCase label}}PluginClientInitCallback() {}
-void Matter{{asUpperCamelCase label}}PluginServerInitCallback();
+{{#*inline "callbackName"}}void __attribute__((weak)) Matter{{asUpperCamelCase label}}{{> @partial-block}}InitCallback() {};{{/inline}}
+{{#>callbackName}}PluginClient{{/callbackName}}
+{{#>callbackName}}PluginServer{{/callbackName}}
 {{/zcl_clusters}}
-Original file line number
+Diff line change
@@ Expand Up @@
             VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(Zcl, "Error setting Software Version: 0x%02x", status));
         }
     }
-    void MatterBasicPluginServerInitCallback() {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -137,5 +137,3 @@ EmberAfStatus emAfPluginDoorLockServerNoteDoorStateChanged(EmberAfDoorState stat

		return status;
		}

		void MatterDoorLockPluginServerInitCallback() {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -69,5 +69,3 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(app::CommandH

		return true;
		}

		void MatterGeneralCommissioningPluginServerInitCallback() {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -533,5 +533,3 @@ bool emberAfPluginGroupsServerGroupNamesSupportedCallback(EndpointId endpoint)
		}

		void emberAfPluginGroupsServerSetGroupNameCallback(EndpointId endpoint, GroupId groupId, const CharSpan & groupName) {}

		void MatterGroupsPluginServerInitCallback() {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1053,5 +1053,3 @@ static bool areStartUpLevelControlServerAttributesTokenized(EndpointId endpoint)
		#endif

		void emberAfPluginLevelControlClusterServerPostInitCallback(EndpointId endpoint) {}

		void MatterLevelControlPluginServerInitCallback() {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -286,5 +286,3 @@ static bool areStartUpOnOffServerAttributesTokenized(EndpointId endpoint)
		#endif

		void emberAfPluginOnOffClusterServerPostInitCallback(EndpointId endpoint) {}

		void MatterOnOffPluginServerInitCallback() {}