Remove a bunch of just-about-dead Ember message send code.

examples/all-clusters-app/mbed/CMakeLists.txt

@@ -71,12 +71,10 @@ target_sources(${APP_TARGET} PRIVATE
 
                ${APP_UTIL}/DataModelHandler.cpp
                ${APP_UTIL}/af-event.cpp
-               ${APP_UTIL}/af-main-common.cpp
                ${APP_UTIL}/attribute-storage.cpp
                ${APP_UTIL}/attribute-table.cpp
                ${APP_UTIL}/attribute-size-util.cpp
                ${APP_UTIL}/binding-table.cpp
-               ${APP_UTIL}/chip-message-send.cpp
                ${APP_UTIL}/client-api.cpp
                ${APP_UTIL}/ember-print.cpp
                ${APP_UTIL}/ember-compatibility-functions.cpp

examples/lighting-app/telink/CMakeLists.txt

@@ -54,12 +54,10 @@ target_sources(app PRIVATE
                ${CHIP_ROOT}/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
                ${CHIP_ROOT}/src/app/util/DataModelHandler.cpp
                ${CHIP_ROOT}/src/app/util/af-event.cpp
-               ${CHIP_ROOT}/src/app/util/af-main-common.cpp
                ${CHIP_ROOT}/src/app/util/attribute-size-util.cpp
                ${CHIP_ROOT}/src/app/util/attribute-storage.cpp
                ${CHIP_ROOT}/src/app/util/attribute-table.cpp
                ${CHIP_ROOT}/src/app/util/binding-table.cpp
-               ${CHIP_ROOT}/src/app/util/chip-message-send.cpp
                ${CHIP_ROOT}/src/app/util/client-api.cpp
                ${CHIP_ROOT}/src/app/util/ember-compatibility-functions.cpp
                ${CHIP_ROOT}/src/app/util/ember-print.cpp

src/app/BUILD.gn

@@ -145,7 +145,6 @@ static_library("app") {
     "TimedRequest.h",
     "WriteClient.cpp",
     "WriteHandler.cpp",
-    "encoder-common.cpp",
     "reporting/Engine.cpp",
     "reporting/Engine.h",
   ]

src/app/chip-zcl-zpro-codec.h

@@ -41,38 +41,3 @@ typedef struct
     uint8_t sequence;
     uint8_t radius;
 } EmberApsFrame;
-
-/**
- * @brief Encode an APS frame into the given buffer.  Returns the number of
- * bytes of buffer used by the encoding or 0 if the given buffer is not big
- * enough.  If buffer is null, no encoding will happen; the function will
- * instead return the number of bytes that would be needed to encode the APS
- * frame.
- *
- * @param[in] buffer The buffer to write to.  If null, the call is in "count the
- *                   bytes" mode, and no writing will happen.
- * @parem[in] buf_length The size of the buffer.  Ignored if buffer is null.
- * @param[in] apsFrame The frame to encode.
- *
- * @return
- *   - If buffer is null, the number of bytes needed to encode.  If this number
- *     does not fit in a uint16_t, 0 will be returned.
- *   - If buffer is non-null but buf_length is not enough to hold the
- *     EmberApsFrame, 0.
- *   - If buffer is non-null and buf_length is large enough, the number of bytes
- *     placed in buffer.
- */
-uint16_t encodeApsFrame(uint8_t * buffer, uint16_t buf_length, EmberApsFrame * apsFrame);
-
-/**
- * @brief Encode the given informations into the given BufferWriter.
- * Returns the number of bytes of buffer used by the encoding or 0 if
- * the given buffer is not big enough.
- *
- * @return
- *   - If the buffer length is not enough to hold the EmberApsFrame, 0.
- *   - If the buffer length is large enough, the number of bytes placed in buffer.
- */
-uint16_t doEncodeApsFrame(chip::Encoding::LittleEndian::BufferWriter & buf, chip::ClusterId clusterId,
-                          chip::EndpointId sourceEndpoint, chip::EndpointId destinationEndpoint, EmberApsOption options,
-                          chip::GroupId groupId, uint8_t sequence, uint8_t radius, bool isMeasuring);

src/app/chip_data_model.cmake

@@ -81,12 +81,10 @@ function(chip_configure_data_model APP_TARGET)
         ${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/af-event.cpp
-        ${CHIP_APP_BASE_DIR}/util/af-main-common.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
-        ${CHIP_APP_BASE_DIR}/util/chip-message-send.cpp
         ${CHIP_APP_BASE_DIR}/util/client-api.cpp
         ${CHIP_APP_BASE_DIR}/util/DataModelHandler.cpp
         ${CHIP_APP_BASE_DIR}/util/ember-compatibility-functions.cpp

src/app/chip_data_model.gni

@@ -95,16 +95,13 @@ template("chip_data_model") {
       "${_app_root}/clusters/zll-level-control-server/zll-level-control-server.h",
       "${_app_root}/clusters/zll-on-off-server/zll-on-off-server.h",
       "${_app_root}/clusters/zll-scenes-server/zll-scenes-server.h",
-      "${_app_root}/encoder-common.cpp",
       "${_app_root}/reporting/reporting.h",
       "${_app_root}/util/DataModelHandler.cpp",
       "${_app_root}/util/af-event.cpp",
-      "${_app_root}/util/af-main-common.cpp",
       "${_app_root}/util/attribute-size-util.cpp",
       "${_app_root}/util/attribute-storage.cpp",
       "${_app_root}/util/attribute-table.cpp",
       "${_app_root}/util/binding-table.cpp",
-      "${_app_root}/util/chip-message-send.cpp",
       "${_app_root}/util/client-api.cpp",
       "${_app_root}/util/ember-compatibility-functions.cpp",
       "${_app_root}/util/ember-print.cpp",

src/app/clusters/ias-zone-server/ias-zone-server.cpp

@@ -184,10 +184,15 @@ static EmberStatus sendToClient(EndpointId endpoint)
     // emberAfSendCommandUnicastToBindings()
     emberAfSetCommandEndpoints(endpoint, 0);
 
+    // TODO: Figure out how this sending should actually work in Matter.
+#if 0
     // A binding table entry is created on Zone Enrollment for each endpoint, so
     // a simple call to SendCommandUnicastToBinding will handle determining the
     // destination endpoint, address, etc for us.
     status = emberAfSendCommandUnicastToBindings();
+#else
+    status     = EMBER_ERR_FATAL;
+#endif
 
     if (EMBER_SUCCESS != status)
     {