Remove unused definitions from types_stub.h.

src/app/clusters/scenes/scenes.h

@@ -34,9 +34,9 @@ void emAfPluginScenesServerPrintInfo(void);
 
 extern uint8_t emberAfPluginScenesServerEntriesInUse;
 #if defined(EMBER_AF_PLUGIN_SCENES_USE_TOKENS) && !defined(EZSP_HOST)
-// In this case, we use token storage
-#define emberAfPluginScenesServerRetrieveSceneEntry(entry, i) halCommonGetIndexedToken(&entry, TOKEN_SCENES_TABLE, i)
-#define emberAfPluginScenesServerSaveSceneEntry(entry, i) halCommonSetIndexedToken(TOKEN_SCENES_TABLE, i, &entry)
+// TODO: Make the storage bits actually work
+#define emberAfPluginScenesServerRetrieveSceneEntry(entry, i)
+#define emberAfPluginScenesServerSaveSceneEntry(entry, i)
 #define emberAfPluginScenesServerNumSceneEntriesInUse()                                                                            \
     (halCommonGetToken(&emberAfPluginScenesServerEntriesInUse, TOKEN_SCENES_NUM_ENTRIES), emberAfPluginScenesServerEntriesInUse)
 #define emberAfPluginScenesServerSetNumSceneEntriesInUse(x)                                                                        \

src/app/util/af-types.h

@@ -344,22 +344,6 @@ typedef struct
     uint16_t endpointSize;
 } EmberAfEndpointType;
 
-#ifdef EZSP_HOST
-typedef EzspDecisionId EmberAfTcLinkKeyRequestPolicy;
-typedef EzspDecisionId EmberAfAppLinkKeyRequestPolicy;
-#define EMBER_AF_ALLOW_TC_KEY_REQUESTS EZSP_ALLOW_TC_KEY_REQUESTS_AND_SEND_CURRENT_KEY
-#define EMBER_AF_DENY_TC_KEY_REQUESTS EZSP_DENY_TC_KEY_REQUESTS
-#define EMBER_AF_ALLOW_APP_KEY_REQUESTS EZSP_ALLOW_APP_KEY_REQUESTS
-#define EMBER_AF_DENY_APP_KEY_REQUESTS EZSP_DENY_APP_KEY_REQUESTS
-#else
-typedef EmberTcLinkKeyRequestPolicy EmberAfTcLinkKeyRequestPolicy;
-typedef EmberAppLinkKeyRequestPolicy EmberAfAppLinkKeyRequestPolicy;
-#define EMBER_AF_ALLOW_TC_KEY_REQUESTS EMBER_ALLOW_TC_LINK_KEY_REQUEST_AND_SEND_CURRENT_KEY
-#define EMBER_AF_DENY_TC_KEY_REQUESTS EMBER_DENY_TC_LINK_KEY_REQUESTS
-#define EMBER_AF_ALLOW_APP_KEY_REQUESTS EMBER_ALLOW_APP_LINK_KEY_REQUEST
-#define EMBER_AF_DENY_APP_KEY_REQUESTS EMBER_DENY_APP_LINK_KEY_REQUESTS
-#endif
-
 #ifdef DOXYGEN_SHOULD_SKIP_THIS
 enum EmberAfEndpointBitmask;
 #else
@@ -1143,37 +1127,6 @@ typedef struct
     bool broadcast;
 } EmberAfMessageStruct;
 
-/**
- * @brief A data struct for a link key backup.
- *
- * Each entry notes the EUI64 of the device it is paired to and the key data.
- *   This key may be hashed and not the actual link key currently in use.
- */
-
-typedef struct
-{
-    EmberEUI64 deviceId;
-    EmberKeyData key;
-} EmberAfLinkKeyBackupData;
-
-/**
- * @brief A data struct for all the trust center backup data.
- *
- * The 'keyList' pointer must point to an array and 'maxKeyListLength'
- * must be populated with the maximum number of entries the array can hold.
- *
- * Functions that modify this data structure will populate 'keyListLength'
- * indicating how many keys were actually written into 'keyList'.
- */
-
-typedef struct
-{
-    EmberEUI64 extendedPanId;
-    uint8_t keyListLength;
-    uint8_t maxKeyListLength;
-    EmberAfLinkKeyBackupData * keyList;
-} EmberAfTrustCenterBackupData;
-
 /**
  * @brief The length of the hardware tag in the Ember Bootloader Query
  *   Response.

src/app/util/af.h

@@ -355,12 +355,6 @@ void emberAfGetEui64(EmberEUI64 returnEui64);
  */
 EmberNodeId emberAfGetNodeId(void);
 
-/**
- * @brief Returns the current network state.  This call caches the results
- *   on the host to prevent frequent EZSP transactions.
- */
-EmberNetworkStatus emberAfNetworkState(void);
-
 /** @} END Miscellaneous */
 
 /** @name Sleep Control */

src/app/util/config.h

@@ -43,17 +43,6 @@
 #define ZA_END_DEVICE 3
 #define ZA_SLEEPY_END_DEVICE 4
 
-// A subtle distniction:
-//   EMBER_AF_MANUFACTURER_CODE is the MFG code set by AppBuilder
-//     for use in the App Framework (AF).  If not set by AppBuilder we default
-//     it to 0x0000. The customer should be setting this value.
-//   EMBER_COMPANY_MANUFACTURER_CODE is the Ember Corporation's Manufacturer
-//     ID allocated by the Zigbee alliance.  This shall not change.
-#define EMBER_COMPANY_MANUFACTURER_CODE 0x1002
-#ifndef EMBER_AF_MANUFACTURER_CODE
-#define EMBER_AF_MANUFACTURER_CODE 0x0000
-#endif
-
 // This file determines the security profile used, and from that various
 // other security parameters.
 // #include "app/framework/security/security-config.h"