Merge branch 'Qorvo:master' into master

Author: jimlyall-q

qpg6100/comps/qvCHIP/inc/qvCHIP.h

@@ -20,8 +20,8 @@
  * INCIDENTAL OR CONSEQUENTIAL DAMAGES,
  * FOR ANY REASON WHATSOEVER.
  *
- * $Change: 182094 $
- * $DateTime: 2021/09/23 13:36:41 $
+ * $Change: 182752 $
+ * $DateTime: 2021/10/05 14:12:53 $
  */
 
 /** @file "qvCHIP.h"
@@ -110,6 +110,15 @@ void qvCHIP_RandomGet(uint8_t outputLength, uint8_t *pOutput);
 */
 void qvCHIP_ResetSystem(void);
 
+/** @brief Return HEAP statistics.
+*
+*   @param pHeapFree                 HEAP currently free.
+*   @param pHeapUsed                 HEAP currently in use.
+*   @param pHighWatermark            Maximum HEAP used.
+*   @return result                   False if any parameter is NULL. True if parameters are ok
+*/
+bool qvCHIP_GetHeapStats(size_t* pHeapFree, size_t* pHeapUsed, size_t* pHighWatermark);
+
 #ifdef __cplusplus
 }
 #endif //__cplusplus

qpg6100/comps/qvCHIP/inc/qvCHIP_NVM.h

@@ -20,8 +20,8 @@
  * INCIDENTAL OR CONSEQUENTIAL DAMAGES,
  * FOR ANY REASON WHATSOEVER.
  *
- * $Change: 169169 $
- * $DateTime: 2021/03/19 08:48:13 $
+ * $Change: 182513 $
+ * $DateTime: 2021/09/30 22:08:35 $
  */
 
 /** @file "qvCHIP_NVM.h"
@@ -73,15 +73,6 @@ extern "C" {
 */
 void qvCHIP_Nvm_Init(void);
 
-/** @brief Get maximum length of data identified by keyId
- *
- *  @param key      NVM identifier to fetch maximum length for.
- *  @param pKeyLen  return size of key
- *  @return         QV_STATUS_NO_ERROR - no error
- *                  QV_STATUS_INVALID_ARGUMENT - key not recognised
-*/
-qvStatus_t qvCHIP_Nvm_GetMaxKeyLen(uint16_t key, uint16_t* pKeyLen);
-
 /** @brief Backup data to NVM for a given key.
  *
  *  @param key             Identifier for NVM area to backup.