Skip to content

Commit

Permalink
Merge branch 'refactor/update_xtensa_freertos_files' into 'master'
Browse files Browse the repository at this point in the history 
FreeRTOS: Add FreeRTOS license identifiers, update xtensa port files to v10.4.3

See merge request espressif/esp-idf!16903
  • Loading branch information
@Dazza0
Dazza0 committed Feb 3, 2022
2 parents 1431821 + 1c60d6a commit a470ae2
Show file tree
Hide file tree
Showing 59 changed files with 878 additions and 1,050 deletions.
8 changes: 2 additions & 6 deletions components/esp_gdbstub/xtensa/gdbstub-entry.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ _xt_gdbstub_int:
s32i a0, sp, XT_STK_PS
rsr a0, EPC_1 /* save interruptee's PC */
s32i a0, sp, XT_STK_PC
rsr a0, EXCSAVE_1 /* save interruptee's a0 */
s32i a0, sp, XT_STK_A0
#if XCHAL_HAVE_WINDOWED
s32e a0, sp, -16 /* for debug backtrace */
#endif
Expand All @@ -32,12 +34,6 @@ _xt_gdbstub_int:
rsr a0, EXCVADDR
s32i a0, sp, XT_STK_EXCVADDR


/* _xt_context_save seems to save the current a0, but we need the interuptees a0. Fix this. */
rsr a0, EXCSAVE_1 /* save interruptee's a0 */

s32i a0, sp, XT_STK_A0

mov a6,sp
movi a3, gdbstub_handle_uart_int
callx0 a3
Expand Down
7 changes: 2 additions & 5 deletions components/esp_system/port/arch/xtensa/panic_handler_asm.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ _xt_panic:
s32i a0, sp, XT_STK_PS
rsr a0, EPC_1 /* save interruptee's PC */
s32i a0, sp, XT_STK_PC
rsr a0, EXCSAVE_1 /* save interruptee's a0 */
s32i a0, sp, XT_STK_A0
#if XCHAL_HAVE_WINDOWED
s32e a0, sp, -16 /* for debug backtrace */
#endif
Expand All @@ -48,11 +50,6 @@ _xt_panic:
rsr a0, EXCVADDR
s32i a0, sp, XT_STK_EXCVADDR

/* _xt_context_save seems to save the current a0, but we need the interuptees a0. Fix this. */
rsr a0, EXCSAVE_1 /* save interruptee's a0 */

s32i a0, sp, XT_STK_A0

/* Set up PS for C, disable all interrupts except NMI and debug, and clear EXCM. */
movi a0, PS_INTLEVEL(XCHAL_DEBUGLEVEL - 2) | PS_UM | PS_WOE
wsr a0, PS
Expand Down
7 changes: 2 additions & 5 deletions components/esp_system/port/soc/esp32/highint_hdl.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ xt_highintx:
s32i a0, sp, XT_STK_PS
rsr a0, EPC_X /* save interruptee's PC */
s32i a0, sp, XT_STK_PC
rsr a0, EXCSAVE_X /* save interruptee's a0 */
s32i a0, sp, XT_STK_A0
#if XCHAL_HAVE_WINDOWED
s32e a0, sp, -16 /* for debug backtrace */
#endif
Expand Down Expand Up @@ -279,11 +281,6 @@ xt_highintx:
/* Found the reason, now save it. */
s32i a0, sp, XT_STK_EXCCAUSE

/* _xt_context_save seems to save the current a0, but we need the interuptees a0. Fix this. */
rsr a0, EXCSAVE_X /* save interruptee's a0 */

s32i a0, sp, XT_STK_A0

/* Set up PS for C, disable all interrupts except NMI and debug, and clear EXCM. */
movi a0, PS_INTLEVEL(5) | PS_UM | PS_WOE
wsr a0, PS
Expand Down
7 changes: 2 additions & 5 deletions components/esp_system/port/soc/esp32s2/highint_hdl.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ xt_highint4:
s32i a0, sp, XT_STK_PS
rsr a0, EPC_4 /* save interruptee's PC */
s32i a0, sp, XT_STK_PC
rsr a0, EXCSAVE_4 /* save interruptee's a0 */
s32i a0, sp, XT_STK_A0
#if XCHAL_HAVE_WINDOWED
s32e a0, sp, -16 /* for debug backtrace */
#endif
Expand Down Expand Up @@ -77,11 +79,6 @@ xt_highint4:
/* Found the reason, now save it. */
s32i a0, sp, XT_STK_EXCCAUSE

/* _xt_context_save seems to save the current a0, but we need the interuptees a0. Fix this. */
rsr a0, EXCSAVE_4 /* save interruptee's a0 */

s32i a0, sp, XT_STK_A0

/* Set up PS for C, disable all interrupts except NMI and debug, and clear EXCM. */
movi a0, PS_INTLEVEL(5) | PS_UM | PS_WOE
wsr a0, PS
Expand Down
7 changes: 2 additions & 5 deletions components/esp_system/port/soc/esp32s3/highint_hdl.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ xt_highint4:
s32i a0, sp, XT_STK_PS
rsr a0, EPC_4 /* save interruptee's PC */
s32i a0, sp, XT_STK_PC
rsr a0, EXCSAVE_4 /* save interruptee's a0 */
s32i a0, sp, XT_STK_A0
#if XCHAL_HAVE_WINDOWED
s32e a0, sp, -16 /* for debug backtrace */
#endif
Expand Down Expand Up @@ -105,11 +107,6 @@ xt_highint4:
/* Found the reason, now save it. */
s32i a0, sp, XT_STK_EXCCAUSE

/* _xt_context_save seems to save the current a0, but we need the interuptees a0. Fix this. */
rsr a0, EXCSAVE_4 /* save interruptee's a0 */

s32i a0, sp, XT_STK_A0

/* Set up PS for C, disable all interrupts except NMI and debug, and clear EXCM. */
movi a0, PS_INTLEVEL(5) | PS_UM | PS_WOE
wsr a0, PS
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/croutine.c
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/event_groups.c
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/FreeRTOS.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/StackMacros.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/atomic.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/croutine.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/deprecated_definitions.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/list.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/mpu_prototypes.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/mpu_wrappers.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/portable.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/projdefs.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/queue.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/stack_macros.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/stdint.readme
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/task.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/include/freertos/timers.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
7 changes: 7 additions & 0 deletions components/freertos/FreeRTOS-Kernel/list.c
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* SPDX-FileCopyrightText: 2020 Amazon.com, Inc. or its affiliates
*
* SPDX-License-Identifier: MIT
*
* SPDX-FileContributor: 2016-2022 Espressif Systems (Shanghai) CO LTD
*/
/*
* FreeRTOS Kernel V10.4.3
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
Expand Down
Loading

0 comments on commit a470ae2

Please sign in to comment.