Skip to content

Commit cebd68b

Browse files
RichardBarryRichardBarry
authored
Merge branch 'main' into indent-enter-and-exit-critical
2 parents ea52cee + bad8f01 commit cebd68b

File tree

523 files changed

+3670
-2246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

523 files changed

+3670
-2246
lines changed

‎.github/lexicon.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,6 +1105,7 @@ misc
11051105
misconfiguration
11061106
miso
11071107
misra
1108+
mit
11081109
mmcr
11091110
mmi
11101111
mmr
@@ -1980,6 +1981,7 @@ softreset
19801981
sp
19811982
spck
19821983
spd
1984+
spdx
19831985
sph
19841986
spi
19851987
spidis
@@ -2438,6 +2440,7 @@ uxsavedmaskvalue
24382440
uxsavedtaskstackpointer
24392441
uxschedulersuspended
24402442
uxsemaphoregetcount
2443+
uxsemaphoregetcountfromisr
24412444
uxstate
24422445
uxstreambuffernumber
24432446
uxtaskgetnumberoftasks

‎.github/scripts/find_replace.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
old_text=$1
3+
new_text=$2
4+
echo "Old text: ${old_text}"
5+
echo "New text: ${new_text}"
6+
grep -rl "${old_text}" . | xargs gsed -i -e '1h;2,$H;$!d;g' -e "s/${old_text}/${new_text}/g"
7+

‎.github/scripts/kernel_checker.py

Lines changed: 69 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
11
#!/usr/bin/env python3
2+
#/*
3+
# * FreeRTOS Kernel <DEVELOPMENT BRANCH>
4+
# * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
5+
# *
6+
# * SPDX-License-Identifier: MIT
7+
# *
8+
# * Permission is hereby granted, free of charge, to any person obtaining a copy of
9+
# * this software and associated documentation files (the "Software"), to deal in
10+
# * the Software without restriction, including without limitation the rights to
11+
# * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
12+
# * the Software, and to permit persons to whom the Software is furnished to do so,
13+
# * subject to the following conditions:
14+
# *
15+
# * The above copyright notice and this permission notice shall be included in all
16+
# * copies or substantial portions of the Software.
17+
# *
18+
# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
# * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
20+
# * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
21+
# * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
22+
# * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
23+
# * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
24+
# *
25+
# * https://www.FreeRTOS.org
26+
# * https://github.com/FreeRTOS
27+
# *
28+
# */
229

330
import os
431
from common.header_checker import HeaderChecker
@@ -7,7 +34,9 @@
734
# CONFIG
835
#--------------------------------------------------------------------------------------------------
936
KERNEL_IGNORED_FILES = [
10-
'FreeRTOS-openocd.c'
37+
'FreeRTOS-openocd.c',
38+
'Makefile',
39+
'.DS_Store'
1140
]
1241

1342
KERNEL_IGNORED_EXTENSIONS = [
@@ -34,23 +63,45 @@
3463
'.txt'
3564
]
3665

66+
KERNEL_ASM_EXTENSIONS = [
67+
'.s',
68+
'.S',
69+
'.src',
70+
'.inc',
71+
'.s26',
72+
'.s43',
73+
'.s79',
74+
'.s85',
75+
'.s87',
76+
'.s90',
77+
'.asm',
78+
'.h'
79+
]
80+
81+
KERNEL_PY_EXTENSIONS = [
82+
'.py'
83+
]
84+
3785
KERNEL_IGNORED_PATTERNS = [
3886
r'.*\.git.*',
87+
r'.*portable/IAR/AtmelSAM7S64/.*AT91SAM7.*',
88+
r'.*portable/GCC/ARM7_AT91SAM7S/.*',
89+
r'.*portable/MPLAB/PIC18F/stdio.h'
90+
]
91+
92+
KERNEL_THIRD_PARTY_PATTERNS = [
3993
r'.*portable/ThirdParty/GCC/Posix/port*',
40-
r'.*portable.*Xtensa_ESP32\/include\/portmacro\.h',
41-
r'.*portable.*CDK\/T-HEAD_CK802\/portmacro\.h',
42-
r'.*portable.*GCC\/Posix\/portmacro\.h',
43-
r'.*portable.*Xtensa_ESP32.*port\.c',
44-
r'.*portable.*Xtensa_ESP32.*portasm\.S',
45-
r'.*portable.*Xtensa_ESP32.*xtensa_.*',
46-
r'.*portable.*Xtensa_ESP32.*portmux_impl.*',
47-
r'.*portable.*Xtensa_ESP32.*xt_asm_utils\.h'
94+
r'.*portable/ThirdParty/*',
95+
r'.*portable/IAR/AVR32_UC3/.*',
96+
r'.*portable/GCC/AVR32_UC3/.*',
4897
]
4998

5099
KERNEL_HEADER = [
51100
'/*\n',
52-
' * FreeRTOS Kernel V10.4.3\n',
53-
' * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n',
101+
' * FreeRTOS Kernel <DEVELOPMENT BRANCH>\n',
102+
' * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n',
103+
' *\n',
104+
' * SPDX-License-Identifier: MIT\n',
54105
' *\n',
55106
' * Permission is hereby granted, free of charge, to any person obtaining a copy of\n',
56107
' * this software and associated documentation files (the "Software"), to deal in\n',
@@ -75,16 +126,18 @@
75126
' */\n',
76127
]
77128

78-
79129
def main():
80130
parser = HeaderChecker.configArgParser()
81131
args = parser.parse_args()
82132

83133
# Configure the checks then run
84-
checker = HeaderChecker(KERNEL_HEADER)
85-
checker.ignoreExtension(*KERNEL_IGNORED_EXTENSIONS)
86-
checker.ignorePattern(*KERNEL_IGNORED_PATTERNS)
87-
checker.ignoreFile(*KERNEL_IGNORED_FILES)
134+
checker = HeaderChecker(KERNEL_HEADER,
135+
ignored_files=KERNEL_IGNORED_FILES,
136+
ignored_ext=KERNEL_IGNORED_EXTENSIONS,
137+
ignored_patterns=KERNEL_IGNORED_PATTERNS,
138+
third_party_patterns=KERNEL_THIRD_PARTY_PATTERNS,
139+
py_ext=KERNEL_PY_EXTENSIONS,
140+
asm_ext=KERNEL_ASM_EXTENSIONS)
88141
checker.ignoreFile(os.path.split(__file__)[-1])
89142

90143
rc = checker.processArgs(args)

‎.github/workflows/auto-release.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ on:
88
required: true
99
default: 'HEAD'
1010
version_number:
11-
description: 'Version Number (Ex. 10.4.0)'
11+
description: 'Version Number (Ex. 10.4.4)'
1212
required: true
13-
default: '10.4.0'
13+
default: '10.4.4'
14+
main_br_version:
15+
description: "Version String for task.h on main branch (leave empty to leave as-is)."
16+
require: false
17+
default: ''
1418

1519
jobs:
1620
release-packager:
@@ -32,11 +36,11 @@ jobs:
3236
with:
3337
repository: FreeRTOS/FreeRTOS
3438
path: tools
35-
36-
# Simpler git auth if we use checkout action and forward the repo to release script
39+
40+
# Simpler git auth if we use checkout action and forward the repo to release script
3741
- name: Checkout FreeRTOS Kernel
3842
uses: actions/checkout@v2
39-
with:
43+
with:
4044
path: local_kernel
4145
fetch-depth: 0
4246

@@ -45,10 +49,9 @@ jobs:
4549
# Configure repo for push
4650
git config --global user.name ${{ github.actor }}
4751
git config --global user.email ${{ github.actor }}@users.noreply.github.com
48-
4952
# Install deps and run
5053
pip install -r ./tools/.github/scripts/release-requirements.txt
51-
./tools/.github/scripts/release.py FreeRTOS --kernel-repo-path=local_kernel --kernel-commit=${{ github.event.inputs.commit_id }} --new-kernel-version=${{ github.event.inputs.version_number }}
54+
./tools/.github/scripts/release.py FreeRTOS --kernel-repo-path=local_kernel --kernel-commit=${{ github.event.inputs.commit_id }} --new-kernel-version=${{ github.event.inputs.version_number }} --new-kernel-main-br-version=${{ github.event.inputs.main_br_version }}
5255
exit $?
5356
env:
5457
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎History.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
Documentation and download available at https://www.FreeRTOS.org/
22

3+
Changes between FreeRTOS V10.4.3 and FreeRTOS V10.4.4 released May 28 2021
4+
+ Minor performance improvements to xTaskIncrementTick() achieved by providing
5+
macro versions of uxListRemove() and vListInsertEnd().
6+
+ Minor refactor of timers.c that obsoletes the need for the
7+
tmrCOMMAND_START_DONT_TRACE macro and removes the need for timers.c to
8+
post to its own event queue. A consequence of this change is that auto-
9+
reload timers that miss their intended next execution time will execute
10+
again immediately rather than executing again the next time the command
11+
queue is processed. (thanks Jeff Tenney).
12+
+ Fix a race condition in the message buffer implementation. The
13+
underlying cause was that length and data bytes are written and read as
14+
two distinct operations, which both modify the size of the buffer. If a
15+
context switch occurs after adding or removing the length bytes, but
16+
before adding or removing the data bytes, then another task may observe
17+
the message buffer in an invalid state.
18+
+ The xTaskCreate() and xTaskCreateStatic() functions accept a task priority
19+
as an input parameter. The priority has always been silently capped to
20+
(configMAX_PRIORITIES - 1) should it be set to a value above that priority.
21+
Now values above that priority will also trigger a configASSERT() failure.
22+
+ Replace configASSERT( pcQueueName ) in vQueueAddToRegistry with a NULL
23+
pointer check.
24+
+ Introduce the configSTACK_ALLOCATION_FROM_SEPARATE_HEAP configuration
25+
constant that enables the stack allocated to tasks to come from a heap other
26+
than the heap used by other memory allocations. This enables stacks to be
27+
placed within special regions, such as fast tightly coupled memory.
28+
+ If there is an attempt to add the same queue or semaphore handle to the
29+
queue registry more than once then prior versions would create two separate
30+
entries. Now if this is done the first entry is overwritten rather than
31+
duplicated.
32+
+ Update the ESP32 port and TF-M (Trusted Firmware M)code to the latest from
33+
their respective repositories.
34+
+ Correct a build error in the POSIX port.
35+
+ Additional minor formatting updates, including replacing tabs with spaces
36+
in more files.
37+
+ Other minor updates include adding additional configASSERT() checks and
38+
correcting and improving code comments.
39+
+ Go look at the smp branch to see the progress towards the Symetric
40+
Multiprocessing Kernel. https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/smp
41+
342
Changes between FreeRTOS V10.4.2 and FreeRTOS V10.4.3 released December 14 2020
443

544
V10.4.3 is included in the 202012.00 LTS release. Learn more at https:/freertos.org/lts-libraries.html

‎croutine.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎event_groups.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/FreeRTOS.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/StackMacros.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/atomic.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/croutine.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/deprecated_definitions.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/event_groups.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/list.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/message_buffer.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/mpu_prototypes.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/mpu_wrappers.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/portable.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

‎include/projdefs.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
2-
* FreeRTOS Kernel V10.4.3
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* SPDX-License-Identifier: MIT
46
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in

0 commit comments

Comments
 (0)