diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake index 89cbee6a4cca8c..069a41c8a5143b 100644 --- a/src/app/chip_data_model.cmake +++ b/src/app/chip_data_model.cmake @@ -135,7 +135,6 @@ function(chip_configure_data_model APP_TARGET) target_sources(${APP_TARGET} ${SCOPE} ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp - ${CHIP_APP_BASE_DIR}/util/attribute-size-util.cpp ${CHIP_APP_BASE_DIR}/util/attribute-storage.cpp ${CHIP_APP_BASE_DIR}/util/attribute-table.cpp ${CHIP_APP_BASE_DIR}/util/binding-table.cpp diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni index 9da91d7f4c10c1..67baca6fdf3dff 100644 --- a/src/app/chip_data_model.gni +++ b/src/app/chip_data_model.gni @@ -178,7 +178,6 @@ template("chip_data_model") { if (!chip_build_controller_dynamic_server) { sources += [ "${_app_root}/util/DataModelHandler.cpp", - "${_app_root}/util/attribute-size-util.cpp", "${_app_root}/util/attribute-storage.cpp", "${_app_root}/util/attribute-table.cpp", "${_app_root}/util/ember-compatibility-functions.cpp", diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json index de1817b98bce43..d8159493bc925b 100644 --- a/src/app/common/templates/templates.json +++ b/src/app/common/templates/templates.json @@ -31,11 +31,6 @@ } ], "templates": [ - { - "path": "../../zap-templates/templates/app/attribute-size.zapt", - "name": "ZCL attribute-size header", - "output": "attribute-size.h" - }, { "path": "../../zap-templates/templates/app/attribute-type.zapt", "name": "ZCL attribute-type header", diff --git a/src/app/util/attribute-size-util.cpp b/src/app/util/attribute-size-util.cpp deleted file mode 100644 index f8cf9507f11b53..00000000000000 --- a/src/app/util/attribute-size-util.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * - * Copyright (c) 2020 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#include - -using namespace chip; - -static const uint8_t attributeSizes[] = { -#include -}; - -uint8_t emberAfGetDataSize(uint8_t dataType) -{ - for (unsigned i = 0; (i + 1) < sizeof(attributeSizes); i += 2) - { - if (attributeSizes[i] == dataType) - { - return attributeSizes[i + 1]; - } - } - - return 0; -} diff --git a/src/app/zap-templates/templates/app/attribute-size.zapt b/src/app/zap-templates/templates/app/attribute-size.zapt deleted file mode 100644 index 489dca0b893f68..00000000000000 --- a/src/app/zap-templates/templates/app/attribute-size.zapt +++ /dev/null @@ -1,11 +0,0 @@ -{{> header}} - -// Prevent multiple inclusion -#pragma once - -// ZCL attribute sizes -{{#zcl_atomics}} -{{#if size}} -{{ident}}ZCL_{{asDelimitedMacro name}}_ATTRIBUTE_TYPE, {{size}}, -{{/if}} -{{/zcl_atomics}} diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-size.h b/zzz_generated/app-common/app-common/zap-generated/attribute-size.h deleted file mode 100644 index f4e3e5cac680b3..00000000000000 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-size.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * Copyright (c) 2022 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// THIS FILE IS GENERATED BY ZAP - -// Prevent multiple inclusion -#pragma once - -// ZCL attribute sizes -ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1, ZCL_BITMAP16_ATTRIBUTE_TYPE, 2, ZCL_BITMAP24_ATTRIBUTE_TYPE, 3, - ZCL_BITMAP32_ATTRIBUTE_TYPE, 4, ZCL_BITMAP64_ATTRIBUTE_TYPE, 8, ZCL_INT8U_ATTRIBUTE_TYPE, 1, ZCL_INT16U_ATTRIBUTE_TYPE, 2, - ZCL_INT24U_ATTRIBUTE_TYPE, 3, ZCL_INT32U_ATTRIBUTE_TYPE, 4, ZCL_INT40U_ATTRIBUTE_TYPE, 5, ZCL_INT48U_ATTRIBUTE_TYPE, 6, - ZCL_INT56U_ATTRIBUTE_TYPE, 7, ZCL_INT64U_ATTRIBUTE_TYPE, 8, ZCL_INT8S_ATTRIBUTE_TYPE, 1, ZCL_INT16S_ATTRIBUTE_TYPE, 2, - ZCL_INT24S_ATTRIBUTE_TYPE, 3, ZCL_INT32S_ATTRIBUTE_TYPE, 4, ZCL_INT40S_ATTRIBUTE_TYPE, 5, ZCL_INT48S_ATTRIBUTE_TYPE, 6, - ZCL_INT56S_ATTRIBUTE_TYPE, 7, ZCL_INT64S_ATTRIBUTE_TYPE, 8, ZCL_ENUM8_ATTRIBUTE_TYPE, 1, ZCL_ENUM16_ATTRIBUTE_TYPE, 2, - ZCL_PRIORITY_ATTRIBUTE_TYPE, 1, ZCL_STATUS_ATTRIBUTE_TYPE, 1, ZCL_SINGLE_ATTRIBUTE_TYPE, 4, ZCL_DOUBLE_ATTRIBUTE_TYPE, 8, - ZCL_GROUP_ID_ATTRIBUTE_TYPE, 2, ZCL_ENDPOINT_NO_ATTRIBUTE_TYPE, 2, ZCL_VENDOR_ID_ATTRIBUTE_TYPE, 2, - ZCL_DEVTYPE_ID_ATTRIBUTE_TYPE, 4, ZCL_FABRIC_ID_ATTRIBUTE_TYPE, 8, ZCL_FABRIC_IDX_ATTRIBUTE_TYPE, 1, - ZCL_ENTRY_IDX_ATTRIBUTE_TYPE, 2, ZCL_DATA_VER_ATTRIBUTE_TYPE, 4, ZCL_EVENT_NO_ATTRIBUTE_TYPE, 8, ZCL_SEMTAG_ATTRIBUTE_TYPE, 4, - ZCL_NAMESPACE_ATTRIBUTE_TYPE, 1, ZCL_TAG_ATTRIBUTE_TYPE, 1, ZCL_SYSTIME_US_ATTRIBUTE_TYPE, 8, ZCL_SYSTIME_MS_ATTRIBUTE_TYPE, 8, - ZCL_ELAPSED_S_ATTRIBUTE_TYPE, 4, ZCL_TEMPERATURE_ATTRIBUTE_TYPE, 2, ZCL_TOD_ATTRIBUTE_TYPE, 4, ZCL_DATE_ATTRIBUTE_TYPE, 4, - ZCL_EPOCH_US_ATTRIBUTE_TYPE, 8, ZCL_EPOCH_S_ATTRIBUTE_TYPE, 4, ZCL_POSIX_MS_ATTRIBUTE_TYPE, 8, ZCL_PERCENT_ATTRIBUTE_TYPE, 1, - ZCL_PERCENT100THS_ATTRIBUTE_TYPE, 2, ZCL_CLUSTER_ID_ATTRIBUTE_TYPE, 4, ZCL_ATTRIB_ID_ATTRIBUTE_TYPE, 4, - ZCL_FIELD_ID_ATTRIBUTE_TYPE, 4, ZCL_EVENT_ID_ATTRIBUTE_TYPE, 4, ZCL_COMMAND_ID_ATTRIBUTE_TYPE, 4, ZCL_ACTION_ID_ATTRIBUTE_TYPE, - 1, ZCL_TRANS_ID_ATTRIBUTE_TYPE, 4, ZCL_NODE_ID_ATTRIBUTE_TYPE, 8, ZCL_IPV4ADR_ATTRIBUTE_TYPE, 4, ZCL_IPV6ADR_ATTRIBUTE_TYPE, 16,