Move OTA max data buffer number to project configurations.

Author: ActoryOu

components/FreeRTOS-Libraries-Integration-Tests/CMakeLists.txt

@@ -8,7 +8,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/FreeRTOS-Libraries-Integration-Tests/src/trans
 include(${CMAKE_CURRENT_LIST_DIR}/FreeRTOS-Libraries-Integration-Tests/src/mqtt_test.cmake)
 
 # This gives OTA_PAL_TEST_SOURCES, and OTA_PAL_TEST_INCLUDE_DIRS
-include(${CMAKE_CURRENT_LIST_DIR}/FreeRTOS-Libraries-Integration-Tests/src/ota_pal_test.cmake)
+# include(${CMAKE_CURRENT_LIST_DIR}/FreeRTOS-Libraries-Integration-Tests/src/ota_pal_test.cmake)
 
 # This gives PKCS11_TEST_SOURCES, and PKCS11_TEST_INCLUDE_DIRS
 include(${CMAKE_CURRENT_LIST_DIR}/FreeRTOS-Libraries-Integration-Tests/src/pkcs11_test.cmake)

main/Kconfig.projbuild

@@ -44,14 +44,6 @@ menu "Featured FreeRTOS IoT Integration"
                 bool "Transport Interface Test."
                 default n
 
-            config GRI_OTA_PAL_TEST_ENABLED
-                bool "OTA PAL Test."
-                default n
-
-            config GRI_OTA_E2E_TEST_ENABLED
-                bool "OTA end-to-end Test."
-                default n
-
             config GRI_CORE_PKCS11_TEST_ENABLED
                 bool "CorePKCS#11 Test."
                 default n
@@ -211,6 +203,10 @@ menu "Featured FreeRTOS IoT Integration"
                 int "OTA demo task stack size."
                 default 3072
 
+            config GRI_OTA_MAX_NUM_DATA_BUFFERS
+                int "OTA buffer number."
+                default 2
+
         endmenu # OTA demo configurations
     endmenu # Qualification Test Configurations
 
@@ -463,6 +459,10 @@ menu "Featured FreeRTOS IoT Integration"
             int "Application version build."
             default 0
 
+        config GRI_OTA_MAX_NUM_DATA_BUFFERS
+            int "OTA buffer number."
+            default 2
+
     endmenu # OTA demo configurations
 
 endmenu # Golden Reference Integration

main/demo_tasks/ota_over_mqtt_demo/ota_over_mqtt_demo.c

@@ -167,7 +167,6 @@
 #define MAX_THING_NAME_SIZE                              128U
 
 #define MAX_JOB_ID_LENGTH                                ( 64U )
-#define MAX_NUM_OF_OTA_DATA_BUFFERS                      ( 2U )
 
 /**
  * @brief Used to clear bits in a task's notification value.
@@ -898,7 +897,7 @@ static uint16_t getFreeOTABuffers( void )
 
     if( xSemaphoreTake( bufferSemaphore, portMAX_DELAY ) == pdTRUE )
     {
-        for( ulIndex = 0; ulIndex < MAX_NUM_OF_OTA_DATA_BUFFERS; ulIndex++ )
+        for( ulIndex = 0; ulIndex < otaconfigMAX_NUM_OTA_DATA_BUFFERS; ulIndex++ )
         {
             if( dataBuffers[ ulIndex ].bufferUsed == false )
             {
@@ -940,7 +939,7 @@ static OtaDataEvent_t * getOtaDataEventBuffer( void )
 
     if( xSemaphoreTake( bufferSemaphore, portMAX_DELAY ) == pdTRUE )
     {
-        for( ulIndex = 0; ulIndex < MAX_NUM_OF_OTA_DATA_BUFFERS; ulIndex++ )
+        for( ulIndex = 0; ulIndex < otaconfigMAX_NUM_OTA_DATA_BUFFERS; ulIndex++ )
         {
             if( dataBuffers[ ulIndex ].bufferUsed == false )
             {

main/demo_tasks/ota_over_mqtt_demo/ota_over_mqtt_demo_config.h

@@ -89,6 +89,11 @@
  */
 #define otademoconfigDEMO_TASK_STACK_SIZE     ( CONFIG_GRI_OTA_DEMO_DEMO_TASK_STACK_SIZE )
 
+/**
+ * @brief The number of OTA data buffer.
+ */
+#define otaconfigMAX_NUM_OTA_DATA_BUFFERS     ( CONFIG_GRI_OTA_MAX_NUM_DATA_BUFFERS )
+
 /**
  * @brief The version for the firmware which is running. OTA agent uses this
  * version number to perform anti-rollback validation. The firmware version for the

sdkconfig.defaults

@@ -40,7 +40,7 @@ CONFIG_LWIP_MAX_SOCKETS=8
 # AWS OTA
 CONFIG_LOG2_FILE_BLOCK_SIZE=12
 CONFIG_MAX_NUM_BLOCKS_REQUEST=8
-CONFIG_MAX_NUM_OTA_DATA_BUFFERS=8
+CONFIG_GRI_OTA_MAX_NUM_DATA_BUFFERS=2
 CONFIG_ALLOW_DOWNGRADE=0
 CONFIG_OTA_DATA_OVER_MQTT=y
 # CONFIG_OTA_DATA_OVER_HTTP is not set