Skip to content

Commit 935a5b7

Browse files
Update Ranges for CapabilityMinimaStruct to Follow Spec (project-chip#42742)
* Update ranges * Restyled by clang-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 5a614ca commit 935a5b7

2 files changed

Lines changed: 16 additions & 9 deletions

File tree

src/app/InteractionModelEngine.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ namespace chip {
5858
namespace app {
5959
namespace {
6060

61+
inline constexpr uint16_t kMaxNumSubscriptionsPerFabric = 10000;
62+
6163
/**
6264
* Helper to handle wildcard events in the event path.
6365
*
@@ -2021,10 +2023,10 @@ bool InteractionModelEngine::HasActiveRead()
20212023
uint16_t InteractionModelEngine::GetMinGuaranteedSubscriptionsPerFabric() const
20222024
{
20232025
#if CHIP_SYSTEM_CONFIG_POOL_USE_HEAP
2024-
return UINT16_MAX;
2026+
return kMaxNumSubscriptionsPerFabric;
20252027
#else
2026-
return static_cast<uint16_t>(
2027-
std::min(GetReadHandlerPoolCapacityForSubscriptions() / GetConfigMaxFabrics(), static_cast<size_t>(UINT16_MAX)));
2028+
return static_cast<uint16_t>(std::min(GetReadHandlerPoolCapacityForSubscriptions() / GetConfigMaxFabrics(),
2029+
static_cast<size_t>(kMaxNumSubscriptionsPerFabric)));
20282030
#endif
20292031
}
20302032

src/include/platform/DeviceInstanceInfoProvider.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,17 @@ class DeviceInstanceInfoProvider
277277
*/
278278
virtual DeviceInfoCapabilityMinimas GetSupportedCapabilityMinimaValues()
279279
{
280-
static_assert(CHIP_IM_MAX_NUM_COMMAND_HANDLER <= 10000, "CHIP_IM_MAX_NUM_COMMAND_HANDLER must be <= 10000");
281-
static_assert(CHIP_IM_MAX_NUM_WRITE_HANDLER <= 10000, "CHIP_IM_MAX_NUM_WRITE_HANDLER must be <= 10000");
282-
static_assert(CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_READS <= 10000,
283-
"CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_READS must be <= 10000");
284-
static_assert(CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_SUBSCRIPTIONS <= 10000,
285-
"CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_SUBSCRIPTIONS must be <= 10000");
280+
static_assert(CHIP_IM_MAX_NUM_COMMAND_HANDLER >= 1 && CHIP_IM_MAX_NUM_COMMAND_HANDLER <= 10000,
281+
"CHIP_IM_MAX_NUM_COMMAND_HANDLER must be greater than or equal to 1 and less than or equal to 10000");
282+
static_assert(CHIP_IM_MAX_NUM_WRITE_HANDLER >= 1 && CHIP_IM_MAX_NUM_WRITE_HANDLER <= 10000,
283+
"CHIP_IM_MAX_NUM_WRITE_HANDLER must be greater than or equal to 1 and less than or equal to 10000");
284+
static_assert(
285+
CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_READS >= 9 && CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_READS <= 10000,
286+
"CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_READS must be greater than or equal to 9 and less than or equal to 10000");
287+
static_assert(CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_SUBSCRIPTIONS >= 3 &&
288+
CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_SUBSCRIPTIONS <= 10000,
289+
"CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS_FOR_SUBSCRIPTIONS must be greater than or equal to 3 and less than or "
290+
"equal to 10000");
286291

287292
return DeviceInfoCapabilityMinimas{ .simultaneousInvocationsSupported = CHIP_IM_MAX_NUM_COMMAND_HANDLER,
288293
.simultaneousWritesSupported = CHIP_IM_MAX_NUM_WRITE_HANDLER,

0 commit comments

Comments
 (0)