Convert various app/util files to C++ (#3428)

project-chip · Oct 26, 2020 · e7480cd · e7480cd
1 parent 2a3d066
commit e7480cd
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 26 deletions.
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -88,18 +88,18 @@ efr32_executable("lighting_app") {
     "${chip_root}/examples/common/chip-app-server/DataModelHandler.cpp",
     "${chip_root}/src/app/clusters/on-off-server/on-off.c",
     "${chip_root}/src/app/util/af-event.cpp",
-    "${chip_root}/src/app/util/af-main-common.c",
+    "${chip_root}/src/app/util/af-main-common.cpp",
     "${chip_root}/src/app/util/attribute-size.c",
     "${chip_root}/src/app/util/attribute-storage.c",
     "${chip_root}/src/app/util/attribute-table.c",
     "${chip_root}/src/app/util/binding-table.cpp",
     "${chip_root}/src/app/util/chip-message-send.cpp",
     "${chip_root}/src/app/util/client-api.c",
     "${chip_root}/src/app/util/ember-print.cpp",
-    "${chip_root}/src/app/util/message.c",
+    "${chip_root}/src/app/util/message.cpp",
     "${chip_root}/src/app/util/process-cluster-message.c",
-    "${chip_root}/src/app/util/process-global-message.c",
-    "${chip_root}/src/app/util/util.c",
+    "${chip_root}/src/app/util/process-global-message.cpp",
+    "${chip_root}/src/app/util/util.cpp",
     "${examples_plat_dir}/${efr32_family}/${efr32_board}/hal-config.h",
     "${examples_plat_dir}/${efr32_family}/${efr32_board}/init_board.c",
     "${examples_plat_dir}/${efr32_family}/${efr32_board}/init_mcu.c",

diff --git a/examples/lighting-app/lighting-common/BUILD.gn b/examples/lighting-app/lighting-common/BUILD.gn
@@ -26,18 +26,18 @@ source_set("lighting-common") {
     "${chip_root}/examples/common/chip-app-server/DataModelHandler.cpp",
     "${chip_root}/src/app/clusters/on-off-server/on-off.c",
     "${chip_root}/src/app/util/af-event.cpp",
-    "${chip_root}/src/app/util/af-main-common.c",
+    "${chip_root}/src/app/util/af-main-common.cpp",
     "${chip_root}/src/app/util/attribute-size.c",
     "${chip_root}/src/app/util/attribute-storage.c",
     "${chip_root}/src/app/util/attribute-table.c",
     "${chip_root}/src/app/util/binding-table.cpp",
     "${chip_root}/src/app/util/chip-message-send.cpp",
     "${chip_root}/src/app/util/client-api.c",
     "${chip_root}/src/app/util/ember-print.cpp",
-    "${chip_root}/src/app/util/message.c",
+    "${chip_root}/src/app/util/message.cpp",
     "${chip_root}/src/app/util/process-cluster-message.c",
-    "${chip_root}/src/app/util/process-global-message.c",
-    "${chip_root}/src/app/util/util.c",
+    "${chip_root}/src/app/util/process-global-message.cpp",
+    "${chip_root}/src/app/util/util.cpp",
     "gen/call-command-handler.c",
     "gen/callback-stub.c",
     "gen/znet-bookkeeping.c",

diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt
@@ -43,16 +43,16 @@ target_sources(app PRIVATE
                ${CHIP_APP_SERVER}/QRCodeUtil.cpp
                ${CHIP_APP_SERVER}/RendezvousServer.cpp
                ${CHIP_ROOT}/src/app/util/af-event.cpp
-               ${CHIP_ROOT}/src/app/util/af-main-common.c
+               ${CHIP_ROOT}/src/app/util/af-main-common.cpp
                ${CHIP_ROOT}/src/app/util/attribute-size.c
                ${CHIP_ROOT}/src/app/util/attribute-storage.c
                ${CHIP_ROOT}/src/app/util/attribute-table.c
                ${CHIP_ROOT}/src/app/util/binding-table.cpp
                ${CHIP_ROOT}/src/app/util/chip-message-send.cpp
                ${CHIP_ROOT}/src/app/util/client-api.c
                ${CHIP_ROOT}/src/app/util/ember-print.cpp
-               ${CHIP_ROOT}/src/app/util/message.c
+               ${CHIP_ROOT}/src/app/util/message.cpp
                ${CHIP_ROOT}/src/app/util/process-cluster-message.c
-               ${CHIP_ROOT}/src/app/util/process-global-message.c
-               ${CHIP_ROOT}/src/app/util/util.c
+               ${CHIP_ROOT}/src/app/util/process-global-message.cpp
+               ${CHIP_ROOT}/src/app/util/util.cpp
                ${CHIP_ROOT}/src/app/clusters/on-off-server/on-off.c)
diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -88,18 +88,18 @@ efr32_executable("lock_app") {
     "${chip_root}/examples/common/chip-app-server/DataModelHandler.cpp",
     "${chip_root}/src/app/clusters/on-off-server/on-off.c",
     "${chip_root}/src/app/util/af-event.cpp",
-    "${chip_root}/src/app/util/af-main-common.c",
+    "${chip_root}/src/app/util/af-main-common.cpp",
     "${chip_root}/src/app/util/attribute-size.c",
     "${chip_root}/src/app/util/attribute-storage.c",
     "${chip_root}/src/app/util/attribute-table.c",
     "${chip_root}/src/app/util/binding-table.cpp",
     "${chip_root}/src/app/util/chip-message-send.cpp",
     "${chip_root}/src/app/util/client-api.c",
     "${chip_root}/src/app/util/ember-print.cpp",
-    "${chip_root}/src/app/util/message.c",
+    "${chip_root}/src/app/util/message.cpp",
     "${chip_root}/src/app/util/process-cluster-message.c",
-    "${chip_root}/src/app/util/process-global-message.c",
-    "${chip_root}/src/app/util/util.c",
+    "${chip_root}/src/app/util/process-global-message.cpp",
+    "${chip_root}/src/app/util/util.cpp",
     "${examples_plat_dir}/${efr32_family}/${efr32_board}/hal-config.h",
     "${examples_plat_dir}/${efr32_family}/${efr32_board}/init_board.c",
     "${examples_plat_dir}/${efr32_family}/${efr32_board}/init_mcu.c",

diff --git a/examples/lock-app/lock-common/BUILD.gn b/examples/lock-app/lock-common/BUILD.gn
@@ -27,18 +27,18 @@ source_set("lock-common") {
     "${chip_root}/examples/common/chip-app-server/DataModelHandler.cpp",
     "${chip_root}/src/app/clusters/on-off-server/on-off.c",
     "${chip_root}/src/app/util/af-event.cpp",
-    "${chip_root}/src/app/util/af-main-common.c",
+    "${chip_root}/src/app/util/af-main-common.cpp",
     "${chip_root}/src/app/util/attribute-size.c",
     "${chip_root}/src/app/util/attribute-storage.c",
     "${chip_root}/src/app/util/attribute-table.c",
     "${chip_root}/src/app/util/binding-table.cpp",
     "${chip_root}/src/app/util/chip-message-send.cpp",
     "${chip_root}/src/app/util/client-api.c",
     "${chip_root}/src/app/util/ember-print.cpp",
-    "${chip_root}/src/app/util/message.c",
+    "${chip_root}/src/app/util/message.cpp",
     "${chip_root}/src/app/util/process-cluster-message.c",
-    "${chip_root}/src/app/util/process-global-message.c",
-    "${chip_root}/src/app/util/util.c",
+    "${chip_root}/src/app/util/process-global-message.cpp",
+    "${chip_root}/src/app/util/util.cpp",
     "gen/call-command-handler.c",
     "gen/callback-stub.c",
     "gen/znet-bookkeeping.c",

diff --git a/examples/lock-app/nrfconnect/CMakeLists.txt b/examples/lock-app/nrfconnect/CMakeLists.txt
@@ -43,16 +43,16 @@ target_sources(app PRIVATE
                ${CHIP_APP_SERVER}/QRCodeUtil.cpp
                ${CHIP_APP_SERVER}/RendezvousServer.cpp
                ${CHIP_ROOT}/src/app/util/af-event.cpp
-               ${CHIP_ROOT}/src/app/util/af-main-common.c
+               ${CHIP_ROOT}/src/app/util/af-main-common.cpp
                ${CHIP_ROOT}/src/app/util/attribute-size.c
                ${CHIP_ROOT}/src/app/util/attribute-storage.c
                ${CHIP_ROOT}/src/app/util/attribute-table.c
                ${CHIP_ROOT}/src/app/util/binding-table.cpp
                ${CHIP_ROOT}/src/app/util/chip-message-send.cpp
                ${CHIP_ROOT}/src/app/util/client-api.c
                ${CHIP_ROOT}/src/app/util/ember-print.cpp
-               ${CHIP_ROOT}/src/app/util/message.c
+               ${CHIP_ROOT}/src/app/util/message.cpp
                ${CHIP_ROOT}/src/app/util/process-cluster-message.c
-               ${CHIP_ROOT}/src/app/util/process-global-message.c
-               ${CHIP_ROOT}/src/app/util/util.c
+               ${CHIP_ROOT}/src/app/util/process-global-message.cpp
+               ${CHIP_ROOT}/src/app/util/util.cpp
                ${CHIP_ROOT}/src/app/clusters/on-off-server/on-off.c)
diff --git a/src/app/clusters/ias-zone-client/ias-zone-client.h b/src/app/clusters/ias-zone-client/ias-zone-client.h
@@ -56,10 +56,18 @@ extern IasZoneDevice emberAfIasZoneClientKnownServers[];
 
 #define UNKNOWN_ZONE_ID 0xFF
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 void emAfClearServers(void);
 
 void emberAfPluginIasZoneClientZdoCallback(EmberNodeId emberNodeId, EmberApsFrame * apsFrame, uint8_t * message, uint16_t length);
 
 void emberAfPluginIasZoneClientWriteAttributesResponseCallback(EmberAfClusterId clusterId, uint8_t * buffer, uint16_t bufLen);
 
 void emberAfPluginIasZoneClientReadAttributesResponseCallback(EmberAfClusterId clusterId, uint8_t * buffer, uint16_t bufLen);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff --git a/src/app/util/af-main-common.c → src/app/util/af-main-common.cpp b/src/app/util/af-main-common.c → src/app/util/af-main-common.cpp
diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h
@@ -1500,7 +1500,7 @@ typedef struct
     EmberAfMessageSentFunction callback;
     EmberApsFrame * apsFrame;
     uint8_t * message;
-    uint16_t indexOrDestination;
+    uint64_t indexOrDestination;
     uint16_t messageLength;
     EmberOutgoingMessageType type;
     bool broadcast;

diff --git a/src/app/util/attribute-table.h b/src/app/util/attribute-table.h
@@ -46,6 +46,10 @@
 
 #define ZCL_NULL_ATTRIBUTE_TABLE_INDEX 0xFFFF
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
 // Remote devices writing attributes of local device
 EmberAfStatus emberAfWriteAttributeExternal(uint8_t endpoint, EmberAfClusterId cluster, EmberAfAttributeId attributeID,
                                             uint8_t mask, uint16_t manufacturerCode, uint8_t * dataPtr,
@@ -68,4 +72,8 @@ EmberAfStatus emAfWriteAttribute(uint8_t endpoint, EmberAfClusterId cluster, Emb
 EmberAfStatus emAfReadAttribute(uint8_t endpoint, EmberAfClusterId cluster, EmberAfAttributeId attributeID, uint8_t mask,
                                 uint16_t manufacturerCode, uint8_t * dataPtr, uint16_t readLength, EmberAfAttributeType * dataType);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
 #endif // ZCL_UTIL_ATTRIBUTE_TABLE_H
diff --git a/src/app/util/message.c → src/app/util/message.cpp b/src/app/util/message.c → src/app/util/message.cpp
diff --git a/src/app/util/process-global-message.c → src/app/util/process-global-message.cpp b/src/app/util/process-global-message.c → src/app/util/process-global-message.cpp
diff --git a/src/app/util/util.c → src/app/util/util.cpp b/src/app/util/util.c → src/app/util/util.cpp
@@ -69,7 +69,7 @@ const EmberAfClusterName zclClusterNames[] = {
     { ZCL_NULL_CLUSTER_ID, EMBER_AF_NULL_MANUFACTURER_CODE, NULL }, // terminator
 };
 
-static const EmberAfClusterCommand staticCmd;
+static const EmberAfClusterCommand staticCmd = {};
 EmberAfClusterCommand curCmd;
 // A pointer to the current command being processed
 // This struct is allocated on the stack inside
@@ -112,12 +112,14 @@ uint8_t emAfExtendedPanId[EXTENDED_PAN_ID_SIZE] = {
     0, 0, 0, 0, 0, 0, 0, 0,
 };
 
+extern "C" {
 #ifdef EMBER_AF_GENERATED_PLUGIN_INIT_FUNCTION_DECLARATIONS
 EMBER_AF_GENERATED_PLUGIN_INIT_FUNCTION_DECLARATIONS
 #endif
 #ifdef EMBER_AF_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS
 EMBER_AF_GENERATED_PLUGIN_TICK_FUNCTION_DECLARATIONS
 #endif
+} // extern "C"
 
 //------------------------------------------------------------------------------