regenerated files after merge conflict fix

examples/all-clusters-app/all-clusters-common/gen/callback.h

@@ -256,14 +256,6 @@ void emberAfMediaPlaybackClusterInitCallback(chip::EndpointId endpoint);
  */
 void emberAfNetworkCommissioningClusterInitCallback(chip::EndpointId endpoint);
 
-/** @brief OTA Software Update Client Cluster Init
- *
- * Cluster Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfOtaSoftwareUpdateClientClusterInitCallback(chip::EndpointId endpoint);
-
 /** @brief OTA Software Update Server Cluster Init
  *
  * Cluster Init
@@ -2303,77 +2295,6 @@ EmberAfStatus emberAfNetworkCommissioningClusterServerPreAttributeChangedCallbac
  */
 void emberAfNetworkCommissioningClusterServerTickCallback(chip::EndpointId endpoint);
 
-//
-// OTA Software Update Client Cluster server
-//
-
-/** @brief OTA Software Update Client Cluster Server Init
- *
- * Server Init
- *
- * @param endpoint    Endpoint that is being initialized
- */
-void emberAfOtaSoftwareUpdateClientClusterServerInitCallback(chip::EndpointId endpoint);
-
-/** @brief OTA Software Update Client Cluster Server Attribute Changed
- *
- * Server Attribute Changed
- *
- * @param endpoint    Endpoint that is being initialized
- * @param attributeId Attribute that changed
- */
-void emberAfOtaSoftwareUpdateClientClusterServerAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId);
-
-/** @brief OTA Software Update Client Cluster Server Manufacturer Specific Attribute Changed
- *
- * Server Manufacturer Specific Attribute Changed
- *
- * @param endpoint          Endpoint that is being initialized
- * @param attributeId       Attribute that changed
- * @param manufacturerCode  Manufacturer Code of the attribute that changed
- */
-void emberAfOtaSoftwareUpdateClientClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                             chip::AttributeId attributeId,
-                                                                                             uint16_t manufacturerCode);
-
-/** @brief OTA Software Update Client Cluster Server Message Sent
- *
- * Server Message Sent
- *
- * @param type               The type of message sent
- * @param destination        The destination to which the message was sent
- * @param apsFrame           The APS frame for the message
- * @param msgLen             The length of the message
- * @param message            The message that was sent
- * @param status             The status of the sent message
- */
-void emberAfOtaSoftwareUpdateClientClusterServerMessageSentCallback(const chip::MessageSendDestination & destination,
-                                                                    EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
-                                                                    EmberStatus status);
-
-/** @brief OTA Software Update Client Cluster Server Pre Attribute Changed
- *
- * server Pre Attribute Changed
- *
- * @param endpoint      Endpoint that is being initialized
- * @param attributeId   Attribute to be changed
- * @param attributeType Attribute type
- * @param size          Attribute size
- * @param value         Attribute value
- */
-EmberAfStatus emberAfOtaSoftwareUpdateClientClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
-                                                                                     chip::AttributeId attributeId,
-                                                                                     EmberAfAttributeType attributeType,
-                                                                                     uint16_t size, uint8_t * value);
-
-/** @brief OTA Software Update Client Cluster Server Tick
- *
- * server Tick
- *
- * @param endpoint  Endpoint that is being served
- */
-void emberAfOtaSoftwareUpdateClientClusterServerTickCallback(chip::EndpointId endpoint);
-
 //
 // OTA Software Update Server Cluster server
 //

examples/chip-tool/commands/clusters/Commands.h

@@ -11966,8 +11966,7 @@ class OtaSoftwareUpdateServerApplyUpdateRequest : public ModelCommand
 
         chip::Controller::OtaSoftwareUpdateServerCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.ApplyUpdateRequest(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                          chip::ByteSpan(chip::Uint8::from_char(mUpdateToken), strlen(mUpdateToken)), mNewVersion);
+        return cluster.ApplyUpdateRequest(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mUpdateToken, mNewVersion);
     }
 
 private:
@@ -11976,7 +11975,7 @@ class OtaSoftwareUpdateServerApplyUpdateRequest : public ModelCommand
             OnOtaSoftwareUpdateServerClusterApplyUpdateRequestResponse, this);
     chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
         new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    char * mUpdateToken;
+    chip::ByteSpan mUpdateToken;
     uint32_t mNewVersion;
 };
 
@@ -12004,17 +12003,15 @@ class OtaSoftwareUpdateServerNotifyUpdateApplied : public ModelCommand
 
         chip::Controller::OtaSoftwareUpdateServerCluster cluster;
         cluster.Associate(device, endpointId);
-        return cluster.NotifyUpdateApplied(onSuccessCallback->Cancel(), onFailureCallback->Cancel(),
-                                           chip::ByteSpan(chip::Uint8::from_char(mUpdateToken), strlen(mUpdateToken)),
-                                           mCurrentVersion);
+        return cluster.NotifyUpdateApplied(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mUpdateToken, mCurrentVersion);
     }
 
 private:
     chip::Callback::Callback<DefaultSuccessCallback> * onSuccessCallback =
         new chip::Callback::Callback<DefaultSuccessCallback>(OnDefaultSuccessResponse, this);
     chip::Callback::Callback<DefaultFailureCallback> * onFailureCallback =
         new chip::Callback::Callback<DefaultFailureCallback>(OnDefaultFailureResponse, this);
-    char * mUpdateToken;
+    chip::ByteSpan mUpdateToken;
     uint32_t mCurrentVersion;
 };
 
@@ -12052,7 +12049,7 @@ class OtaSoftwareUpdateServerQueryImage : public ModelCommand
         return cluster.QueryImage(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), mVendorId, mProductId, mImageType,
                                   mHardwareVersion, mCurrentVersion, mProtocolsSupported,
                                   chip::ByteSpan(chip::Uint8::from_char(mLocation), strlen(mLocation)), mClientCanConsent,
-                                  chip::ByteSpan(chip::Uint8::from_char(mMetadataForServer), strlen(mMetadataForServer)));
+                                  mMetadataForServer);
     }
 
 private:
@@ -12069,7 +12066,7 @@ class OtaSoftwareUpdateServerQueryImage : public ModelCommand
     uint8_t mProtocolsSupported;
     char * mLocation;
     uint8_t mClientCanConsent;
-    char * mMetadataForServer;
+    chip::ByteSpan mMetadataForServer;
 };
 
 /*

src/controller/data_model/gen/callback.h

@@ -2238,8 +2238,7 @@ void emberAfOtaSoftwareUpdateServerClusterClientManufacturerSpecificAttributeCha
  * @param message            The message that was sent
  * @param status             The status of the sent message
  */
-void emberAfOtaSoftwareUpdateServerClusterClientMessageSentCallback(EmberOutgoingMessageType type,
-                                                                    chip::MessageSendDestination destination,
+void emberAfOtaSoftwareUpdateServerClusterClientMessageSentCallback(const chip::MessageSendDestination & destination,
                                                                     EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
                                                                     EmberStatus status);