From 0ca10afe0cee797bdabf96287ca84c5b4f8cbff8 Mon Sep 17 00:00:00 2001 From: Aniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:53:20 -0800 Subject: [PATCH 1/5] Update pull_request_template.md --- .github/pull_request_template.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c3c8607..e2675a3 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,9 +8,15 @@ Test Steps ----------- +Checklist: +---------- + + +- [ ] I have tested my changes. No regression in existing tests. +- [ ] I have modified and/or added unit-tests to cover the code changes in this Pull Request. + Related Issue ----------- - By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice. From f183d22230f1fdfe71d244f0fac4b6b2524375ab Mon Sep 17 00:00:00 2001 From: Aniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com> Date: Fri, 17 Feb 2023 13:06:18 -0800 Subject: [PATCH 2/5] Update FreeRTOSConfig.h --- test/build-combination/Common/include/FreeRTOSConfig.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/build-combination/Common/include/FreeRTOSConfig.h b/test/build-combination/Common/include/FreeRTOSConfig.h index a54951d..8f22f2f 100644 --- a/test/build-combination/Common/include/FreeRTOSConfig.h +++ b/test/build-combination/Common/include/FreeRTOSConfig.h @@ -120,13 +120,14 @@ void vAssertCalled( const char * pcFile, #define configASSERT( x ) +#define configASSERT_DEFINED ( 0 ) + /* The function that implements FreeRTOS printf style output, and the macro * that maps the configPRINTF() macros to that function. */ #define configPRINTF( X ) /* Non-format version thread-safe print. */ extern void vLoggingPrint( const char * pcMessage ); -#define configPRINT( X ) /* Non-format version thread-safe print. */ #define configPRINT_STRING( X ) @@ -145,7 +146,7 @@ extern void vLoggingPrint( const char * pcMessage ); * command interpreter running, and it has its own local output buffer, so the * global buffer is just set to be one byte long as it is not used and should not * take up unnecessary RAM. */ -#define configCOMMAND_INT_MAX_OUTPUT_SIZE 1 +#define configCOMMAND_INT_MAX_OUTPUT_SIZE ( 1 ) #define configPROFILING ( 0 ) From 38549b5e65c0205e7616d876cc8b7b950d92ae29 Mon Sep 17 00:00:00 2001 From: Aniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com> Date: Fri, 17 Feb 2023 13:09:02 -0800 Subject: [PATCH 3/5] Remove definition of configASSERT --- test/build-combination/Common/include/FreeRTOSConfig.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/build-combination/Common/include/FreeRTOSConfig.h b/test/build-combination/Common/include/FreeRTOSConfig.h index 8f22f2f..8e892b6 100644 --- a/test/build-combination/Common/include/FreeRTOSConfig.h +++ b/test/build-combination/Common/include/FreeRTOSConfig.h @@ -118,10 +118,6 @@ void vAssertCalled( const char * pcFile, unsigned long ulLine ); -#define configASSERT( x ) - -#define configASSERT_DEFINED ( 0 ) - /* The function that implements FreeRTOS printf style output, and the macro * that maps the configPRINTF() macros to that function. */ #define configPRINTF( X ) From f521fe06e7563937448be0af7ee800c8ea9ec36f Mon Sep 17 00:00:00 2001 From: Aniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com> Date: Tue, 1 Aug 2023 12:56:49 -0700 Subject: [PATCH 4/5] Add an API to Zynq port to allow user to change settings at runtime --- portable/Zynq.2019.3/ff_sddisk.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/portable/Zynq.2019.3/ff_sddisk.c b/portable/Zynq.2019.3/ff_sddisk.c index a357a97..08da718 100644 --- a/portable/Zynq.2019.3/ff_sddisk.c +++ b/portable/Zynq.2019.3/ff_sddisk.c @@ -432,17 +432,17 @@ static CacheMemoryInfo_t * pucGetSDIOCacheMemory( BaseType_t xPartition ) } /*-----------------------------------------------------------*/ -/* Initialise the SDIO driver and mount an SD card */ -BaseType_t xMountFailIgnore = 0; +FF_Disk_t * FF_SDDiskInit( const char * pcName ) +{ + return FF_SDDiskInitWithSettings( pcName, pdFALSE, 0U ); +} -/* _HT_ : the function FF_SDDiskInit() used to mount partition-0. - * It would be nice if it has a parameter indicating the partition - * number. - * As for now, the partion can be set with a global variable 'xDiskPartition'. +/** + * Initialize the SD Disk with configurable settings + * @param[in] uxMountFailIgnore ignore fails on mount, set to true when have systems where may not have initialized mount + * @param[in] uxDiskPartition the disk partition number to use */ -BaseType_t xDiskPartition = 0; - -FF_Disk_t * FF_SDDiskInit( const char * pcName ) +FF_Disk_t * FF_SDDiskInitWithSettings( const char * pcName, BaseType_t xMountFailIgnore, BaseType_t xDiskPartition ) { FF_Error_t xFFError; BaseType_t xPartitionNumber = xDiskPartition; From 0fe99493e9d63bfeed7ca8cdff2c46283d17f7c9 Mon Sep 17 00:00:00 2001 From: Aniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com> Date: Tue, 1 Aug 2023 20:13:24 +0000 Subject: [PATCH 5/5] Fix formatting --- portable/Zynq.2019.3/ff_sddisk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/portable/Zynq.2019.3/ff_sddisk.c b/portable/Zynq.2019.3/ff_sddisk.c index 68dd0b3..f12310f 100644 --- a/portable/Zynq.2019.3/ff_sddisk.c +++ b/portable/Zynq.2019.3/ff_sddisk.c @@ -434,7 +434,7 @@ static CacheMemoryInfo_t * pucGetSDIOCacheMemory( BaseType_t xPartition ) FF_Disk_t * FF_SDDiskInit( const char * pcName ) { - return FF_SDDiskInitWithSettings( pcName, pdFALSE, 0U ); + return FF_SDDiskInitWithSettings( pcName, pdFALSE, 0U ); } /** @@ -442,7 +442,9 @@ FF_Disk_t * FF_SDDiskInit( const char * pcName ) * @param[in] uxMountFailIgnore ignore fails on mount, set to true when have systems where may not have initialized mount * @param[in] uxDiskPartition the disk partition number to use */ -FF_Disk_t * FF_SDDiskInitWithSettings( const char * pcName, BaseType_t xMountFailIgnore, BaseType_t xDiskPartition ) +FF_Disk_t * FF_SDDiskInitWithSettings( const char * pcName, + BaseType_t xMountFailIgnore, + BaseType_t xDiskPartition ) { FF_Error_t xFFError; BaseType_t xPartitionNumber = xDiskPartition;