Skip to content

Commit

Permalink
Remove references to EmAfZigbeeProNetwork (#3611)
Browse files Browse the repository at this point in the history
  • Loading branch information
vivien-apple authored and pull[bot] committed Dec 11, 2020
1 parent fb1d7ba commit 8414af0
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 96 deletions.
15 changes: 0 additions & 15 deletions examples/lighting-app/efr32/src/gen/callback-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 0 additions & 17 deletions examples/lighting-app/lighting-common/gen/callback-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -2485,8 +2470,6 @@ bool emberAfIsCurrentSecurityProfileSmartEnergy(void)

const EmberAfOtaImageId emberAfInvalidImageId;

const EmAfZigbeeProNetwork * emAfCurrentZigbeeProNetwork = NULL;

void emberAfPluginUpdateTcLinkKeyZigbeeKeyEstablishmentCallback(EmberEUI64 partner, EmberKeyStatus status) {}

void emberAfPluginNetworkSteeringMarker(void) {}
15 changes: 0 additions & 15 deletions examples/lock-app/efr32/src/gen/callback-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 0 additions & 15 deletions examples/lock-app/lock-common/gen/callback-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 0 additions & 15 deletions examples/wifi-echo/server/esp32/main/gen/callback-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions src/app/util/af-types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions src/app/util/af.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
Expand Down
1 change: 0 additions & 1 deletion src/app/util/attribute-storage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8414af0

Please sign in to comment.