From 63777264102a4a13b3fb796358ad565926785cb4 Mon Sep 17 00:00:00 2001 From: rtel Date: Tue, 24 Sep 2019 16:06:21 +0000 Subject: [PATCH] Correct code comments that referred to taskYIELD_FROM_ISR to portYIELD_FROM_ISR. Update RV32 port to use 16 byte-alignment all the time (only strictly necessary when using FLOP instructions). git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2726 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- FreeRTOS/Source/include/message_buffer.h | 8 ++++---- FreeRTOS/Source/include/queue.h | 2 +- FreeRTOS/Source/portable/GCC/RISC-V/portmacro.h | 2 +- FreeRTOS/Source/portable/IAR/RISC-V/portmacro.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/FreeRTOS/Source/include/message_buffer.h b/FreeRTOS/Source/include/message_buffer.h index e088755f2..745f0b613 100644 --- a/FreeRTOS/Source/include/message_buffer.h +++ b/FreeRTOS/Source/include/message_buffer.h @@ -399,10 +399,10 @@ BaseType_t xHigherPriorityTaskWoken = pdFALSE; // Initialised to pdFALSE. // priority of the currently executing task was unblocked and a context // switch should be performed to ensure the ISR returns to the unblocked // task. In most FreeRTOS ports this is done by simply passing - // xHigherPriorityTaskWoken into taskYIELD_FROM_ISR(), which will test the + // xHigherPriorityTaskWoken into portYIELD_FROM_ISR(), which will test the // variables value, and perform the context switch if necessary. Check the // documentation for the port in use for port specific instructions. - taskYIELD_FROM_ISR( xHigherPriorityTaskWoken ); + portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); } * \defgroup xMessageBufferSendFromISR xMessageBufferSendFromISR @@ -588,10 +588,10 @@ BaseType_t xHigherPriorityTaskWoken = pdFALSE; // Initialised to pdFALSE. // priority of the currently executing task was unblocked and a context // switch should be performed to ensure the ISR returns to the unblocked // task. In most FreeRTOS ports this is done by simply passing - // xHigherPriorityTaskWoken into taskYIELD_FROM_ISR(), which will test the + // xHigherPriorityTaskWoken into portYIELD_FROM_ISR(), which will test the // variables value, and perform the context switch if necessary. Check the // documentation for the port in use for port specific instructions. - taskYIELD_FROM_ISR( xHigherPriorityTaskWoken ); + portYIELD_FROM_ISR( xHigherPriorityTaskWoken ); } * \defgroup xMessageBufferReceiveFromISR xMessageBufferReceiveFromISR diff --git a/FreeRTOS/Source/include/queue.h b/FreeRTOS/Source/include/queue.h index 5072c45f1..b8b6f028f 100644 --- a/FreeRTOS/Source/include/queue.h +++ b/FreeRTOS/Source/include/queue.h @@ -1284,7 +1284,7 @@ uint32_t ulVarToSend, ulValReceived; // name of the yield function required is port specific. if( xHigherPriorityTaskWokenByPost ) { - taskYIELD_YIELD_FROM_ISR(); + portYIELD_FROM_ISR(); } } diff --git a/FreeRTOS/Source/portable/GCC/RISC-V/portmacro.h b/FreeRTOS/Source/portable/GCC/RISC-V/portmacro.h index fac3c895a..6f79672aa 100644 --- a/FreeRTOS/Source/portable/GCC/RISC-V/portmacro.h +++ b/FreeRTOS/Source/portable/GCC/RISC-V/portmacro.h @@ -77,7 +77,7 @@ not need to be guarded with a critical section. */ #error This is the RV32 port that has not yet been adapted for 64. #define portBYTE_ALIGNMENT 16 #else - #define portBYTE_ALIGNMENT 8 + #define portBYTE_ALIGNMENT 16 #endif /*-----------------------------------------------------------*/ diff --git a/FreeRTOS/Source/portable/IAR/RISC-V/portmacro.h b/FreeRTOS/Source/portable/IAR/RISC-V/portmacro.h index 2a485d320..c2a15ddbf 100644 --- a/FreeRTOS/Source/portable/IAR/RISC-V/portmacro.h +++ b/FreeRTOS/Source/portable/IAR/RISC-V/portmacro.h @@ -79,7 +79,7 @@ not need to be guarded with a critical section. */ #error This is the RV32 port that has not yet been adapted for 64. #define portBYTE_ALIGNMENT 16 #else - #define portBYTE_ALIGNMENT 8 + #define portBYTE_ALIGNMENT 16 #endif /*-----------------------------------------------------------*/ -- 2.39.2