Prefix XNCP config

NabuCasa · May 29, 2024 · 9f92e1f · 9f92e1f
1 parent 273a53d
commit 9f92e1f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/ncp-uart-hw/app.c b/src/ncp-uart-hw/app.c
@@ -48,7 +48,7 @@ typedef struct ManualSourceRoute {
   uint16_t relays[EMBER_MAX_SOURCE_ROUTE_RELAY_COUNT];
 } ManualSourceRoute;
 
-ManualSourceRoute manual_source_routes[MANUAL_SOURCE_ROUTE_TABLE_SIZE];
+ManualSourceRoute manual_source_routes[XNCP_MANUAL_SOURCE_ROUTE_TABLE_SIZE];
 
 //----------------------
 // Implemented Callbacks
@@ -67,7 +67,7 @@ void emberAfRadioNeedsCalibratingCallback(void)
  */
 void emberAfMainInitCallback(void)
 {
-  for (uint8_t i = 0; i < MANUAL_SOURCE_ROUTE_TABLE_SIZE; i++) {
+  for (uint8_t i = 0; i < XNCP_MANUAL_SOURCE_ROUTE_TABLE_SIZE; i++) {
     manual_source_routes[i].active = false;
   }
 }
@@ -106,7 +106,7 @@ void nc_zigbee_override_append_source_route(EmberNodeId destination,
 {
   uint8_t index = 0xFF;
 
-  for (uint8_t i = 0; i < MANUAL_SOURCE_ROUTE_TABLE_SIZE; i++) {
+  for (uint8_t i = 0; i < XNCP_MANUAL_SOURCE_ROUTE_TABLE_SIZE; i++) {
     if (manual_source_routes[i].active && (manual_source_routes[i].destination == destination)) {
       index = i;
       break;
@@ -169,10 +169,10 @@ EmberStatus emberAfPluginXncpIncomingCustomFrameCallback(uint8_t messageLength,
       }
 
       // If we don't find a better index, pick one at random to replace
-      uint8_t insertion_index = emberGetPseudoRandomNumber() % MANUAL_SOURCE_ROUTE_TABLE_SIZE;
+      uint8_t insertion_index = emberGetPseudoRandomNumber() % XNCP_MANUAL_SOURCE_ROUTE_TABLE_SIZE;
       uint16_t node_id = BUILD_UINT16(messagePayload[2], messagePayload[3]);
 
-      for (uint8_t i = 0; i < MANUAL_SOURCE_ROUTE_TABLE_SIZE; i++) {
+      for (uint8_t i = 0; i < XNCP_MANUAL_SOURCE_ROUTE_TABLE_SIZE; i++) {
         ManualSourceRoute *route = &manual_source_routes[i];
 
         if (route->active == false) {

diff --git a/src/ncp-uart-hw/config/xncp_config.h b/src/ncp-uart-hw/config/xncp_config.h
@@ -4,6 +4,6 @@
 // Table entries are ephemeral and are expected to be populated before a request is sent.
 // This is not the size of any source route table! Rather, this controls how many unique
 // destinations can be concurrently contacted with source routing enabled.
-#define MANUAL_SOURCE_ROUTE_TABLE_SIZE  (20)
+#define XNCP_MANUAL_SOURCE_ROUTE_TABLE_SIZE  (20)
 
 #endif /* CONFIG_XNCP_CONFIG_H_ */