Skip to content

Commit 2fd7ff6

Browse files
aggargaggarg
authored
Merge branch 'main' into add-cortex-r82-non-mpu-gcc-armclang-port
2 parents 991fffd + ccabdec commit 2fd7ff6

File tree

15 files changed

+55
-55
lines changed

15 files changed

+55
-55
lines changed

‎.github/workflows/auto-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
with:
125125
# This is dependent on the release script putting this zip file
126126
# in this exact location.
127-
artifact_path: ./tools/.github/scripts/FreeRTOS-KernelV${{ github.event.inputs.version_number }}.zip
127+
artifact_path: ./FreeRTOS-KernelV${{ github.event.inputs.version_number }}.zip
128128
release_tag: ${{ github.event.inputs.version_number }}
129129

130130
- name: Cleanup

‎event_groups.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@
501501
}
502502
/*-----------------------------------------------------------*/
503503

504-
#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
504+
#if ( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
505505

506506
BaseType_t xEventGroupClearBitsFromISR( EventGroupHandle_t xEventGroup,
507507
const EventBits_t uxBitsToClear )
@@ -518,7 +518,7 @@
518518
return xReturn;
519519
}
520520

521-
#endif /* if ( ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
521+
#endif /* if ( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
522522
/*-----------------------------------------------------------*/
523523

524524
EventBits_t xEventGroupGetBitsFromISR( EventGroupHandle_t xEventGroup )
@@ -812,7 +812,7 @@
812812
}
813813
/*-----------------------------------------------------------*/
814814

815-
#if ( ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
815+
#if ( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
816816

817817
BaseType_t xEventGroupSetBitsFromISR( EventGroupHandle_t xEventGroup,
818818
const EventBits_t uxBitsToSet,
@@ -830,7 +830,7 @@
830830
return xReturn;
831831
}
832832

833-
#endif /* if ( ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
833+
#endif /* if ( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
834834
/*-----------------------------------------------------------*/
835835

836836
#if ( configUSE_TRACE_FACILITY == 1 )

‎include/FreeRTOS.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@
101101
#define configASSERT_DEFINED 1
102102
#endif
103103

104+
/* Set configENABLE_PAC and/or configENABLE_BTI to 1 to enable PAC and/or BTI
105+
* support and 0 to disable them. These are currently used in ARMv8.1-M ports. */
106+
#ifndef configENABLE_PAC
107+
#define configENABLE_PAC 0
108+
#endif
109+
110+
#ifndef configENABLE_BTI
111+
#define configENABLE_BTI 0
112+
#endif
113+
104114
/* Basic FreeRTOS definitions. */
105115
#include "projdefs.h"
106116

@@ -3040,16 +3050,6 @@
30403050
#define configCONTROL_INFINITE_LOOP()
30413051
#endif
30423052

3043-
/* Set configENABLE_PAC and/or configENABLE_BTI to 1 to enable PAC and/or BTI
3044-
* support and 0 to disable them. These are currently used in ARMv8.1-M ports. */
3045-
#ifndef configENABLE_PAC
3046-
#define configENABLE_PAC 0
3047-
#endif
3048-
3049-
#ifndef configENABLE_BTI
3050-
#define configENABLE_BTI 0
3051-
#endif
3052-
30533053
/* Sometimes the FreeRTOSConfig.h settings only allow a task to be created using
30543054
* dynamically allocated RAM, in which case when any task is deleted it is known
30553055
* that both the task's stack and TCB need to be freed. Sometimes the

‎include/event_groups.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -452,13 +452,10 @@ EventBits_t xEventGroupClearBits( EventGroupHandle_t xEventGroup,
452452
* \defgroup xEventGroupClearBitsFromISR xEventGroupClearBitsFromISR
453453
* \ingroup EventGroup
454454
*/
455-
#if ( configUSE_TRACE_FACILITY == 1 )
455+
#if ( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
456456
BaseType_t xEventGroupClearBitsFromISR( EventGroupHandle_t xEventGroup,
457457
const EventBits_t uxBitsToClear ) PRIVILEGED_FUNCTION;
458-
#else
459-
#define xEventGroupClearBitsFromISR( xEventGroup, uxBitsToClear ) \
460-
xTimerPendFunctionCallFromISR( vEventGroupClearBitsCallback, ( void * ) ( xEventGroup ), ( uint32_t ) ( uxBitsToClear ), NULL )
461-
#endif
458+
#endif /* if ( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
462459

463460
/**
464461
* event_groups.h
@@ -607,14 +604,11 @@ EventBits_t xEventGroupSetBits( EventGroupHandle_t xEventGroup,
607604
* \defgroup xEventGroupSetBitsFromISR xEventGroupSetBitsFromISR
608605
* \ingroup EventGroup
609606
*/
610-
#if ( configUSE_TRACE_FACILITY == 1 )
607+
#if ( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
611608
BaseType_t xEventGroupSetBitsFromISR( EventGroupHandle_t xEventGroup,
612609
const EventBits_t uxBitsToSet,
613610
BaseType_t * pxHigherPriorityTaskWoken ) PRIVILEGED_FUNCTION;
614-
#else
615-
#define xEventGroupSetBitsFromISR( xEventGroup, uxBitsToSet, pxHigherPriorityTaskWoken ) \
616-
xTimerPendFunctionCallFromISR( vEventGroupSetBitsCallback, ( void * ) ( xEventGroup ), ( uint32_t ) ( uxBitsToSet ), ( pxHigherPriorityTaskWoken ) )
617-
#endif
611+
#endif /* if ( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
618612

619613
/**
620614
* event_groups.h

‎include/mpu_prototypes.h‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,16 @@ EventBits_t MPU_xEventGroupSync( EventGroupHandle_t xEventGroup,
409409

410410
BaseType_t MPU_xEventGroupGetStaticBuffer( EventGroupHandle_t xEventGroup,
411411
StaticEventGroup_t ** ppxEventGroupBuffer ) PRIVILEGED_FUNCTION;
412-
BaseType_t MPU_xEventGroupClearBitsFromISR( EventGroupHandle_t xEventGroup,
413-
const EventBits_t uxBitsToClear ) PRIVILEGED_FUNCTION;
414-
BaseType_t MPU_xEventGroupSetBitsFromISR( EventGroupHandle_t xEventGroup,
415-
const EventBits_t uxBitsToSet,
416-
BaseType_t * pxHigherPriorityTaskWoken ) PRIVILEGED_FUNCTION;
417412
EventBits_t MPU_xEventGroupGetBitsFromISR( EventGroupHandle_t xEventGroup ) PRIVILEGED_FUNCTION;
418413

414+
#if ( configUSE_MPU_WRAPPERS_V1 == 0 )
415+
BaseType_t MPU_xEventGroupClearBitsFromISR( EventGroupHandle_t xEventGroup,
416+
const EventBits_t uxBitsToClear ) FREERTOS_SYSTEM_CALL;
417+
BaseType_t MPU_xEventGroupSetBitsFromISR( EventGroupHandle_t xEventGroup,
418+
const EventBits_t uxBitsToSet,
419+
BaseType_t * pxHigherPriorityTaskWoken ) FREERTOS_SYSTEM_CALL;
420+
#endif /* #if ( configUSE_MPU_WRAPPERS_V1 == 0 ) */
421+
419422
/* MPU versions of message/stream_buffer.h API functions. */
420423
size_t MPU_xStreamBufferSend( StreamBufferHandle_t xStreamBuffer,
421424
const void * pvTxData,

‎portable/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,7 @@ add_library(freertos_kernel_port OBJECT
774774
if( FREERTOS_PORT MATCHES "GCC_ARM_CM(3|4)_MPU" OR
775775
FREERTOS_PORT STREQUAL "IAR_ARM_CM4F_MPU" OR
776776
FREERTOS_PORT STREQUAL "RVDS_ARM_CM4_MPU" OR
777+
FREERTOS_PORT STREQUAL "GCC_ARM_CRX_MPU" OR
777778
FREERTOS_PORT MATCHES "GCC_ARM_CM(23|33|55|85)_NTZ_NONSECURE" OR
778779
FREERTOS_PORT MATCHES "GCC_ARM_CM(23|33|55|85)_NONSECURE" OR
779780
FREERTOS_PORT MATCHES "GCC_ARM_CM(33|55|85)_TFM" OR

‎portable/Common/mpu_wrappers_v2.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4282,7 +4282,7 @@
42824282
#endif /* #if ( ( configSUPPORT_STATIC_ALLOCATION == 1 ) && ( configUSE_EVENT_GROUPS == 1 ) ) */
42834283
/*-----------------------------------------------------------*/
42844284

4285-
#if ( ( configUSE_EVENT_GROUPS == 1 ) && ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
4285+
#if ( ( configUSE_EVENT_GROUPS == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
42864286

42874287
BaseType_t MPU_xEventGroupClearBitsFromISR( EventGroupHandle_t xEventGroup,
42884288
const EventBits_t uxBitsToClear ) /* PRIVILEGED_FUNCTION */
@@ -4306,10 +4306,10 @@
43064306
return xReturn;
43074307
}
43084308

4309-
#endif /* #if ( ( configUSE_EVENT_GROUPS == 1 ) && ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
4309+
#endif /* #if ( ( configUSE_EVENT_GROUPS == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
43104310
/*-----------------------------------------------------------*/
43114311

4312-
#if ( ( configUSE_EVENT_GROUPS == 1 ) && ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
4312+
#if ( ( configUSE_EVENT_GROUPS == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )
43134313

43144314
BaseType_t MPU_xEventGroupSetBitsFromISR( EventGroupHandle_t xEventGroup,
43154315
const EventBits_t uxBitsToSet,
@@ -4334,7 +4334,7 @@
43344334
return xReturn;
43354335
}
43364336

4337-
#endif /* #if ( ( configUSE_EVENT_GROUPS == 1 ) && ( configUSE_TRACE_FACILITY == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
4337+
#endif /* #if ( ( configUSE_EVENT_GROUPS == 1 ) && ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) ) */
43384338
/*-----------------------------------------------------------*/
43394339

43404340
#if ( configUSE_EVENT_GROUPS == 1 )

‎portable/GCC/ARM_CRx_MPU/mpu_wrappers_v2_asm.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
.arm
3232
.syntax unified
33-
.section freertos_system_calls
33+
.section freertos_system_calls, "ax"
3434

3535
#define FREERTOS_ASSEMBLY
3636
#include "FreeRTOSConfig.h"

‎portable/GCC/ARM_CRx_MPU/portASM.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
.arm
3030
.syntax unified
31-
.section privileged_functions
31+
.section privileged_functions, "ax"
3232

3333
#define FREERTOS_ASSEMBLY
3434
#include "portmacro_asm.h"

‎portable/MSVC-MingW/port.c‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
#include "FreeRTOS.h"
3434
#include "task.h"
3535

36+
#ifdef WIN32_LEAN_AND_MEAN
37+
#include <winsock2.h>
38+
#else
39+
#include <winsock.h>
40+
#endif
41+
42+
#include <timeapi.h>
43+
3644
#ifdef __GNUC__
3745
#include "mmsystem.h"
3846
#else
@@ -144,6 +152,7 @@ static DWORD WINAPI prvSimulatedPeripheralTimer( LPVOID lpParameter )
144152
TickType_t xWaitTimeBetweenTicks = portTICK_PERIOD_MS;
145153
HANDLE hTimer = NULL;
146154
LARGE_INTEGER liDueTime;
155+
BOOL bSuccess;
147156

148157
/* Set the timer resolution to the maximum possible. */
149158
if( timeGetDevCaps( &xTimeCaps, sizeof( xTimeCaps ) ) == MMSYSERR_NOERROR )
@@ -182,7 +191,8 @@ static DWORD WINAPI prvSimulatedPeripheralTimer( LPVOID lpParameter )
182191

183192
/* Set the Waitable Timer. The timer is set to run periodically at every
184193
xWaitTimeBetweenTicks milliseconds. */
185-
configASSERT( SetWaitableTimer( hTimer, &liDueTime, xWaitTimeBetweenTicks, NULL, NULL, 0 ) );
194+
bSuccess = SetWaitableTimer( hTimer, &liDueTime, xWaitTimeBetweenTicks, NULL, NULL, 0 );
195+
configASSERT( bSuccess );
186196

187197
while( xPortRunning == pdTRUE )
188198
{

0 commit comments

Comments
 (0)