From 51f3c728d2aa7ae3f3f470b6917ca90bf3f8b543 Mon Sep 17 00:00:00 2001
From: puddly <32534428+puddly@users.noreply.github.com>
Date: Wed, 5 Jun 2024 17:17:12 -0400
Subject: [PATCH] Revert "Migrate `app.c` to `app.cpp`"
This reverts commit 591bd077061214b7b606956166d211d8a2eb53db.
---
src/ncp-uart-hw/.cproject | 121 -----------------------------
src/ncp-uart-hw/{app.cpp => app.c} | 32 +++-----
src/ncp-uart-hw/ncp-uart-hw.slcp | 2 +-
3 files changed, 13 insertions(+), 142 deletions(-)
rename src/ncp-uart-hw/{app.cpp => app.c} (96%)
diff --git a/src/ncp-uart-hw/.cproject b/src/ncp-uart-hw/.cproject
index 9bb2161c..012e244d 100644
--- a/src/ncp-uart-hw/.cproject
+++ b/src/ncp-uart-hw/.cproject
@@ -196,117 +196,6 @@
-
-
-
@@ -496,16 +385,6 @@
-
-
-
-
-
diff --git a/src/ncp-uart-hw/app.cpp b/src/ncp-uart-hw/app.c
similarity index 96%
rename from src/ncp-uart-hw/app.cpp
rename to src/ncp-uart-hw/app.c
index 9702a959..c93e7a83 100644
--- a/src/ncp-uart-hw/app.cpp
+++ b/src/ncp-uart-hw/app.c
@@ -15,19 +15,17 @@
*
******************************************************************************/
-extern "C" {
- #include PLATFORM_HEADER
- #include "ember.h"
- #include "ember-types.h"
- #include "ezsp-enum.h"
- #include "random.h"
- #include "mac-flat-header.h"
-
- #include "stack/include/message.h"
- #include "app/ncp/plugin/xncp/xncp.h"
-
- #include "config/xncp_config.h"
-}
+#include PLATFORM_HEADER
+#include "ember.h"
+#include "ember-types.h"
+#include "ezsp-enum.h"
+#include "random.h"
+#include "mac-flat-header.h"
+
+#include "stack/include/message.h"
+#include "app/ncp/plugin/xncp/xncp.h"
+
+#include "config/xncp_config.h"
#define BUILD_UINT16(low, high) (((uint16_t)(low) << 0) | ((uint16_t)(high) << 8))
@@ -89,7 +87,6 @@ ManualSourceRoute* get_manual_source_route(EmberNodeId destination)
*
* Application framework equivalent of ::emberRadioNeedsCalibratingHandler
*/
-extern "C"
void emberAfRadioNeedsCalibratingCallback(void)
{
sl_mac_calibrate_current_channel();
@@ -98,7 +95,6 @@ void emberAfRadioNeedsCalibratingCallback(void)
/** @brief Init
* Application init function
*/
-extern "C"
void emberAfMainInitCallback(void)
{
for (uint8_t i = 0; i < XNCP_MANUAL_SOURCE_ROUTE_TABLE_SIZE; i++) {
@@ -111,7 +107,6 @@ void emberAfMainInitCallback(void)
* Filters and/or mutates incoming packets. Currently used only for wildcard multicast
* group membership.
*/
-extern "C"
EmberPacketAction sli_zigbee_af_packet_handoff_incoming_callback(EmberZigbeePacketType packetType,
EmberMessageBuffer packetBuffer,
uint8_t index,
@@ -155,7 +150,6 @@ EmberPacketAction sli_zigbee_af_packet_handoff_incoming_callback(EmberZigbeePack
*
* Filters and/or mutates outgoing packets.
*/
-extern "C"
EmberPacketAction sli_zigbee_af_packet_handoff_outgoing_callback(EmberZigbeePacketType packetType,
EmberMessageBuffer packetBuffer,
uint8_t index,
@@ -165,7 +159,6 @@ EmberPacketAction sli_zigbee_af_packet_handoff_outgoing_callback(EmberZigbeePack
}
-extern "C"
void nc_zigbee_override_append_source_route(EmberNodeId destination,
EmberMessageBuffer *header,
bool *consumed)
@@ -193,7 +186,6 @@ void nc_zigbee_override_append_source_route(EmberNodeId destination,
}
-extern "C"
EmberStatus emberAfPluginXncpIncomingCustomFrameCallback(uint8_t messageLength,
uint8_t *messagePayload,
uint8_t *replyPayloadLength,
@@ -290,7 +282,7 @@ EmberStatus emberAfPluginXncpIncomingCustomFrameCallback(uint8_t messageLength,
}
uint8_t token_id = messagePayload[0];
- const char *override_value;
+ char *override_value;
switch (token_id) {
case EZSP_MFG_STRING: {
diff --git a/src/ncp-uart-hw/ncp-uart-hw.slcp b/src/ncp-uart-hw/ncp-uart-hw.slcp
index 3c8b1bfc..06962e78 100644
--- a/src/ncp-uart-hw/ncp-uart-hw.slcp
+++ b/src/ncp-uart-hw/ncp-uart-hw.slcp
@@ -24,7 +24,7 @@ readme:
- {path: readme.html}
source:
- {path: main.c}
-- {path: app.cpp}
+- {path: app.c}
tag: [prebuilt_demo]
sdk: {id: gecko_sdk, version: 4.4.2}
toolchain_settings: []