Remove Silicon Labs dotdot code, since it's not used anymore. (projec…

…t-chip#2006)

BUILD.gn

@@ -70,7 +70,6 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
 
     chip_test_group("tests") {
       deps = [
-        "${chip_root}/src/app/plugin/tests",
         "${chip_root}/src/ble/tests",
         "${chip_root}/src/crypto/tests",
         "${chip_root}/src/inet/tests",

configure.ac

@@ -2461,12 +2461,8 @@ third_party/ot-br-posix/Makefile
 src/Makefile
 src/include/Makefile
 src/app/Makefile
-src/app/chip-zcl/Makefile
 src/app/chip-zcl-zpro/Makefile
 src/app/clusters/Makefile
-src/app/gen/Makefile
-src/app/plugin/Makefile
-src/app/plugin/tests/Makefile
 src/app/util/Makefile
 src/ble/Makefile
 src/ble/tests/Makefile

examples/chip-tool/main.cpp

@@ -39,15 +39,16 @@
 
 #include <controller/CHIPDeviceController.h>
 
-extern "C" {
-#include "chip-zcl/chip-zcl.h"
-} // extern "C"
-
 #include "chip-zcl/chip-zcl-zpro-codec.h"
 
 // Delay, in seconds, between sends for the echo case.
 #define SEND_DELAY 5
 
+// Limits on endpoint values.  Could be wrong, if we start using endpoint 0 for
+// something.
+#define CHIP_ZCL_ENDPOINT_MIN 0x01
+#define CHIP_ZCL_ENDPOINT_MAX 0xF0
+
 using namespace ::chip;
 using namespace ::chip::Inet;
 

src/app/BUILD.gn

@@ -29,37 +29,6 @@ static_library("common") {
   sources = [
     "chip-zcl-zpro/command-encoder/encoder.c",
     "chip-zcl-zpro/command-encoder/decoder.c",
-    "chip-zcl/chip-zcl-buffer.h",
-    "chip-zcl/chip-zcl-codec.h",
-    "chip-zcl/chip-zcl-struct.h",
-    "chip-zcl/chip-zcl.h",
-    "gen/gen-attribute-storage.h",
-    "gen/gen-attribute-type.h",
-    "gen/gen-callback-stubs.c",
-    "gen/gen-callbacks.h",
-    "gen/gen-cluster-id.h",
-    "gen/gen-command-handler.c",
-    "gen/gen-command-handler.h",
-    "gen/gen-command-id.h",
-    "gen/gen-endpoint-config.h",
-    "gen/gen-global-command-handler.c",
-    "gen/gen-global-command-handler.h",
-    "gen/gen-specs.c",
-    "gen/gen-types.h",
-    "gen/gen.h",
-    "plugin/cluster-server-basic/basic-server.c",
-    "plugin/cluster-server-identify/identify-server.c",
-    "plugin/cluster-server-level-control/level-control-server-tokens.h",
-    "plugin/cluster-server-level-control/level-control-server.c",
-    "plugin/cluster-server-level-control/level-control-server.h",
-    "plugin/cluster-server-on-off/on-off-server-tokens.h",
-    "plugin/cluster-server-on-off/on-off-server.c",
-    "plugin/cluster-server-on-off/on-off-server.h",
-    "plugin/codec-simple/codec-simple.c",
-    "plugin/core-api/core-api.c",
-    "plugin/core-data-model/zcl-data-model.c",
-    "plugin/core-message-dispatch/dispatch.c",
-    "plugin/core-message-dispatch/dispatch.h",
   ]
 
   public_deps = [
@@ -74,16 +43,12 @@ static_library("common") {
 static_library("chip") {
   output_name = "libCHIPDataModel"
 
-  sources = [ "plugin/binding-chip/chip.cpp" ]
-
   public_deps = [ ":common" ]
 }
 
 static_library("mock") {
   output_name = "libCHIPDataModelMock"
 
-  sources = [ "plugin/binding-mock/mock.c" ]
-
   public_deps = [ ":common" ]
 }
 

src/app/DataModel.am

@@ -24,30 +24,7 @@
 #      must be anchored relative to the top build directory.
 #
 
-CHIP_BUILD_OLD_DATA_MODEL_SOURCE_FILES                                              = \
-    @top_builddir@/src/app/gen/gen-callback-stubs.c                                   \
-    @top_builddir@/src/app/gen/gen-command-handler.c                                  \
-    @top_builddir@/src/app/gen/gen-global-command-handler.c                           \
-    @top_builddir@/src/app/gen/gen-specs.c                                            \
-    @top_builddir@/src/app/plugin/binding-chip/chip.cpp                               \
-    @top_builddir@/src/app/plugin/cluster-server-basic/basic-server.c                 \
-    @top_builddir@/src/app/plugin/cluster-server-identify/identify-server.c           \
-    @top_builddir@/src/app/plugin/cluster-server-level-control/level-control-server.c \
-    @top_builddir@/src/app/plugin/cluster-server-on-off/on-off-server.c               \
-    @top_builddir@/src/app/plugin/codec-simple/codec-simple.c                         \
-    @top_builddir@/src/app/plugin/core-api/core-api.c                                 \
-    @top_builddir@/src/app/plugin/core-data-model/zcl-data-model.c                    \
-    @top_builddir@/src/app/plugin/core-message-dispatch/dispatch.c                    \
-    $(NULL)
-
 CHIP_BUILD_DATA_MODEL_SOURCE_FILES                                                  = \
     @top_builddir@/src/app/chip-zcl-zpro/command-encoder/encoder.c                    \
     @top_builddir@/src/app/chip-zcl-zpro/command-encoder/decoder.c                    \
     $(NULL)
-
-# Excluding this one for now because it has #include syntax that does
-# not actually compile
-#     plugin/core-data-model/zcl-struct.c
-
-# Excluding this one because it seems to rely on stuff that's not in our tree
-#     plugin/binding-silabs/silabs.c

src/app/Makefile.am

@@ -26,37 +26,28 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 # Package (e.g. 'make dist') these subdirectories
 
 DIST_SUBDIRS = \
-    chip-zcl \
     chip-zcl-zpro \
     clusters \
-    gen \
-    plugin \
     util \
     $(NULL)
 
 # Build (e.g for 'make all') these subdirectories
 
 SUBDIRS                               = \
-    gen                                 \
-    chip-zcl                            \
     chip-zcl-zpro                       \
-    plugin                              \
     $(NULL)
 
 include DataModel.am
 
 lib_LIBRARIES                         = libCHIPDataModel.a
 
 libCHIPDataModel_a_CPPFLAGS           = \
-    -I$(top_srcdir)/src/app/chip-zcl    \
-    -I$(top_srcdir)/src/app/gen         \
     -I$(top_srcdir)/src                 \
     -I$(top_srcdir)/src/lib             \
     $(NULL)
 
 libCHIPDataModel_a_SOURCES            = \
     $(CHIP_BUILD_DATA_MODEL_SOURCE_FILES) \
-    $(CHIP_BUILD_OLD_DATA_MODEL_SOURCE_FILES) \
     $(NULL)
 
 include $(abs_top_nlbuild_autotools_dir)/automake/post.am

src/app/README.md

@@ -2,14 +2,7 @@
 
 ## What is this?
 
-The purpose of this folder is to contain functional ZCL Advanced Platform (CHIP)
-plugins. A plugin is a discrete piece of Zigbee Cluster Library (ZCL)
-functionality. Each plugin contains message processing code for a "Cluster"
-within the Zigbee Cluster Library. Each plugin can be individually tested
-through its own unit test code and Makefile.
-
-## Usage
-
-To build and run unit tests on these CHIP plugins run
-
-| make test
+The purpose of this folder is to contain CHIP clusters and associated utilities.
+The cluster implementations live under the clusters/ directory. Utility files
+live in the util/ and chip-zcl-zpro/ directory: the former contains most of the
+utilities while the latter contains encoder/decoder utility functions.