[IM] Remove the EMBER_ZCL_STATUS_DUPLICATE_EXISTS error code (project-chip#32017)

jepenven-silabs · raul-marquez-csa · commit acd5aa99795a · 2024-02-15T18:20:58.000-08:00
* Remove the EMBER_ZCL_STATUS_DUPLICATE_EXISTS error code

* fix comments
diff --git a/docs/ERROR_CODES.md b/docs/ERROR_CODES.md
@@ -102,6 +102,7 @@ This file was **AUTOMATICALLY** generated by
 | 121       | 0x79  | `CHIP_ERROR_INSUFFICIENT_PRIVILEGE`                |
 | 125       | 0x7D  | `CHIP_ERROR_MESSAGE_COUNTER_EXHAUSTED`             |
 | 126       | 0x7E  | `CHIP_ERROR_FABRIC_EXISTS`                         |
+| 127       | 0x7F  | `CHIP_ERROR_ENDPOINT_EXISTS`                       |
 | 128       | 0x80  | `CHIP_ERROR_WRONG_ENCRYPTION_TYPE_FROM_PEER`       |
 | 133       | 0x85  | `CHIP_ERROR_INVALID_KEY_ID`                        |
 | 134       | 0x86  | `CHIP_ERROR_INVALID_TIME`                          |
diff --git a/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp b/examples/bridge-app/asr/subdevice/SubDeviceManager.cpp
@@ -56,19 +56,19 @@ int AddDeviceEndpoint(SubDevice * dev, EmberAfEndpointType * ep, const Span<cons
         if (NULL == gSubDevices[index])
         {
             gSubDevices[index] = dev;
-            EmberAfStatus ret;
+            CHIP_ERROR err;
             while (1)
             {
                 dev->SetEndpointId(gCurrentEndpointId);
-                ret =
+                err =
                     emberAfSetDynamicEndpoint(index, gCurrentEndpointId, ep, dataVersionStorage, deviceTypeList, parentEndpointId);
-                if (ret == EMBER_ZCL_STATUS_SUCCESS)
+                if (err == CHIP_NO_ERROR)
                 {
                     ChipLogProgress(DeviceLayer, "Added device %s to dynamic endpoint %d (index=%d)", dev->GetName(),
                                     gCurrentEndpointId, index);
                     return index;
                 }
-                else if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)
+                else if (err != CHIP_ERROR_ENDPOINT_EXISTS)
                 {
                     return -1;
                 }
diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp
@@ -166,19 +166,19 @@ int AddDeviceEndpoint(Device * dev, EmberAfEndpointType * ep, const Span<const E
         if (NULL == gDevices[index])
         {
             gDevices[index] = dev;
-            EmberAfStatus ret;
+            CHIP_ERROR err;
             while (true)
             {
                 dev->SetEndpointId(gCurrentEndpointId);
-                ret =
+                err =
                     emberAfSetDynamicEndpoint(index, gCurrentEndpointId, ep, dataVersionStorage, deviceTypeList, parentEndpointId);
-                if (ret == EMBER_ZCL_STATUS_SUCCESS)
+                if (err == CHIP_NO_ERROR)
                 {
                     ChipLogProgress(DeviceLayer, "Added device %s to dynamic endpoint %d (index=%d)", dev->GetName(),
                                     gCurrentEndpointId, index);
                     return index;
                 }
-                else if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)
+                else if (err != CHIP_ERROR_ENDPOINT_EXISTS)
                 {
                     return -1;
                 }
diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp
@@ -259,22 +259,22 @@ int AddDeviceEndpoint(Device * dev, EmberAfEndpointType * ep, const Span<const E
         if (nullptr == gDevices[index])
         {
             gDevices[index] = dev;
-            EmberAfStatus ret;
+            CHIP_ERROR err;
             while (true)
             {
                 // Todo: Update this to schedule the work rather than use this lock
                 DeviceLayer::StackLock lock;
                 dev->SetEndpointId(gCurrentEndpointId);
                 dev->SetParentEndpointId(parentEndpointId);
-                ret =
+                err =
                     emberAfSetDynamicEndpoint(index, gCurrentEndpointId, ep, dataVersionStorage, deviceTypeList, parentEndpointId);
-                if (ret == EMBER_ZCL_STATUS_SUCCESS)
+                if (err == CHIP_NO_ERROR)
                 {
                     ChipLogProgress(DeviceLayer, "Added device %s to dynamic endpoint %d (index=%d)", dev->GetName(),
                                     gCurrentEndpointId, index);
                     return index;
                 }
-                if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)
+                if (err != CHIP_ERROR_ENDPOINT_EXISTS)
                 {
                     return -1;
                 }
diff --git a/examples/bridge-app/telink/src/AppTask.cpp b/examples/bridge-app/telink/src/AppTask.cpp
@@ -189,19 +189,19 @@ int AddDeviceEndpoint(Device * dev, EmberAfEndpointType * ep, const Span<const E
         if (NULL == gDevices[index])
         {
             gDevices[index] = dev;
-            EmberAfStatus ret;
+            CHIP_ERROR err;
             while (true)
             {
                 dev->SetEndpointId(gCurrentEndpointId);
-                ret =
+                err =
                     emberAfSetDynamicEndpoint(index, gCurrentEndpointId, ep, dataVersionStorage, deviceTypeList, parentEndpointId);
-                if (ret == EMBER_ZCL_STATUS_SUCCESS)
+                if (err == CHIP_NO_ERROR)
                 {
                     ChipLogProgress(DeviceLayer, "Added device %s to dynamic endpoint %d (index=%d)", dev->GetName(),
                                     gCurrentEndpointId, index);
                     return index;
                 }
-                else if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)
+                else if (err != CHIP_ERROR_ENDPOINT_EXISTS)
                 {
                     return -1;
                 }
diff --git a/src/app/app-platform/ContentAppPlatform.cpp b/src/app/app-platform/ContentAppPlatform.cpp
@@ -136,13 +136,13 @@ EndpointId ContentAppPlatform::AddContentApp(ContentApp * app, EmberAfEndpointTy
             index++;
             continue;
         }
-        EmberAfStatus ret;
+        CHIP_ERROR err;
         EndpointId initEndpointId = mCurrentEndpointId;
 
         do
         {
-            ret = emberAfSetDynamicEndpoint(index, mCurrentEndpointId, ep, dataVersionStorage, deviceTypeList);
-            if (ret == EMBER_ZCL_STATUS_SUCCESS)
+            err = emberAfSetDynamicEndpoint(index, mCurrentEndpointId, ep, dataVersionStorage, deviceTypeList);
+            if (err == CHIP_NO_ERROR)
             {
                 ChipLogProgress(DeviceLayer, "Added ContentApp %s to dynamic endpoint %d (index=%d)", vendorApp.applicationId,
                                 mCurrentEndpointId, index);
@@ -151,9 +151,9 @@ EndpointId ContentAppPlatform::AddContentApp(ContentApp * app, EmberAfEndpointTy
                 IncrementCurrentEndpointID();
                 return app->GetEndpointId();
             }
-            else if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)
+            else if (err != CHIP_ERROR_ENDPOINT_EXISTS)
             {
-                ChipLogError(DeviceLayer, "Adding ContentApp error=%d", ret);
+                ChipLogError(DeviceLayer, "Adding ContentApp error=%" CHIP_ERROR_FORMAT, err.Format());
                 return kNoCurrentEndpointId;
             }
             IncrementCurrentEndpointID();
@@ -202,10 +202,10 @@ EndpointId ContentAppPlatform::AddContentApp(ContentApp * app, EmberAfEndpointTy
             index++;
             continue;
         }
-        EmberAfStatus ret = emberAfSetDynamicEndpoint(index, desiredEndpointId, ep, dataVersionStorage, deviceTypeList);
-        if (ret != EMBER_ZCL_STATUS_SUCCESS)
+        CHIP_ERROR err = emberAfSetDynamicEndpoint(index, desiredEndpointId, ep, dataVersionStorage, deviceTypeList);
+        if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(DeviceLayer, "Adding ContentApp error=%d", ret);
+            ChipLogError(DeviceLayer, "Adding ContentApp error : %" CHIP_ERROR_FORMAT, err.Format());
             return kNoCurrentEndpointId;
         }
         ChipLogProgress(DeviceLayer, "Added ContentApp %s to dynamic endpoint %d (index=%d)", vendorApp.applicationId,
diff --git a/src/app/util/af-enums.h b/src/app/util/af-enums.h
@@ -39,7 +39,6 @@ enum EmberAfStatus : uint8_t
     EMBER_ZCL_STATUS_CONSTRAINT_ERROR         = 0x87,
     EMBER_ZCL_STATUS_UNSUPPORTED_WRITE        = 0x88,
     EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED       = 0x89,
-    EMBER_ZCL_STATUS_DUPLICATE_EXISTS         = 0x8A,
     EMBER_ZCL_STATUS_NOT_FOUND                = 0x8B,
     EMBER_ZCL_STATUS_UNREPORTABLE_ATTRIBUTE   = 0x8C,
     EMBER_ZCL_STATUS_INVALID_DATA_TYPE        = 0x8D,
diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
@@ -253,33 +253,33 @@ uint16_t emberAfGetDynamicIndexFromEndpoint(EndpointId id)
     return kEmberInvalidEndpointIndex;
 }
 
-EmberAfStatus emberAfSetDynamicEndpoint(uint16_t index, EndpointId id, const EmberAfEndpointType * ep,
-                                        const chip::Span<chip::DataVersion> & dataVersionStorage,
-                                        chip::Span<const EmberAfDeviceType> deviceTypeList, EndpointId parentEndpointId)
+CHIP_ERROR emberAfSetDynamicEndpoint(uint16_t index, EndpointId id, const EmberAfEndpointType * ep,
+                                     const chip::Span<chip::DataVersion> & dataVersionStorage,
+                                     chip::Span<const EmberAfDeviceType> deviceTypeList, EndpointId parentEndpointId)
 {
     auto realIndex = index + FIXED_ENDPOINT_COUNT;
 
     if (realIndex >= MAX_ENDPOINT_COUNT)
     {
-        return EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED;
+        return CHIP_ERROR_NO_MEMORY;
     }
     if (id == kInvalidEndpointId)
     {
-        return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
+        return CHIP_ERROR_INVALID_ARGUMENT;
     }
 
     auto serverClusterCount = emberAfClusterCountForEndpointType(ep, /* server = */ true);
     if (dataVersionStorage.size() < serverClusterCount)
     {
-        return EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED;
+        return CHIP_ERROR_NO_MEMORY;
     }
 
     index = static_cast<uint16_t>(realIndex);
     for (uint16_t i = FIXED_ENDPOINT_COUNT; i < MAX_ENDPOINT_COUNT; i++)
     {
         if (emAfEndpoints[i].endpoint == id)
         {
-            return EMBER_ZCL_STATUS_DUPLICATE_EXISTS;
+            return CHIP_ERROR_ENDPOINT_EXISTS;
         }
     }
 
@@ -307,7 +307,7 @@ EmberAfStatus emberAfSetDynamicEndpoint(uint16_t index, EndpointId id, const Emb
     // Now enable the endpoint.
     emberAfEndpointEnableDisable(id, true);
 
-    return EMBER_ZCL_STATUS_SUCCESS;
+    return CHIP_NO_ERROR;
 }
 
 EndpointId emberAfClearDynamicEndpoint(uint16_t index)
diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h
@@ -190,10 +190,15 @@ CHIP_ERROR SetTagList(chip::EndpointId endpoint,
 //
 // An optional parent endpoint id should be passed for child endpoints of composed device.
 //
-EmberAfStatus emberAfSetDynamicEndpoint(uint16_t index, chip::EndpointId id, const EmberAfEndpointType * ep,
-                                        const chip::Span<chip::DataVersion> & dataVersionStorage,
-                                        chip::Span<const EmberAfDeviceType> deviceTypeList = {},
-                                        chip::EndpointId parentEndpointId                  = chip::kInvalidEndpointId);
+// Returns  CHIP_NO_ERROR                   No error.
+//          CHIP_ERROR_NO_MEMORY            MAX_ENDPOINT_COUNT is reached or when no storage is left for clusters
+//          CHIP_ERROR_INVALID_ARGUMENT     The EndpointId value passed is kInvalidEndpointId
+//          CHIP_ERROR_ENDPOINT_EXISTS      If the EndpointId value passed already exists
+//
+CHIP_ERROR emberAfSetDynamicEndpoint(uint16_t index, chip::EndpointId id, const EmberAfEndpointType * ep,
+                                     const chip::Span<chip::DataVersion> & dataVersionStorage,
+                                     chip::Span<const EmberAfDeviceType> deviceTypeList = {},
+                                     chip::EndpointId parentEndpointId                  = chip::kInvalidEndpointId);
 chip::EndpointId emberAfClearDynamicEndpoint(uint16_t index);
 uint16_t emberAfGetDynamicIndexFromEndpoint(chip::EndpointId id);
 
diff --git a/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerEndpoint.mm b/src/darwin/Framework/CHIP/ServerEndpoint/MTRServerEndpoint.mm
@@ -347,7 +347,7 @@ - (void)registerMatterEndpoint
         &_matterEndpointMetadata,
         Span<DataVersion>(_matterDataVersions.get(), _matterEndpointMetadata.clusterCount),
         Span<EmberAfDeviceType>(_matterDeviceTypes.get(), _deviceTypes.count));
-    if (status != EMBER_ZCL_STATUS_SUCCESS) {
+    if (status != CHIP_NO_ERROR) {
         MTR_LOG_ERROR("Unexpected failure to define our Matter endpoint");
     }
 
diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp
@@ -320,6 +320,9 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_FABRIC_EXISTS.AsInteger():
         desc = "Trying to add a NOC for a fabric that already exists";
         break;
+    case CHIP_ERROR_ENDPOINT_EXISTS.AsInteger():
+        desc = "Trying to add dynamic endpoint that already exists";
+        break;
     case CHIP_ERROR_WRONG_ENCRYPTION_TYPE_FROM_PEER.AsInteger():
         desc = "Wrong encryption type error code received from peer";
         break;
diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
@@ -1259,7 +1259,14 @@ using CHIP_ERROR = ::chip::ChipError;
  */
 #define CHIP_ERROR_FABRIC_EXISTS                               CHIP_CORE_ERROR(0x7e)
 
-// AVAILABLE: 0x7f
+/**
+ *  @def CHIP_ERROR_ENDPOINT_EXISTS
+ *
+ *  @brief
+ *    The endpoint with the given endpoint id already exists.
+ *
+ */
+#define CHIP_ERROR_ENDPOINT_EXISTS                               CHIP_CORE_ERROR(0x7f)
 
 /**
  *  @def CHIP_ERROR_WRONG_ENCRYPTION_TYPE_FROM_PEER
diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp
@@ -134,6 +134,7 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_INSUFFICIENT_PRIVILEGE,
     CHIP_ERROR_MESSAGE_COUNTER_EXHAUSTED,
     CHIP_ERROR_FABRIC_EXISTS,
+    CHIP_ERROR_ENDPOINT_EXISTS,
     CHIP_ERROR_WRONG_ENCRYPTION_TYPE_FROM_PEER,
     CHIP_ERROR_INVALID_KEY_ID,
     CHIP_ERROR_INVALID_TIME,

Original file line number	Diff line number	Diff line change
`@@ -56,19 +56,19 @@ int AddDeviceEndpoint(SubDevice * dev, EmberAfEndpointType * ep, const Span<cons`
`56`	`56`	`if (NULL == gSubDevices[index])`
`57`	`57`	`{`
`58`	`58`	`gSubDevices[index] = dev;`
`59`		`- EmberAfStatus ret;`
	`59`	`+ CHIP_ERROR err;`
`60`	`60`	`while (1)`
`61`	`61`	`{`
`62`	`62`	`dev->SetEndpointId(gCurrentEndpointId);`
`63`		`- ret =`
	`63`	`+ err =`
`64`	`64`	`emberAfSetDynamicEndpoint(index, gCurrentEndpointId, ep, dataVersionStorage, deviceTypeList, parentEndpointId);`
`65`		`- if (ret == EMBER_ZCL_STATUS_SUCCESS)`
	`65`	`+ if (err == CHIP_NO_ERROR)`
`66`	`66`	`{`
`67`	`67`	`ChipLogProgress(DeviceLayer, "Added device %s to dynamic endpoint %d (index=%d)", dev->GetName(),`
`68`	`68`	`gCurrentEndpointId, index);`
`69`	`69`	`return index;`
`70`	`70`	`}`
`71`		`- else if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)`
	`71`	`+ else if (err != CHIP_ERROR_ENDPOINT_EXISTS)`
`72`	`72`	`{`
`73`	`73`	`return -1;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,19 +166,19 @@ int AddDeviceEndpoint(Device * dev, EmberAfEndpointType * ep, const Span<const E`
`166`	`166`	`if (NULL == gDevices[index])`
`167`	`167`	`{`
`168`	`168`	`gDevices[index] = dev;`
`169`		`- EmberAfStatus ret;`
	`169`	`+ CHIP_ERROR err;`
`170`	`170`	`while (true)`
`171`	`171`	`{`
`172`	`172`	`dev->SetEndpointId(gCurrentEndpointId);`
`173`		`- ret =`
	`173`	`+ err =`
`174`	`174`	`emberAfSetDynamicEndpoint(index, gCurrentEndpointId, ep, dataVersionStorage, deviceTypeList, parentEndpointId);`
`175`		`- if (ret == EMBER_ZCL_STATUS_SUCCESS)`
	`175`	`+ if (err == CHIP_NO_ERROR)`
`176`	`176`	`{`
`177`	`177`	`ChipLogProgress(DeviceLayer, "Added device %s to dynamic endpoint %d (index=%d)", dev->GetName(),`
`178`	`178`	`gCurrentEndpointId, index);`
`179`	`179`	`return index;`
`180`	`180`	`}`
`181`		`- else if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)`
	`181`	`+ else if (err != CHIP_ERROR_ENDPOINT_EXISTS)`
`182`	`182`	`{`
`183`	`183`	`return -1;`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -259,22 +259,22 @@ int AddDeviceEndpoint(Device * dev, EmberAfEndpointType * ep, const Span<const E`
`259`	`259`	`if (nullptr == gDevices[index])`
`260`	`260`	`{`
`261`	`261`	`gDevices[index] = dev;`
`262`		`- EmberAfStatus ret;`
	`262`	`+ CHIP_ERROR err;`
`263`	`263`	`while (true)`
`264`	`264`	`{`
`265`	`265`	`// Todo: Update this to schedule the work rather than use this lock`
`266`	`266`	`DeviceLayer::StackLock lock;`
`267`	`267`	`dev->SetEndpointId(gCurrentEndpointId);`
`268`	`268`	`dev->SetParentEndpointId(parentEndpointId);`
`269`		`- ret =`
	`269`	`+ err =`
`270`	`270`	`emberAfSetDynamicEndpoint(index, gCurrentEndpointId, ep, dataVersionStorage, deviceTypeList, parentEndpointId);`
`271`		`- if (ret == EMBER_ZCL_STATUS_SUCCESS)`
	`271`	`+ if (err == CHIP_NO_ERROR)`
`272`	`272`	`{`
`273`	`273`	`ChipLogProgress(DeviceLayer, "Added device %s to dynamic endpoint %d (index=%d)", dev->GetName(),`
`274`	`274`	`gCurrentEndpointId, index);`
`275`	`275`	`return index;`
`276`	`276`	`}`
`277`		`- if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)`
	`277`	`+ if (err != CHIP_ERROR_ENDPOINT_EXISTS)`
`278`	`278`	`{`
`279`	`279`	`return -1;`
`280`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,19 +189,19 @@ int AddDeviceEndpoint(Device * dev, EmberAfEndpointType * ep, const Span<const E`
`189`	`189`	`if (NULL == gDevices[index])`
`190`	`190`	`{`
`191`	`191`	`gDevices[index] = dev;`
`192`		`- EmberAfStatus ret;`
	`192`	`+ CHIP_ERROR err;`
`193`	`193`	`while (true)`
`194`	`194`	`{`
`195`	`195`	`dev->SetEndpointId(gCurrentEndpointId);`
`196`		`- ret =`
	`196`	`+ err =`
`197`	`197`	`emberAfSetDynamicEndpoint(index, gCurrentEndpointId, ep, dataVersionStorage, deviceTypeList, parentEndpointId);`
`198`		`- if (ret == EMBER_ZCL_STATUS_SUCCESS)`
	`198`	`+ if (err == CHIP_NO_ERROR)`
`199`	`199`	`{`
`200`	`200`	`ChipLogProgress(DeviceLayer, "Added device %s to dynamic endpoint %d (index=%d)", dev->GetName(),`
`201`	`201`	`gCurrentEndpointId, index);`
`202`	`202`	`return index;`
`203`	`203`	`}`
`204`		`- else if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)`
	`204`	`+ else if (err != CHIP_ERROR_ENDPOINT_EXISTS)`
`205`	`205`	`{`
`206`	`206`	`return -1;`
`207`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,13 +136,13 @@ EndpointId ContentAppPlatform::AddContentApp(ContentApp * app, EmberAfEndpointTy`
`136`	`136`	`index++;`
`137`	`137`	`continue;`
`138`	`138`	`}`
`139`		`- EmberAfStatus ret;`
	`139`	`+ CHIP_ERROR err;`
`140`	`140`	`EndpointId initEndpointId = mCurrentEndpointId;`
`141`	`141`
`142`	`142`	`do`
`143`	`143`	`{`
`144`		`- ret = emberAfSetDynamicEndpoint(index, mCurrentEndpointId, ep, dataVersionStorage, deviceTypeList);`
`145`		`- if (ret == EMBER_ZCL_STATUS_SUCCESS)`
	`144`	`+ err = emberAfSetDynamicEndpoint(index, mCurrentEndpointId, ep, dataVersionStorage, deviceTypeList);`
	`145`	`+ if (err == CHIP_NO_ERROR)`
`146`	`146`	`{`
`147`	`147`	`ChipLogProgress(DeviceLayer, "Added ContentApp %s to dynamic endpoint %d (index=%d)", vendorApp.applicationId,`
`148`	`148`	`mCurrentEndpointId, index);`
`@@ -151,9 +151,9 @@ EndpointId ContentAppPlatform::AddContentApp(ContentApp * app, EmberAfEndpointTy`
`151`	`151`	`IncrementCurrentEndpointID();`
`152`	`152`	`return app->GetEndpointId();`
`153`	`153`	`}`
`154`		`- else if (ret != EMBER_ZCL_STATUS_DUPLICATE_EXISTS)`
	`154`	`+ else if (err != CHIP_ERROR_ENDPOINT_EXISTS)`
`155`	`155`	`{`
`156`		`- ChipLogError(DeviceLayer, "Adding ContentApp error=%d", ret);`
	`156`	`+ ChipLogError(DeviceLayer, "Adding ContentApp error=%" CHIP_ERROR_FORMAT, err.Format());`
`157`	`157`	`return kNoCurrentEndpointId;`
`158`	`158`	`}`
`159`	`159`	`IncrementCurrentEndpointID();`
`@@ -202,10 +202,10 @@ EndpointId ContentAppPlatform::AddContentApp(ContentApp * app, EmberAfEndpointTy`
`202`	`202`	`index++;`
`203`	`203`	`continue;`
`204`	`204`	`}`
`205`		`- EmberAfStatus ret = emberAfSetDynamicEndpoint(index, desiredEndpointId, ep, dataVersionStorage, deviceTypeList);`
`206`		`- if (ret != EMBER_ZCL_STATUS_SUCCESS)`
	`205`	`+ CHIP_ERROR err = emberAfSetDynamicEndpoint(index, desiredEndpointId, ep, dataVersionStorage, deviceTypeList);`
	`206`	`+ if (err != CHIP_NO_ERROR)`
`207`	`207`	`{`
`208`		`- ChipLogError(DeviceLayer, "Adding ContentApp error=%d", ret);`
	`208`	`+ ChipLogError(DeviceLayer, "Adding ContentApp error : %" CHIP_ERROR_FORMAT, err.Format());`
`209`	`209`	`return kNoCurrentEndpointId;`
`210`	`210`	`}`
`211`	`211`	`ChipLogProgress(DeviceLayer, "Added ContentApp %s to dynamic endpoint %d (index=%d)", vendorApp.applicationId,`
Original file line number	Diff line number	Diff line change
`@@ -253,33 +253,33 @@ uint16_t emberAfGetDynamicIndexFromEndpoint(EndpointId id)`
`253`	`253`	`return kEmberInvalidEndpointIndex;`
`254`	`254`	`}`
`255`	`255`
`256`		`-EmberAfStatus emberAfSetDynamicEndpoint(uint16_t index, EndpointId id, const EmberAfEndpointType * ep,`
`257`		`- const chip::Span<chip::DataVersion> & dataVersionStorage,`
`258`		`- chip::Span<const EmberAfDeviceType> deviceTypeList, EndpointId parentEndpointId)`
	`256`	`+CHIP_ERROR emberAfSetDynamicEndpoint(uint16_t index, EndpointId id, const EmberAfEndpointType * ep,`
	`257`	`+ const chip::Span<chip::DataVersion> & dataVersionStorage,`
	`258`	`+ chip::Span<const EmberAfDeviceType> deviceTypeList, EndpointId parentEndpointId)`
`259`	`259`	`{`
`260`	`260`	`auto realIndex = index + FIXED_ENDPOINT_COUNT;`
`261`	`261`
`262`	`262`	`if (realIndex >= MAX_ENDPOINT_COUNT)`
`263`	`263`	`{`
`264`		`- return EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED;`
	`264`	`+ return CHIP_ERROR_NO_MEMORY;`
`265`	`265`	`}`
`266`	`266`	`if (id == kInvalidEndpointId)`
`267`	`267`	`{`
`268`		`- return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;`
	`268`	`+ return CHIP_ERROR_INVALID_ARGUMENT;`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`auto serverClusterCount = emberAfClusterCountForEndpointType(ep, /* server = */ true);`
`272`	`272`	`if (dataVersionStorage.size() < serverClusterCount)`
`273`	`273`	`{`
`274`		`- return EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED;`
	`274`	`+ return CHIP_ERROR_NO_MEMORY;`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`index = static_cast<uint16_t>(realIndex);`
`278`	`278`	`for (uint16_t i = FIXED_ENDPOINT_COUNT; i < MAX_ENDPOINT_COUNT; i++)`
`279`	`279`	`{`
`280`	`280`	`if (emAfEndpoints[i].endpoint == id)`
`281`	`281`	`{`
`282`		`- return EMBER_ZCL_STATUS_DUPLICATE_EXISTS;`
	`282`	`+ return CHIP_ERROR_ENDPOINT_EXISTS;`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
`@@ -307,7 +307,7 @@ EmberAfStatus emberAfSetDynamicEndpoint(uint16_t index, EndpointId id, const Emb`
`307`	`307`	`// Now enable the endpoint.`
`308`	`308`	`emberAfEndpointEnableDisable(id, true);`
`309`	`309`
`310`		`- return EMBER_ZCL_STATUS_SUCCESS;`
	`310`	`+ return CHIP_NO_ERROR;`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`EndpointId emberAfClearDynamicEndpoint(uint16_t index)`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ - (void)registerMatterEndpoint`
`347`	`347`	`&_matterEndpointMetadata,`
`348`	`348`	`Span<DataVersion>(_matterDataVersions.get(), _matterEndpointMetadata.clusterCount),`
`349`	`349`	`Span<EmberAfDeviceType>(_matterDeviceTypes.get(), _deviceTypes.count));`
`350`		`- if (status != EMBER_ZCL_STATUS_SUCCESS) {`
	`350`	`+ if (status != CHIP_NO_ERROR) {`
`351`	`351`	`MTR_LOG_ERROR("Unexpected failure to define our Matter endpoint");`
`352`	`352`	`}`
`353`	`353`