diff --git a/examples/all-clusters-app/all-clusters-common/BUILD.gn b/examples/all-clusters-app/all-clusters-common/BUILD.gn index 90751a8106cea9..0210fcedb2c646 100644 --- a/examples/all-clusters-app/all-clusters-common/BUILD.gn +++ b/examples/all-clusters-app/all-clusters-common/BUILD.gn @@ -22,5 +22,4 @@ chip_data_model("all-clusters-common") { zap_pregenerated_dir = "${chip_root}/zzz_generated/all-clusters-app/zap-generated" is_server = true - use_default_client_callbacks = true } diff --git a/examples/lighting-app/mbed/CMakeLists.txt b/examples/lighting-app/mbed/CMakeLists.txt index c0965aeca4f35c..e4734238239a72 100644 --- a/examples/lighting-app/mbed/CMakeLists.txt +++ b/examples/lighting-app/mbed/CMakeLists.txt @@ -54,7 +54,6 @@ target_sources(${APP_TARGET} PRIVATE ) chip_configure_data_model(${APP_TARGET} - INCLUDE_CLIENT_CALLBACKS INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lighting-common/lighting-app.zap GEN_DIR ${GEN_DIR}/lighting-app/zap-generated diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt index 88b1299a3fcdf1..c02a3901afd693 100644 --- a/examples/lighting-app/nrfconnect/CMakeLists.txt +++ b/examples/lighting-app/nrfconnect/CMakeLists.txt @@ -95,7 +95,6 @@ target_sources(app PRIVATE ${CHIP_ROOT}/src/app/clusters/ota-requestor/BDXDownloader.cpp) chip_configure_data_model(app - INCLUDE_CLIENT_CALLBACKS INCLUDE_SERVER ZAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../lighting-common/lighting-app.zap GEN_DIR ${GEN_DIR}/lighting-app/zap-generated diff --git a/examples/ota-requestor-app/ameba/chip_main.cmake b/examples/ota-requestor-app/ameba/chip_main.cmake index 3c465745960670..9f3b556f74e171 100644 --- a/examples/ota-requestor-app/ameba/chip_main.cmake +++ b/examples/ota-requestor-app/ameba/chip_main.cmake @@ -25,7 +25,6 @@ list( ${chip_dir}/src/app/clusters/ota-requestor/BDXDownloader.cpp ${chip_dir}/src/app/clusters/ota-requestor/OTARequestor.cpp ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp - ${chip_dir}/src/app/util/im-client-callbacks.cpp ) add_library( diff --git a/examples/ota-requestor-app/mbed/CMakeLists.txt b/examples/ota-requestor-app/mbed/CMakeLists.txt index 5e956b4af0fd01..943802cf07245b 100644 --- a/examples/ota-requestor-app/mbed/CMakeLists.txt +++ b/examples/ota-requestor-app/mbed/CMakeLists.txt @@ -59,7 +59,6 @@ target_sources(${APP_TARGET} PRIVATE chip_configure_data_model(${APP_TARGET} INCLUDE_SERVER - INCLUDE_CLIENT_CALLBACKS ZAP_FILE ${CHIP_ROOT}/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap GEN_DIR ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated ) diff --git a/examples/ota-requestor-app/ota-requestor-common/BUILD.gn b/examples/ota-requestor-app/ota-requestor-common/BUILD.gn index 4ba7b05ddb2b2e..edce1324ea7e1f 100644 --- a/examples/ota-requestor-app/ota-requestor-common/BUILD.gn +++ b/examples/ota-requestor-app/ota-requestor-common/BUILD.gn @@ -26,8 +26,6 @@ chip_data_model("ota-requestor-common") { zap_pregenerated_dir = "${chip_root}/zzz_generated/ota-requestor-app/zap-generated" - use_default_client_callbacks = true - deps = [ "${chip_root}/src/lib" ] public_configs = [ ":config" ] diff --git a/examples/tv-app/tv-common/BUILD.gn b/examples/tv-app/tv-common/BUILD.gn index 181f688fd286bf..f723e6f0db12f1 100644 --- a/examples/tv-app/tv-common/BUILD.gn +++ b/examples/tv-app/tv-common/BUILD.gn @@ -21,5 +21,4 @@ chip_data_model("tv-common") { zap_pregenerated_dir = "${chip_root}/zzz_generated/tv-app/zap-generated" is_server = true - use_default_client_callbacks = true } diff --git a/examples/tv-casting-app/tv-casting-common/BUILD.gn b/examples/tv-casting-app/tv-casting-common/BUILD.gn index 2c65903dbde9ee..7b88b5a710e901 100644 --- a/examples/tv-casting-app/tv-casting-common/BUILD.gn +++ b/examples/tv-casting-app/tv-casting-common/BUILD.gn @@ -22,5 +22,4 @@ chip_data_model("tv-casting-common") { zap_pregenerated_dir = "${chip_root}/zzz_generated/tv-casting-app/zap-generated" is_server = true - use_default_client_callbacks = true } diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake index de8e9a3933c84c..b4b7a8f8bb64fd 100644 --- a/src/app/chip_data_model.cmake +++ b/src/app/chip_data_model.cmake @@ -54,13 +54,7 @@ endfunction() # supported by the application. # function(chip_configure_data_model APP_TARGET) - cmake_parse_arguments(ARG "INCLUDE_CLIENT_CALLBACKS;INCLUDE_SERVER" "ZAP_FILE;GEN_DIR" "" ${ARGN}) - - if (ARG_INCLUDE_CLIENT_CALLBACKS) - target_sources(${APP_TARGET} PRIVATE - ${CHIP_APP_BASE_DIR}/util/im-client-callbacks.cpp - ) - endif() + cmake_parse_arguments(ARG "INCLUDE_SERVER" "ZAP_FILE;GEN_DIR" "" ${ARGN}) if (ARG_INCLUDE_SERVER) target_sources(${APP_TARGET} PRIVATE diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni index 8ed412de909adf..d9274b1ef55ddf 100644 --- a/src/app/chip_data_model.gni +++ b/src/app/chip_data_model.gni @@ -35,9 +35,6 @@ _zap_cluster_list_script = get_path_info("zap_cluster_list.py", "abspath") # Names of the clusters directories to compile. # Deprecated, specify zap_file instead. # -# use_default_client_callbacks -# Include im-client-callbacks.cpp. -# # Forwards all the remaining variables to the source_set. # template("chip_data_model") { @@ -56,10 +53,6 @@ template("chip_data_model") { _use_tests_apis = defined(invoker.use_tests_apis) && invoker.use_tests_apis - _use_default_client_callbacks = - defined(invoker.use_default_client_callbacks) && - invoker.use_default_client_callbacks - source_set(_data_model_name) { forward_variables_from(invoker, "*", @@ -67,7 +60,6 @@ template("chip_data_model") { "zap_pregenerated_dir", "cluster_sources", "zap_file", - "use_default_client_callbacks", "is_server", ]) @@ -172,10 +164,6 @@ template("chip_data_model") { sources += [ "${invoker.zap_pregenerated_dir}/CHIPClusters.h" ] } - if (_use_default_client_callbacks) { - sources += [ "${_app_root}/util/im-client-callbacks.cpp" ] - } - if (_use_default_im_dispatch) { sources += [ "${invoker.zap_pregenerated_dir}/IMClusterCommandHandler.cpp" ] diff --git a/src/app/util/im-client-callbacks.cpp b/src/app/util/im-client-callbacks.cpp deleted file mode 100644 index 705cca3fba4340..00000000000000 --- a/src/app/util/im-client-callbacks.cpp +++ /dev/null @@ -1,383 +0,0 @@ -/* - * - * Copyright (c) 2021 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 - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace ::chip; - -void LogStatus(uint8_t status) -{ - switch (status) - { - case EMBER_ZCL_STATUS_SUCCESS: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_SUCCESS (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_FAILURE: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_FAILURE (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_INVALID_SUBSCRIPTION: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_INVALID_SUBSCRIPTION (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_MALFORMED_COMMAND: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_MALFORMED_COMMAND (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNSUPPORTED_COMMAND: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNSUPPORTED_COMMAND (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATED82: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATED82 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATED83: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATED83 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATED84: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATED84 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_INVALID_COMMAND: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_INVALID_COMMAND (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_INVALID_VALUE: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_INVALID_VALUE (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNSUPPORTED_WRITE: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNSUPPORTED_WRITE (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DUPLICATE_EXISTS: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DUPLICATE_EXISTS (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_NOT_FOUND: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_NOT_FOUND (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNREPORTABLE_ATTRIBUTE: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNREPORTABLE_ATTRIBUTE (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_INVALID_DATA_TYPE: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_INVALID_DATA_TYPE (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATED8E: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATED8E (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNSUPPORTED_READ: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNSUPPORTED_READ (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATED90: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATED90 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATED91: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATED91 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DATA_VERSION_MISMATCH: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DATA_VERSION_MISMATCH (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATED93: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATED93 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_TIMEOUT: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_TIMEOUT (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_RESERVED95: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_RESERVED95 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_RESERVED96: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_RESERVED96 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_RESERVED97: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_RESERVED97 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_RESERVED98: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_RESERVED98 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_RESERVED99: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_RESERVED99 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_RESERVED9A: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_RESERVED9A (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_BUSY: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_BUSY (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATEDC0: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATEDC0 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATEDC1: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATEDC1 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNSUPPORTED_CLUSTER (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_DEPRECATEDC4: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_DEPRECATEDC4 (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_NO_UPSTREAM_SUBSCRIPTION: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_NO_UPSTREAM_SUBSCRIPTION (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_NEEDS_TIMED_INTERACTION: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_NEEDS_TIMED_INTERACTION (0x%02x)", status); - break; - case EMBER_ZCL_STATUS_UNSUPPORTED_EVENT: - ChipLogProgress(Zcl, " status: EMBER_ZCL_STATUS_UNSUPPORTED_EVENT (0x%02x)", status); - break; - default: - ChipLogError(Zcl, "Unknown status: 0x%02x", status); - break; - } -} - -static void LogIMStatus(Protocols::InteractionModel::Status status) -{ - switch (status) - { - case Protocols::InteractionModel::Status::Success: - ChipLogProgress(Zcl, " status: Success (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Failure: - ChipLogProgress(Zcl, " status: Failure (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::InvalidSubscription: - ChipLogProgress(Zcl, " status: InvalidSubscription (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnsupportedAccess: - ChipLogProgress(Zcl, " status: UnsupportedAccess (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnsupportedEndpoint: - ChipLogProgress(Zcl, " status: UnsupportedEndpoint (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::InvalidAction: - ChipLogProgress(Zcl, " status: InvalidAction (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnsupportedCommand: - ChipLogProgress(Zcl, " status: UnsupportedCommand (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecated82: - ChipLogProgress(Zcl, " status: Deprecated82 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecated83: - ChipLogProgress(Zcl, " status: Deprecated83 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecated84: - ChipLogProgress(Zcl, " status: Deprecated84 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::InvalidCommand: - ChipLogProgress(Zcl, " status: InvalidCommand (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnsupportedAttribute: - ChipLogProgress(Zcl, " status: UnsupportedAttribute (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::ConstraintError: - ChipLogProgress(Zcl, " status: InvalidValue (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnsupportedWrite: - ChipLogProgress(Zcl, " status: UnsupportedWrite (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::ResourceExhausted: - ChipLogProgress(Zcl, " status: ResourceExhausted (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecated8a: - ChipLogProgress(Zcl, " status: Deprecated8a (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::NotFound: - ChipLogProgress(Zcl, " status: NotFound (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnreportableAttribute: - ChipLogProgress(Zcl, " status: UnreportableAttribute (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::InvalidDataType: - ChipLogProgress(Zcl, " status: InvalidDataType (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecated8e: - ChipLogProgress(Zcl, " status: Deprecated8e (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnsupportedRead: - ChipLogProgress(Zcl, " status: UnsupportedRead (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecated90: - ChipLogProgress(Zcl, " status: Deprecated90 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecated91: - ChipLogProgress(Zcl, " status: Deprecated91 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::DataVersionMismatch: - ChipLogProgress(Zcl, " status: DataVersionMismatch (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecated93: - ChipLogProgress(Zcl, " status: Deprecated93 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Timeout: - ChipLogProgress(Zcl, " status: Timeout (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Reserved95: - ChipLogProgress(Zcl, " status: Reserved95 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Reserved96: - ChipLogProgress(Zcl, " status: Reserved96 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Reserved97: - ChipLogProgress(Zcl, " status: Reserved97 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Reserved98: - ChipLogProgress(Zcl, " status: Reserved98 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Reserved99: - ChipLogProgress(Zcl, " status: Reserved99 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Reserved9a: - ChipLogProgress(Zcl, " status: Reserved9a (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Busy: - ChipLogProgress(Zcl, " status: Busy (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecatedc0: - ChipLogProgress(Zcl, " status: Deprecatedc0 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecatedc1: - ChipLogProgress(Zcl, " status: Deprecatedc1 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecatedc2: - ChipLogProgress(Zcl, " status: Deprecatedc2 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnsupportedCluster: - ChipLogProgress(Zcl, " status: UnsupportedCluster (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::Deprecatedc4: - ChipLogProgress(Zcl, " status: Deprecatedc4 (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::NoUpstreamSubscription: - ChipLogProgress(Zcl, " status: NoUpstreamSubscription (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::NeedsTimedInteraction: - ChipLogProgress(Zcl, " status: NeedsTimedInteraction (0x%02" PRIx8 ")", to_underlying(status)); - break; - case Protocols::InteractionModel::Status::UnsupportedEvent: - ChipLogProgress(Zcl, " status: UnsupportedEvent (0x%02" PRIx8 ")", to_underlying(status)); - break; - default: - ChipLogError(Zcl, "Unknown status: 0x%02" PRIx8, to_underlying(status)); - break; - } -} - -// Singleton instance of the callbacks manager -static app::CHIPDeviceCallbacksMgr & gCallbacks = app::CHIPDeviceCallbacksMgr::GetInstance(); - -bool IMWriteResponseCallback(const chip::app::WriteClient * writeClient, chip::Protocols::InteractionModel::Status status) -{ - ChipLogProgress(Zcl, "WriteResponse:"); - LogIMStatus(status); - - Callback::Cancelable * onSuccessCallback = nullptr; - Callback::Cancelable * onFailureCallback = nullptr; - CHIP_ERROR err = - gCallbacks.GetResponseCallback(reinterpret_cast(writeClient), 0, &onSuccessCallback, &onFailureCallback); - - if (CHIP_NO_ERROR != err) - { - if (onSuccessCallback == nullptr) - { - ChipLogDetail(Zcl, "%s: Missing success callback", __FUNCTION__); - } - - if (onFailureCallback == nullptr) - { - ChipLogDetail(Zcl, "%s: Missing failure callback", __FUNCTION__); - } - - return true; - } - - if (status == Protocols::InteractionModel::Status::Success) - { - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext); - } - else - { - Callback::Callback * cb = - Callback::Callback::FromCancelable(onFailureCallback); - cb->mCall(cb->mContext, static_cast(to_underlying(status))); - } - - return true; -} - -bool emberAfDefaultResponseCallback(ClusterId clusterId, CommandId commandId, EmberAfStatus status) -{ - ChipLogProgress(Zcl, "DefaultResponse:"); - ChipLogProgress(Zcl, " ClusterId: " ChipLogFormatMEI, ChipLogValueMEI(clusterId)); - ChipLogProgress(Zcl, " CommandId: " ChipLogFormatMEI, ChipLogValueMEI(commandId)); - LogStatus(status); - - Callback::Cancelable * onSuccessCallback = nullptr; - Callback::Cancelable * onFailureCallback = nullptr; - NodeId sourceId = emberAfCurrentCommand()->SourceNodeId(); - uint8_t sequenceNumber = emberAfCurrentCommand()->seqNum; - CHIP_ERROR err = gCallbacks.GetResponseCallback(sourceId, sequenceNumber, &onSuccessCallback, &onFailureCallback); - - if (CHIP_NO_ERROR != err) - { - if (onSuccessCallback == nullptr) - { - ChipLogDetail(Zcl, "%s: Missing success callback", __FUNCTION__); - } - - if (onFailureCallback == nullptr) - { - ChipLogDetail(Zcl, "%s: Missing failure callback", __FUNCTION__); - } - - return true; - } - - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - Callback::Callback * cb = - Callback::Callback::FromCancelable(onSuccessCallback); - cb->mCall(cb->mContext); - } - else - { - Callback::Callback * cb = - Callback::Callback::FromCancelable(onFailureCallback); - cb->mCall(cb->mContext, static_cast(status)); - } - - return true; -} diff --git a/src/app/util/im-client-callbacks.h b/src/app/util/im-client-callbacks.h index e972553eabf5d6..0ecf06f273468e 100644 --- a/src/app/util/im-client-callbacks.h +++ b/src/app/util/im-client-callbacks.h @@ -26,9 +26,6 @@ #include #include -bool IMWriteResponseCallback(const chip::app::WriteClient * writeClient, chip::Protocols::InteractionModel::Status status); -void LogStatus(uint8_t status); - // Global Response Callbacks typedef void (*DefaultSuccessCallback)(void * context); typedef void (*DefaultFailureCallback)(void * context, uint8_t status); diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn index 879f69e3c4d418..495d3551e97917 100644 --- a/src/controller/data_model/BUILD.gn +++ b/src/controller/data_model/BUILD.gn @@ -26,7 +26,6 @@ chip_data_model("data_model") { "${chip_root}/zzz_generated/controller-clusters/zap-generated" use_tests_apis = true - use_default_client_callbacks = true allow_circular_includes_from = [ "${chip_root}/src/controller" ] } diff --git a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj index 68898a8257b295..2ffa77d0ce5fb7 100644 --- a/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/CHIP.xcodeproj/project.pbxproj @@ -45,7 +45,6 @@ 2CB7163B252E8A7B0026E2BB /* CHIPDevicePairingDelegateBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CB71638252E8A7B0026E2BB /* CHIPDevicePairingDelegateBridge.h */; }; 2CB7163C252E8A7C0026E2BB /* CHIPDevicePairingDelegateBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2CB71639252E8A7B0026E2BB /* CHIPDevicePairingDelegateBridge.mm */; }; 2CB7163F252F731E0026E2BB /* CHIPDevicePairingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CB7163E252F731E0026E2BB /* CHIPDevicePairingDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2F79A67726CE6672006377B0 /* im-client-callbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F79A67626CE6672006377B0 /* im-client-callbacks.cpp */; }; 2FD775552695557E00FF4B12 /* error-mapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2FD775542695557E00FF4B12 /* error-mapping.cpp */; }; 5129BCFD26A9EE3300122DDF /* CHIPError.h in Headers */ = {isa = PBXBuildFile; fileRef = 5129BCFC26A9EE3300122DDF /* CHIPError.h */; settings = {ATTRIBUTES = (Public, ); }; }; 513DDB862761F69300DAA01A /* CHIPAttributeTLVValueDecoder_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 513DDB852761F69300DAA01A /* CHIPAttributeTLVValueDecoder_Internal.h */; }; @@ -133,7 +132,6 @@ 2CB71638252E8A7B0026E2BB /* CHIPDevicePairingDelegateBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHIPDevicePairingDelegateBridge.h; sourceTree = ""; }; 2CB71639252E8A7B0026E2BB /* CHIPDevicePairingDelegateBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CHIPDevicePairingDelegateBridge.mm; sourceTree = ""; }; 2CB7163E252F731E0026E2BB /* CHIPDevicePairingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHIPDevicePairingDelegate.h; sourceTree = ""; }; - 2F79A67626CE6672006377B0 /* im-client-callbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "im-client-callbacks.cpp"; path = "../../../app/util/im-client-callbacks.cpp"; sourceTree = ""; }; 2FD775542695557E00FF4B12 /* error-mapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "error-mapping.cpp"; path = "../../../app/util/error-mapping.cpp"; sourceTree = ""; }; 5129BCFC26A9EE3300122DDF /* CHIPError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CHIPError.h; path = CHIP/CHIPError.h; sourceTree = ""; }; 513DDB852761F69300DAA01A /* CHIPAttributeTLVValueDecoder_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHIPAttributeTLVValueDecoder_Internal.h; sourceTree = ""; }; @@ -200,7 +198,6 @@ 1E857311265519DE0050A4D9 /* CHIPApp */ = { isa = PBXGroup; children = ( - 2F79A67626CE6672006377B0 /* im-client-callbacks.cpp */, 2FD775542695557E00FF4B12 /* error-mapping.cpp */, 1E85731926551A490050A4D9 /* af-event.cpp */, 1E85731B26551A490050A4D9 /* af-main-common.cpp */, @@ -503,7 +500,6 @@ 991DC0892475F47D00C13860 /* CHIPDeviceController.mm in Sources */, B2E0D7B7245B0B5C003C5B48 /* CHIPQRCodeSetupPayloadParser.mm in Sources */, 1EC4CE5D25CC26E900D7304F /* CHIPClustersObjc.mm in Sources */, - 2F79A67726CE6672006377B0 /* im-client-callbacks.cpp in Sources */, 1E85732226551A490050A4D9 /* binding-table.cpp in Sources */, 1ED276E226C5812A00547A89 /* CHIPCluster.mm in Sources */, 1E85732526551A490050A4D9 /* message.cpp in Sources */,