Remove no longer used APS/Zigbee decoding codepath.

Everything is using the IM code now.
project-chip · Jan 13, 2022 · 5d3fcbf · 5d3fcbf
1 parent 60347b6
commit 5d3fcbf
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 563 deletions.
diff --git a/examples/all-clusters-app/mbed/CMakeLists.txt b/examples/all-clusters-app/mbed/CMakeLists.txt
@@ -81,8 +81,6 @@ target_sources(${APP_TARGET} PRIVATE
                ${APP_UTIL}/ember-print.cpp
                ${APP_UTIL}/ember-compatibility-functions.cpp
                ${APP_UTIL}/message.cpp
-               ${APP_UTIL}/process-cluster-message.cpp
-               ${APP_UTIL}/process-global-message.cpp
                ${APP_UTIL}/util.cpp
                ${APP_UTIL}/error-mapping.cpp
 

diff --git a/examples/lighting-app/mbed/CMakeLists.txt b/examples/lighting-app/mbed/CMakeLists.txt
@@ -65,8 +65,6 @@ target_sources(${APP_TARGET} PRIVATE
                ${CHIP_ROOT}/src/app/util/ember-print.cpp
                ${CHIP_ROOT}/src/app/util/error-mapping.cpp
                ${CHIP_ROOT}/src/app/util/message.cpp
-               ${CHIP_ROOT}/src/app/util/process-cluster-message.cpp
-               ${CHIP_ROOT}/src/app/util/process-global-message.cpp
                ${CHIP_ROOT}/src/app/util/util.cpp
                ${CHIP_ROOT}/src/app/server/EchoHandler.cpp
                ${CHIP_ROOT}/src/app/server/Dnssd.cpp

diff --git a/examples/lighting-app/telink/CMakeLists.txt b/examples/lighting-app/telink/CMakeLists.txt
@@ -65,8 +65,6 @@ target_sources(app PRIVATE
                ${CHIP_ROOT}/src/app/util/ember-print.cpp
                ${CHIP_ROOT}/src/app/util/error-mapping.cpp
                ${CHIP_ROOT}/src/app/util/message.cpp
-               ${CHIP_ROOT}/src/app/util/process-cluster-message.cpp
-               ${CHIP_ROOT}/src/app/util/process-global-message.cpp
                ${CHIP_ROOT}/src/app/util/util.cpp
                ${CHIP_ROOT}/src/app/server/EchoHandler.cpp
                ${CHIP_ROOT}/src/app/server/Dnssd.cpp

diff --git a/examples/lock-app/mbed/CMakeLists.txt b/examples/lock-app/mbed/CMakeLists.txt
@@ -64,8 +64,6 @@ target_sources(${APP_TARGET} PRIVATE
                ${CHIP_ROOT}/src/app/util/ember-print.cpp
                ${CHIP_ROOT}/src/app/util/error-mapping.cpp
                ${CHIP_ROOT}/src/app/util/message.cpp
-               ${CHIP_ROOT}/src/app/util/process-cluster-message.cpp
-               ${CHIP_ROOT}/src/app/util/process-global-message.cpp
                ${CHIP_ROOT}/src/app/util/util.cpp
                ${CHIP_ROOT}/src/app/server/EchoHandler.cpp
                ${CHIP_ROOT}/src/app/server/Dnssd.cpp

diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
@@ -138,7 +138,6 @@ static_library("app") {
     "TimedRequest.h",
     "WriteClient.cpp",
     "WriteHandler.cpp",
-    "decoder.cpp",
     "encoder-common.cpp",
     "reporting/Engine.cpp",
     "reporting/Engine.h",

diff --git a/src/app/chip-zcl-zpro-codec.h b/src/app/chip-zcl-zpro-codec.h
@@ -42,23 +42,6 @@ typedef struct
     uint8_t radius;
 } EmberApsFrame;
 
-/** @brief Extracts an aps frame from buffer into outApsFrame
- * @param buffer Buffer to read from
- * @param buf_length Length of buffer
- * @param outApsFrame Pointer to EmberApsFrame struct to read into
- * @return returns the number of bytes that were consumed to read out the EmberApsFrame. 0 means an error was encountered
- */
-uint16_t extractApsFrame(uint8_t * buffer, uint16_t buf_length, EmberApsFrame * outApsFrame);
-
-/** @brief Populates msg with address of the zcl message within buffer.
- * @return Returns the length of msg buffer. Returns 0 on error e.g. if buffer is too short.
- */
-uint16_t extractMessage(uint8_t * buffer, uint16_t buffer_length, uint8_t ** msg);
-
-/** @brief Prints an aps frame struct
- */
-void printApsFrame(EmberApsFrame * frame);
-
 /**
  * @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

diff --git a/src/app/chip_data_model.cmake b/src/app/chip_data_model.cmake
@@ -93,8 +93,6 @@ function(chip_configure_data_model APP_TARGET)
         ${CHIP_APP_BASE_DIR}/util/ember-print.cpp
         ${CHIP_APP_BASE_DIR}/util/error-mapping.cpp
         ${CHIP_APP_BASE_DIR}/util/message.cpp
-        ${CHIP_APP_BASE_DIR}/util/process-cluster-message.cpp
-        ${CHIP_APP_BASE_DIR}/util/process-global-message.cpp
         ${CHIP_APP_BASE_DIR}/util/util.cpp
     )
 endfunction()
diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
@@ -110,8 +110,6 @@ template("chip_data_model") {
       "${_app_root}/util/ember-print.cpp",
       "${_app_root}/util/error-mapping.cpp",
       "${_app_root}/util/message.cpp",
-      "${_app_root}/util/process-cluster-message.cpp",
-      "${_app_root}/util/process-global-message.cpp",
       "${_app_root}/util/util.cpp",
       "${chip_root}/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp",
     ]

diff --git a/src/app/decoder.cpp b/src/app/decoder.cpp
diff --git a/src/app/util/process-cluster-message.cpp b/src/app/util/process-cluster-message.cpp