diff --git a/examples/lighting-app/efr32/src/gen/callback-stub.c b/examples/lighting-app/efr32/src/gen/callback-stub.c index 929e192c50e398..7d08f5cab34431 100644 --- a/examples/lighting-app/efr32/src/gen/callback-stub.c +++ b/examples/lighting-app/efr32/src/gen/callback-stub.c @@ -1765,21 +1765,6 @@ bool emberAfPluginNetworkSteeringGetDistributedKeyCallback(EmberKeyData * key) return false; } -/** @brief Get Node Type - * - * This callback allows the application to set the node type that the network - * steering process will use in joining a network. - * - * @param state The current ::EmberAfPluginNetworkSteeringJoiningState. - * - * @return An ::EmberNodeType value that the network steering process will - * try to join a network as. - */ -EmberNodeType emberAfPluginNetworkSteeringGetNodeTypeCallback(EmberAfPluginNetworkSteeringJoiningState state) -{ - return ((emAfCurrentZigbeeProNetwork->nodeType == EMBER_COORDINATOR) ? EMBER_ROUTER : emAfCurrentZigbeeProNetwork->nodeType); -} - /** @brief Get Power For Radio Channel * * This callback is fired when the Network Steering plugin needs to set the diff --git a/examples/lighting-app/lighting-common/gen/callback-stub.c b/examples/lighting-app/lighting-common/gen/callback-stub.c index 50d94e92b6c2e4..855fd78a9ecf95 100644 --- a/examples/lighting-app/lighting-common/gen/callback-stub.c +++ b/examples/lighting-app/lighting-common/gen/callback-stub.c @@ -1765,21 +1765,6 @@ bool emberAfPluginNetworkSteeringGetDistributedKeyCallback(EmberKeyData * key) return false; } -/** @brief Get Node Type - * - * This callback allows the application to set the node type that the network - * steering process will use in joining a network. - * - * @param state The current ::EmberAfPluginNetworkSteeringJoiningState. - * - * @return An ::EmberNodeType value that the network steering process will - * try to join a network as. - */ -EmberNodeType emberAfPluginNetworkSteeringGetNodeTypeCallback(EmberAfPluginNetworkSteeringJoiningState state) -{ - return ((emAfCurrentZigbeeProNetwork->nodeType == EMBER_COORDINATOR) ? EMBER_ROUTER : emAfCurrentZigbeeProNetwork->nodeType); -} - /** @brief Get Power For Radio Channel * * This callback is fired when the Network Steering plugin needs to set the @@ -2485,8 +2470,6 @@ bool emberAfIsCurrentSecurityProfileSmartEnergy(void) const EmberAfOtaImageId emberAfInvalidImageId; -const EmAfZigbeeProNetwork * emAfCurrentZigbeeProNetwork = NULL; - void emberAfPluginUpdateTcLinkKeyZigbeeKeyEstablishmentCallback(EmberEUI64 partner, EmberKeyStatus status) {} void emberAfPluginNetworkSteeringMarker(void) {} diff --git a/examples/lock-app/efr32/src/gen/callback-stub.c b/examples/lock-app/efr32/src/gen/callback-stub.c index 13fce467cd48a7..f1d56bcbf370c8 100644 --- a/examples/lock-app/efr32/src/gen/callback-stub.c +++ b/examples/lock-app/efr32/src/gen/callback-stub.c @@ -1765,21 +1765,6 @@ bool emberAfPluginNetworkSteeringGetDistributedKeyCallback(EmberKeyData * key) return false; } -/** @brief Get Node Type - * - * This callback allows the application to set the node type that the network - * steering process will use in joining a network. - * - * @param state The current ::EmberAfPluginNetworkSteeringJoiningState. - * - * @return An ::EmberNodeType value that the network steering process will - * try to join a network as. - */ -EmberNodeType emberAfPluginNetworkSteeringGetNodeTypeCallback(EmberAfPluginNetworkSteeringJoiningState state) -{ - return ((emAfCurrentZigbeeProNetwork->nodeType == EMBER_COORDINATOR) ? EMBER_ROUTER : emAfCurrentZigbeeProNetwork->nodeType); -} - /** @brief Get Power For Radio Channel * * This callback is fired when the Network Steering plugin needs to set the diff --git a/examples/lock-app/lock-common/gen/callback-stub.c b/examples/lock-app/lock-common/gen/callback-stub.c index fc36207dd8e351..3bc85ee4ef736b 100644 --- a/examples/lock-app/lock-common/gen/callback-stub.c +++ b/examples/lock-app/lock-common/gen/callback-stub.c @@ -1766,21 +1766,6 @@ bool emberAfPluginNetworkSteeringGetDistributedKeyCallback(EmberKeyData * key) return false; } -/** @brief Get Node Type - * - * This callback allows the application to set the node type that the network - * steering process will use in joining a network. - * - * @param state The current ::EmberAfPluginNetworkSteeringJoiningState. - * - * @return An ::EmberNodeType value that the network steering process will - * try to join a network as. - */ -EmberNodeType emberAfPluginNetworkSteeringGetNodeTypeCallback(EmberAfPluginNetworkSteeringJoiningState state) -{ - return ((emAfCurrentZigbeeProNetwork->nodeType == EMBER_COORDINATOR) ? EMBER_ROUTER : emAfCurrentZigbeeProNetwork->nodeType); -} - /** @brief Get Power For Radio Channel * * This callback is fired when the Network Steering plugin needs to set the diff --git a/examples/wifi-echo/server/esp32/main/gen/callback-stub.c b/examples/wifi-echo/server/esp32/main/gen/callback-stub.c index 87b5d7c0315b77..ed5f77ca89525a 100644 --- a/examples/wifi-echo/server/esp32/main/gen/callback-stub.c +++ b/examples/wifi-echo/server/esp32/main/gen/callback-stub.c @@ -1745,21 +1745,6 @@ bool emberAfPluginNetworkSteeringGetDistributedKeyCallback(EmberKeyData * key) return false; } -/** @brief Get Node Type - * - * This callback allows the application to set the node type that the network - * steering process will use in joining a network. - * - * @param state The current ::EmberAfPluginNetworkSteeringJoiningState. - * - * @return An ::EmberNodeType value that the network steering process will - * try to join a network as. - */ -EmberNodeType emberAfPluginNetworkSteeringGetNodeTypeCallback(EmberAfPluginNetworkSteeringJoiningState state) -{ - return ((emAfCurrentZigbeeProNetwork->nodeType == EMBER_COORDINATOR) ? EMBER_ROUTER : emAfCurrentZigbeeProNetwork->nodeType); -} - /** @brief Get Power For Radio Channel * * This callback is fired when the Network Steering plugin needs to set the diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h index eeae387f83106c..80b9fdef9a5000 100644 --- a/src/app/util/af-types.h +++ b/src/app/util/af-types.h @@ -528,15 +528,6 @@ typedef struct EmberKeyData preconfiguredKey; } EmberAfSecurityProfileData; -#ifndef DOXYGEN_SHOULD_SKIP_THIS -typedef struct -{ - EmberNodeType nodeType; - EmberAfSecurityProfile securityProfile; -} EmAfZigbeeProNetwork; - -#endif - #ifdef DOXYGEN_SHOULD_SKIP_THIS enum EmberAfEndpointBitmask; #else diff --git a/src/app/util/af.h b/src/app/util/af.h index 171776bf9fa12b..d42e6a025786f4 100644 --- a/src/app/util/af.h +++ b/src/app/util/af.h @@ -451,15 +451,6 @@ uint8_t emberAfGetDataSize(uint8_t dataType); #if !defined(DOXYGEN_SHOULD_SKIP_THIS) // master array of all defined endpoints extern EmberAfDefinedEndpoint emAfEndpoints[]; - -// Master array of all zigbee PRO networks. -extern const EmAfZigbeeProNetwork emAfZigbeeProNetworks[]; - -// The current zigbee PRO network or NULL. -extern const EmAfZigbeeProNetwork * emAfCurrentZigbeeProNetwork; - -// true if the current network is a zigbee PRO network. -#define emAfProIsCurrentNetwork() (emAfCurrentZigbeeProNetwork != NULL) #endif /** diff --git a/src/app/util/attribute-storage.c b/src/app/util/attribute-storage.c index 095b8b48de798f..da1161629daa12 100644 --- a/src/app/util/attribute-storage.c +++ b/src/app/util/attribute-storage.c @@ -91,7 +91,6 @@ const uint16_t commandManufacturerCodeCount = GENERATED_COMMAN const EmberAfAttributeMetadata generatedAttributes[] = GENERATED_ATTRIBUTES; const EmberAfCluster generatedClusters[] = GENERATED_CLUSTERS; const EmberAfEndpointType generatedEmberAfEndpointTypes[] = GENERATED_ENDPOINT_TYPES; -const EmAfZigbeeProNetwork emAfZigbeeProNetworks[] = EM_AF_GENERATED_ZIGBEE_PRO_NETWORKS; const EmberAfManufacturerCodeEntry clusterManufacturerCodes[] = GENERATED_CLUSTER_MANUFACTURER_CODES; const uint16_t clusterManufacturerCodeCount = GENERATED_CLUSTER_MANUFACTURER_CODE_COUNT;