]> git.sur5r.net Git - freertos/log
freertos
4 years agoIntroduce the portSOFTWARE_BARRIER macro which thus far is only used by the Win32...
rtel [Thu, 23 Jan 2020 23:49:24 +0000 (23:49 +0000)]
Introduce the portSOFTWARE_BARRIER macro which thus far is only used by the Win32 demo to hold execution up in case a simulated interrupt is executing simultaneously.  That should never happen as all threads should execute on the same core, but we have had numerous reports that this and other Win32 port changes we have made fixed these issues - although we have not been able to replicate them ourselves.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2808 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdd MPU demo project for Nulceo-L152RE which is Coretx-M3.
gaurav-aws [Thu, 23 Jan 2020 01:56:36 +0000 (01:56 +0000)]
Add MPU demo project for Nulceo-L152RE which is Coretx-M3.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2807 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUpdates to CM3_MPU GCC port
gaurav-aws [Thu, 23 Jan 2020 01:50:25 +0000 (01:50 +0000)]
Updates to CM3_MPU GCC port

- System calls are now only allowed from kernel code. This change can be turned on
  or off using configENFORCE_SYSTEM_CALLS_FROM_KERNEL_ONLY.
- MPU is disabled before reprogramming it and enabled afterwards to be compliant
  with ARM recommendations.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2806 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoEnsure both one-shot and auto-reload are written consistently with a hyphen in comments.
rtel [Thu, 16 Jan 2020 04:25:29 +0000 (04:25 +0000)]
Ensure both one-shot and auto-reload are written consistently with a hyphen in comments.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2805 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdded uxTimerGetReloadMode() API function.
rtel [Thu, 16 Jan 2020 04:10:18 +0000 (04:10 +0000)]
Added uxTimerGetReloadMode() API function.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2804 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdd MPU demo project for LPC54018 board.
gaurav-aws [Sun, 12 Jan 2020 12:33:17 +0000 (12:33 +0000)]
Add MPU demo project for LPC54018 board.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2803 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoIntroduce a port for T-HEAD CK802. A simple demo for T-HEAD CB2201 is also included.
yuhzheng [Fri, 10 Jan 2020 07:53:14 +0000 (07:53 +0000)]
Introduce a port for T-HEAD CK802. A simple demo for T-HEAD CB2201 is also included.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2802 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUpdate the GCC and IAR SiFive HiFive rev-b demos to use the new configMTIME_BASE_ADDR...
rtel [Thu, 9 Jan 2020 02:28:45 +0000 (02:28 +0000)]
Update the GCC and IAR SiFive HiFive rev-b demos to use the new configMTIME_BASE_ADDRESS and configMTIMECMP_BASE_ADDRESS constants in place of the deprecated configCLINT_BASE_ADDRESS constant.
Update the IAR RISC-V HiFive demo to use the latest IAR Embedded Workbench version.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2801 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoReplace portasmHAS_CLINT with configMTIME_BASE_ADDRESS and configMTIMECMP_BASE_ADDRES...
rtel [Thu, 9 Jan 2020 02:23:51 +0000 (02:23 +0000)]
Replace portasmHAS_CLINT with configMTIME_BASE_ADDRESS and configMTIMECMP_BASE_ADDRESS definitions in the IAR RISC-V port - portasmHAS_CLIT will still work by deriving the new definitions from the old.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2800 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoWork in progress update of LPC51U68 MCUXpresso project to rearrange the folder struct...
rtel [Thu, 9 Jan 2020 00:19:36 +0000 (00:19 +0000)]
Work in progress update of LPC51U68 MCUXpresso project to rearrange the folder structure and names.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2799 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoReplace portasmHAS_CLINT with configMTIME_BASE_ADDRESS and configMTIMECMP_BASE_ADDRES...
rtel [Tue, 7 Jan 2020 01:14:36 +0000 (01:14 +0000)]
Replace portasmHAS_CLINT with configMTIME_BASE_ADDRESS and configMTIMECMP_BASE_ADDRESS definitions in the GCC RISC-V port - portasmHAS_CLIT will still work by deriving the new definitions from the old.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2798 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdd Source/portable/ARMClang file that directs users to the GCC port if they which...
rtel [Sat, 4 Jan 2020 00:14:18 +0000 (00:14 +0000)]
Add Source/portable/ARMClang file that directs users to the GCC port if they which to use the ARMClang compiler.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2797 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoIf tickless idle mode is in use then ensure prvResetNextTaskUnblockTime() is called...
rtel [Fri, 3 Jan 2020 22:50:31 +0000 (22:50 +0000)]
If tickless idle mode is in use then ensure prvResetNextTaskUnblockTime() is called after a task is unblocked due to a bit being set in an event group.  This allows the MCU to re-enter sleep mode at the earliest possible time (rather than waiting until the timeout that would occur had the task not being unblocked be the event group) and matches a similar change made for queues and derivative objects (semaphores, etc.) some time ago.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2796 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoCorrect #error text in multiple fat file system files.
rtel [Fri, 3 Jan 2020 20:53:27 +0000 (20:53 +0000)]
Correct #error text in multiple fat file system files.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2795 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdd xPortIsInsideInterrupt() to the IAR ARMv7-M ports.
rtel [Fri, 3 Jan 2020 01:17:29 +0000 (01:17 +0000)]
Add xPortIsInsideInterrupt() to the IAR ARMv7-M ports.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2794 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdded xTaskAbortDelayFromISR() and ulTaskNotifyValueClear() API functions.
rtel [Thu, 2 Jan 2020 18:55:20 +0000 (18:55 +0000)]
Added xTaskAbortDelayFromISR() and ulTaskNotifyValueClear() API functions.
Added tests for xTaskAbortDelayFromISR() into Demo/Common/Minimal/AbortDelay.c.
Added tests for ulTaskNotifyValueClear() into Demo/Common/Minimal/TaskNotify.c.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2793 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoRenamed RISC-V_RV32_SiFive_HiFive1_IAR directory to RISC-V_RV32_SiFive_HiFive1-RevB_I...
rtel [Wed, 1 Jan 2020 22:38:23 +0000 (22:38 +0000)]
Renamed RISC-V_RV32_SiFive_HiFive1_IAR directory to RISC-V_RV32_SiFive_HiFive1-RevB_IAR as it targets the RevB hardware.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2792 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoMinor updates to comment block for xTaskCheckForTimeOut().
rtel [Wed, 1 Jan 2020 22:24:44 +0000 (22:24 +0000)]
Minor updates to comment block for xTaskCheckForTimeOut().

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2791 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoRename RISC-V_RV32_SiFive_HiFive1-FreedomStudio directory to RISC-V_RV32_SiFive_HiFiv...
rtel [Wed, 1 Jan 2020 22:05:35 +0000 (22:05 +0000)]
Rename RISC-V_RV32_SiFive_HiFive1-FreedomStudio directory to RISC-V_RV32_SiFive_HiFive1-RevB-FreedomStudio as it targets Rev B of the hardware.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2790 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUpdate RISCC-V-RV32-SiFive_HiFive1_FreedomStudio project to latest tools and metal...
rtel [Wed, 1 Jan 2020 22:02:06 +0000 (22:02 +0000)]
Update RISCC-V-RV32-SiFive_HiFive1_FreedomStudio project to latest tools and metal library versions.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2789 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoRename STM32Cube to GCC for STM32L4 Discovery projects as GCC is
gaurav-aws [Wed, 1 Jan 2020 00:35:42 +0000 (00:35 +0000)]
Rename STM32Cube to GCC for STM32L4 Discovery projects as GCC is
the compiler used.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2788 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoMake vSetupTimerInterrupt weak in the RVDS M4 MPU port to give the
gaurav-aws [Wed, 1 Jan 2020 00:04:10 +0000 (00:04 +0000)]
Make vSetupTimerInterrupt weak in the RVDS M4 MPU port to give the
application writer a chance to override this function. This gives
the application write ability to use a different timer.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2787 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUpdate documentation of xTaskCheckForTimeOut function to reflect the
gaurav-aws [Tue, 31 Dec 2019 20:49:07 +0000 (20:49 +0000)]
Update documentation of xTaskCheckForTimeOut function to reflect the
intended use of this API.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2786 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years ago- Updates to projects due to demo folder name change. (IAR source file paths and...
yuhzheng [Tue, 31 Dec 2019 08:06:33 +0000 (08:06 +0000)]
- Updates to projects due to demo folder name change. (IAR source file paths and assembler path were fixed. Keil source file paths were fixed.)
- Added back power static library for GCC and IAR. (Power management related interface definitions are in drivers/fsl_power.h. power.c is empty due to "implementation is in header file and power library")
- Note for GCC link: the command used for linking is `arm-none-eabi-gcc -nostdlib -L<additional lib search path> -Xlinker ... -o "CORTEX_M0+_LPC51U68_LPCXpresso.axf" <all *.o> -lpower`. Per GCC doc, static library name in file system is libpower.a.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2785 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoPreviously the STM32F0518 compiler setting was changed to enable the use of the __wea...
rtel [Mon, 30 Dec 2019 22:24:58 +0000 (22:24 +0000)]
Previously the STM32F0518 compiler setting was changed to enable the use of the __weak attribute - however changing the port layer to use #pragma weak in place of __weak means the compiler setting change is not required and removes the risk of introducing incompatibilities - so this check in reverts the compiler settings change.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2784 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoEnsure the CORTEX_M0_STM32F0518_IAR demo builds after updates to the Cortex-M0 port...
rtel [Mon, 30 Dec 2019 22:07:33 +0000 (22:07 +0000)]
Ensure the CORTEX_M0_STM32F0518_IAR demo builds after updates to the Cortex-M0 port layer - required an update to the project settings to allow IAR extensions as the port layer now uses the _weak qualifier.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2783 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoEnsure the LPC1114 demo still builds after updates to the Cortex-M0 port layer -...
rtel [Mon, 30 Dec 2019 22:00:26 +0000 (22:00 +0000)]
Ensure the LPC1114 demo still builds after updates to the Cortex-M0 port layer - includes minor update to remove compiler warning that resulted from a newer compiler version.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2782 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoEnsure the LPC1114 demo still builds after updates to the Cortex-M0 port layer -...
rtel [Mon, 30 Dec 2019 21:59:11 +0000 (21:59 +0000)]
Ensure the LPC1114 demo still builds after updates to the Cortex-M0 port layer - includes minor update to remove compiler warning that resulted from a newer compiler version.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2781 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoEnsure the XMC1000_IAR_KEIL_GCC projects still build after updates to the Cortex...
rtel [Mon, 30 Dec 2019 21:44:22 +0000 (21:44 +0000)]
Ensure the XMC1000_IAR_KEIL_GCC projects still build after updates to the Cortex-M0 port layer - minor change to remove warning related to using a newer version of the IAR tools.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2780 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoReplace the static prvSetupTimerInterrupt() function in the Cortex-M port layers...
rtel [Mon, 30 Dec 2019 21:16:09 +0000 (21:16 +0000)]
Replace the static prvSetupTimerInterrupt() function in the Cortex-M port layers that still used it (other than MPU ports so far) with a weakly defined function call vPortSetupTimerInterrupt() - which allows application writers to override the function with one that uses a different clock.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2779 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoCorrect use of xStreamBufferRead() to xStreamBufferReceive() in code comments - no...
rtel [Mon, 30 Dec 2019 20:00:49 +0000 (20:00 +0000)]
Correct use of xStreamBufferRead() to xStreamBufferReceive() in code comments - no source code changes.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2778 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoTidy up comments only.
rtel [Fri, 27 Dec 2019 21:22:07 +0000 (21:22 +0000)]
Tidy up comments only.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2777 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoEnable the Win32 comprehensive test/demo build and run when configUSE_QUEUE_SETS...
rtel [Fri, 27 Dec 2019 21:02:23 +0000 (21:02 +0000)]
Enable the Win32 comprehensive test/demo build and run when configUSE_QUEUE_SETS is set to 0.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2776 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUpdate the LM3Sxxxx_IAR_Keil demo so the IAR project writes to the UART and executes...
rtel [Fri, 27 Dec 2019 20:59:57 +0000 (20:59 +0000)]
Update the LM3Sxxxx_IAR_Keil demo so the IAR project writes to the UART and executes in QEMU.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2775 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUpdates to CM4_MPU RCDS port
gaurav-aws [Tue, 24 Dec 2019 22:45:32 +0000 (22:45 +0000)]
Updates to CM4_MPU RCDS port

- System calls are now only allowed from kernel code. This change can be turned on
  or off using configENFORCE_SYSTEM_CALLS_FROM_KERNEL_ONLY.
- MPU is disabled before reprogramming it and enabled afterwards to be compliant
  with ARM recommendations.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2774 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoRemove local paths from the URL files
gaurav-aws [Tue, 24 Dec 2019 19:16:19 +0000 (19:16 +0000)]
Remove local paths from the URL files

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2773 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdd readme into the third party RISC-V port that points to the directories that conta...
rtel [Tue, 24 Dec 2019 17:24:23 +0000 (17:24 +0000)]
Add readme into the third party RISC-V port that points to the directories that contains the official ports.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2772 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdd IAR MPU project for STM32L475 Discovery Kit IoT Node
gaurav-aws [Sat, 21 Dec 2019 00:04:04 +0000 (00:04 +0000)]
Add IAR MPU project for STM32L475 Discovery Kit IoT Node

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2771 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUpdates to CM4_MPU IAR port
gaurav-aws [Sat, 21 Dec 2019 00:02:31 +0000 (00:02 +0000)]
Updates to CM4_MPU IAR port

- System calls are now only allowed from kernel code. This change can be turned on
  or off using configENFORCE_SYSTEM_CALLS_FROM_KERNEL_ONLY.
- MPU is disabled before reprogramming it and enabled afterwards to be compliant
  with ARM recommendations.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2770 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoIncrease test coverage for queue sets.
rtel [Fri, 20 Dec 2019 02:54:30 +0000 (02:54 +0000)]
Increase test coverage for queue sets.
Rename the CORTEX_M0+_LPC51U68_LPCXpresso demo to CORTEX_M0+_LPC51U68_GCC_IAR_KEIL as it supports all three compilers.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2769 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoRemove build files accidentally checked in.
rtel [Fri, 20 Dec 2019 02:49:15 +0000 (02:49 +0000)]
Remove build files accidentally checked in.
Remove the CMSIS math library as it is large and not used.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2768 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdd MPU projects for STM32L475 Discovery Kit IoT Node
gaurav-aws [Fri, 20 Dec 2019 02:07:09 +0000 (02:07 +0000)]
Add MPU projects for STM32L475 Discovery Kit IoT Node

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2767 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUpdates to CM4_MPU GCC port
gaurav-aws [Fri, 20 Dec 2019 02:05:44 +0000 (02:05 +0000)]
Updates to CM4_MPU GCC port

- System calls are now only allowed from kernel code. This change can be turned on
  or off using configENFORCE_SYSTEM_CALLS_FROM_KERNEL_ONLY.
- MPU is disabled before reprogramming it and enabled afterwards to be compliant
  with ARM recommendations.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2766 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdding GCC/Keil/IAR projects for NXP LPC51U68 (CM0+).
yuhzheng [Wed, 18 Dec 2019 10:06:30 +0000 (10:06 +0000)]
Adding GCC/Keil/IAR projects for NXP LPC51U68 (CM0+).

Please see readme.txt for todo items.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2765 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoCortex M0 GCC/IAR/Keil ports -- tickless support.
yuhzheng [Wed, 18 Dec 2019 09:55:08 +0000 (09:55 +0000)]
Cortex M0 GCC/IAR/Keil ports -- tickless support.

The default portMISSED_COUNTS_FACTOR is set to 45 cycles. User could override this value, if a more accurate count is available.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2764 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoRVDS/Keil weak linkage for vPortSetupTimerInterrupt() -- CM4F, CM3
yuhzheng [Wed, 18 Dec 2019 02:08:06 +0000 (02:08 +0000)]
RVDS/Keil weak linkage for vPortSetupTimerInterrupt() -- CM4F, CM3

Test steps are documented in this PR https://github.com/aws/amazon-freertos/pull/1141.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2763 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUse linker script variables for MPU setup for Nuvoton M2351 Keil Project
gaurav-aws [Tue, 17 Dec 2019 01:45:53 +0000 (01:45 +0000)]
Use linker script variables for MPU setup for Nuvoton M2351 Keil Project

Earlier we were using hard-coded addresses for MPU setup which
were ensured to be the same as linker script setup. This change
updates the Keil uVision project for Nuvoton Numaker-PFM-M2351
to use the variables exported from the linker script. This ensures
that the MPU setup never goes out of sync with linker script.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2762 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoUse the linker script variables for MPU setup for Keil Simulator Demo
gaurav-aws [Tue, 17 Dec 2019 00:14:26 +0000 (00:14 +0000)]
Use the linker script variables for MPU setup for Keil Simulator Demo

Earlier we were using hard-coded addresses for MPU setup which
were ensured to be the same as linker script setup. This change
updates the Keil Simulator demo to use the variables exported
from the linker script. This ensures that the MPU setup does not
go out of sync with linker script.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2761 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoMove warning suppression for IAR compiler to portmacro.h for v8M ports
gaurav-aws [Sat, 7 Dec 2019 01:23:17 +0000 (01:23 +0000)]
Move warning suppression for IAR compiler to portmacro.h for v8M ports

IAR produces some warnings which can not be fixed in the source code because
then other compilers start generating warnings. We suppressed those warnings
in the project file before. This change moves the warning suppression from
project files to portmacro.h.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2760 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoCheck socket binding result before doing anything with socket. (This is to address...
yuhzheng [Wed, 4 Dec 2019 07:52:49 +0000 (07:52 +0000)]
Check socket binding result before doing anything with socket. (This is to address ARG findings.) Breaking the single return rule here, due to precedent violation at line 1039 and 1144.

prvTransferConnect() now returns:
- pdTRUE: everything's good. pdTRUE = 1.
- -pdFREERTOS_ERRNO_ENOMEM: FreeRTOS_socket() failed. -pdFREERTOS_ERRNO_ENOMEM = -12.
- -pdFREERTOS_ERRNO_EINVAL || -pdFREERTOS_ERRNO_ECANCELED: FreeRTOS_bind() failed. Negative values.

Thus, at line 569 and line 617, needs to check != pdTRUE instead of == pdFALSE.

This commit is done on behalf of Alfred.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2759 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoFix bug when xQueueOverwrite() and xQueueOverwrite() from ISR are used to overwrite...
rtel [Tue, 3 Dec 2019 01:50:07 +0000 (01:50 +0000)]
Fix bug when xQueueOverwrite() and xQueueOverwrite() from ISR are used to overwrite items in two queues that are part of the same set.
Minor queue optimisations.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2758 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

4 years agoAdd the Labs projects provided in the V10.2.1_191129 zip file.
rtel [Mon, 2 Dec 2019 23:39:25 +0000 (23:39 +0000)]
Add the Labs projects provided in the V10.2.1_191129 zip file.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2757 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRemove guards against __ARMCC_VERSION version numbers that were previously used to...
rtel [Thu, 21 Nov 2019 22:35:21 +0000 (22:35 +0000)]
Remove guards against __ARMCC_VERSION version numbers that were previously used to avoid compiler warnings in some GCC ARM Cortex ports.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2756 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdd software timer to the Win32 blinky demo.
rtel [Mon, 18 Nov 2019 17:35:40 +0000 (17:35 +0000)]
Add software timer to the Win32 blinky demo.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2755 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRemove driver files that generate compiler warnings from the RISC-V_Renode_Emulator_S...
rtel [Mon, 18 Nov 2019 17:23:14 +0000 (17:23 +0000)]
Remove driver files that generate compiler warnings from the RISC-V_Renode_Emulator_SoftConsole project.
Update RISC-V ports so the interrupt stack is set to a known value before the scheduler is started if the interrupt stack is statically defined rather than re-using the main.c() stack.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2754 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoUpdate to the latest atomic.h.
rtel [Mon, 18 Nov 2019 16:28:03 +0000 (16:28 +0000)]
Update to the latest atomic.h.
Improve commenting in RISC-V GCC port.
Fix IAR RISC-V port so the first task starts with interrupts enabled.
Add references to third party page ref using newlib with FreeRTOS into the tasks.c file in each place newlib is referenced.
Move the position of the traceTASK_DELETE() trace macro in case of use with a memory allocator that writes over freed memory even when inside a critical section.
Efficiency improvement:  Make sure xTaskIncrementTick() does not return pdTRUE when the scheduler is locked.  This just prevents an unnecessary yield interrupt (unnecessary as it is ignored) when xYieldPending happens to be pdTRUE.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2753 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRename the RISC-V_RV32_SiFive_Hifive1_GCC folder to RISC-V_RV32_SiFive_HiFive1_Freedo...
rtel [Tue, 22 Oct 2019 22:30:06 +0000 (22:30 +0000)]
Rename the RISC-V_RV32_SiFive_Hifive1_GCC folder to RISC-V_RV32_SiFive_HiFive1_FreedomStudio as it is built with Freedom Studio.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2752 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdd nano-specs linker option to HiFive1_GCC demo.
rtel [Tue, 22 Oct 2019 22:27:55 +0000 (22:27 +0000)]
Add nano-specs linker option to HiFive1_GCC demo.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2751 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoFix spelling mistakes copied and pasted into a couple of RISC-V demo main.c files.
rtel [Tue, 22 Oct 2019 16:31:57 +0000 (16:31 +0000)]
Fix spelling mistakes copied and pasted into a couple of RISC-V demo main.c files.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2750 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoChange version and license text in RISC-V_RV32_SiFive_HiFive1_GCC FreeRTOSConfig...
rtel [Tue, 22 Oct 2019 02:17:15 +0000 (02:17 +0000)]
Change version and license text in RISC-V_RV32_SiFive_HiFive1_GCC FreeRTOSConfig.h file.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2749 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoTidy up main_full.c and change alignment of variable accesses in RegTest.S for the...
rtel [Tue, 22 Oct 2019 02:15:28 +0000 (02:15 +0000)]
Tidy up main_full.c and change alignment of variable accesses in RegTest.S for the RISC-V_Renode_Emulator_SoftConsole demo.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2748 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRework RISC-V QEMU example to use vanilla Eclipse in place of Freedom Studio. NOTE...
rtel [Tue, 22 Oct 2019 02:03:15 +0000 (02:03 +0000)]
Rework RISC-V QEMU example to use vanilla Eclipse in place of Freedom Studio.  NOTE:  RISC-V QEMU mtime interrupts are not generated consistently.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2747 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdd some asserts into the common demo tasks to catch scenarios where the tasks are...
rtel [Mon, 21 Oct 2019 17:17:34 +0000 (17:17 +0000)]
Add some asserts into the common demo tasks to catch scenarios where the tasks are not being used but the part of the demo/test that gets called from the tick hook is called resultant in an access to objects that were not created.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2746 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoUpdate RISK-V GCC port to ensure the first task starts with interrupts enabled -...
rtel [Mon, 21 Oct 2019 04:16:32 +0000 (04:16 +0000)]
Update RISK-V GCC port to ensure the first task starts with interrupts enabled - previously its interrupts were only enabled after it yielded for the first time.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2745 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdd the miv-basic.resc reNode script into the RISC-V_Renode_Emulator_SoftConsole...
rtel [Thu, 17 Oct 2019 20:39:40 +0000 (20:39 +0000)]
Add the miv-basic.resc reNode script into the RISC-V_Renode_Emulator_SoftConsole demo as it is no longer shipped with the Microsemi tools.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2744 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRename RISC-V-Qemu-sive_e_Freedom_Studio directory to RISC-V-Qemu-sifive_e-Eclipse...
rtel [Wed, 16 Oct 2019 04:31:57 +0000 (04:31 +0000)]
Rename RISC-V-Qemu-sive_e_Freedom_Studio directory to RISC-V-Qemu-sifive_e-Eclipse-GCC as it is now using Vanilla Eclipse and vanilla GCC in place of Freedom Studio.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2743 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRecreate the RISC-V-Qemu demo using Vanilla Eclipse in place of Freedom Studio as...
rtel [Wed, 16 Oct 2019 04:28:28 +0000 (04:28 +0000)]
Recreate the RISC-V-Qemu demo using Vanilla Eclipse in place of Freedom Studio as there is not a new Freedom Studio project that targets the HiFive1 board, and the updated Freedom Studio version didn't work with this project any more anyway.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2742 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoMove the call to traceTASK_DELETE() to before port portPRE_TASK_DELETE_HOOK() as...
rtel [Tue, 15 Oct 2019 22:14:40 +0000 (22:14 +0000)]
Move the call to traceTASK_DELETE() to before port portPRE_TASK_DELETE_HOOK() as in the Windows port portPRE_TASK_DELETE_HOOK() never returns.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2741 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdd IAR demo for the SiFive RISC-V HiFive Rev B board.
rtel [Mon, 14 Oct 2019 03:20:18 +0000 (03:20 +0000)]
Add IAR demo for the SiFive RISC-V HiFive Rev B board.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2740 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoUpdate the RegTest.S file used by several GCC RISC-V demos to ensure correct alignmen...
rtel [Mon, 14 Oct 2019 00:16:25 +0000 (00:16 +0000)]
Update the RegTest.S file used by several GCC RISC-V demos to ensure correct alignment of constant loads from assembly code.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2739 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoTidy up the RISC-V_RV32_SiFive_HiFive1_GCC demo ready for its eventual release.
rtel [Mon, 14 Oct 2019 00:04:53 +0000 (00:04 +0000)]
Tidy up the RISC-V_RV32_SiFive_HiFive1_GCC demo ready for its eventual release.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2738 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdded the "full" demo to the RISC-V_RV32_SiFive_HiFive1_GCC demo - backup check in...
rtel [Sun, 13 Oct 2019 22:53:00 +0000 (22:53 +0000)]
Added the "full" demo to the RISC-V_RV32_SiFive_HiFive1_GCC demo - backup check in only as still a work in progress.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2737 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRIS-V_RV32_SiFive_HiFive1_GCC project now running the blinky demo - still a work...
rtel [Fri, 11 Oct 2019 02:59:13 +0000 (02:59 +0000)]
RIS-V_RV32_SiFive_HiFive1_GCC project now running the blinky demo - still a work in progress.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2736 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoFormatting changes only.
rtel [Thu, 10 Oct 2019 17:56:10 +0000 (17:56 +0000)]
Formatting changes only.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2735 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRISC-V-RV32_SiFive_HiFive1_GCC project is now also building the FreeRTOS kernel code...
rtel [Thu, 10 Oct 2019 17:54:56 +0000 (17:54 +0000)]
RISC-V-RV32_SiFive_HiFive1_GCC project is now also building the FreeRTOS kernel code - but not using it yet - still a work in progress.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2734 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoBase project to replace existing Freedom Studio project using latest Freedom Studio...
rtel [Wed, 9 Oct 2019 04:50:11 +0000 (04:50 +0000)]
Base project to replace existing Freedom Studio project using latest Freedom Studio project format - builds and executes but does not yet include RTOS code.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2733 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoMinor formatting change in comment only.
rtel [Mon, 7 Oct 2019 18:56:33 +0000 (18:56 +0000)]
Minor formatting change in comment only.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2732 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoUpdate FreeRTOS.h with the version in GitHub. This is also to test submodule.
yuhzheng [Tue, 24 Sep 2019 22:29:35 +0000 (22:29 +0000)]
Update FreeRTOS.h with the version in GitHub. This is also to test submodule.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2731 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoNordic port. Notes for Richard -- the work items we discussed about for nrf52840...
yuhzheng [Tue, 24 Sep 2019 22:26:36 +0000 (22:26 +0000)]
Nordic port. Notes for Richard -- the work items we discussed about for nrf52840-dk and Wiced_CY still remain. The only reason for this commit is we want to test out submodule.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2730 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRevert 2728. Not because the files are still needed, but because we want to test...
yuhzheng [Tue, 24 Sep 2019 22:19:54 +0000 (22:19 +0000)]
Revert 2728. Not because the files are still needed, but because we want to test out submodule.

Before further updating project files in GitHub, keeping an additional copy.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2729 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoWiced_CY port is not needed anymore. Use GCC/ARM_CRx_No_GIC instead.
yuhzheng [Tue, 24 Sep 2019 20:56:55 +0000 (20:56 +0000)]
Wiced_CY port is not needed anymore. Use GCC/ARM_CRx_No_GIC instead.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2728 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdding tickless hooks to GCC/ARM_CRx_No_GIC port.
yuhzheng [Tue, 24 Sep 2019 20:07:40 +0000 (20:07 +0000)]
Adding tickless hooks to GCC/ARM_CRx_No_GIC port.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2727 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoCorrect code comments that referred to taskYIELD_FROM_ISR to portYIELD_FROM_ISR.
rtel [Tue, 24 Sep 2019 16:06:21 +0000 (16:06 +0000)]
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

5 years agosync from github to svn: this version of atomic.h does not have compiler specific...
yuhzheng [Mon, 23 Sep 2019 16:51:03 +0000 (16:51 +0000)]
sync from github to svn: this version of atomic.h does not have compiler specific symbols. compiler specific optimization is to be merged in each port/<compiler>/<arch> directory.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2725 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agosync from github to svn: Xtensa GCC as-is.
yuhzheng [Fri, 20 Sep 2019 22:09:21 +0000 (22:09 +0000)]
sync from github to svn: Xtensa GCC as-is.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2724 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agosync from github to svn: Wiced_CY for AFR Cypress ports.
yuhzheng [Fri, 20 Sep 2019 20:52:30 +0000 (20:52 +0000)]
sync from github to svn: Wiced_CY for AFR Cypress ports.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2723 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agosync from github to svn: documentation for RISC-V. This may be a temporary parking...
yuhzheng [Fri, 20 Sep 2019 20:47:29 +0000 (20:47 +0000)]
sync from github to svn: documentation for RISC-V. This may be a temporary parking location.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2722 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agosync from github to svn: Renasas/RX100 #pragma _VECT()
yuhzheng [Fri, 20 Sep 2019 20:41:32 +0000 (20:41 +0000)]
sync from github to svn: Renasas/RX100 #pragma _VECT()

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2721 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoRISC-V port updates: The machine timer compare register can now be for any HART...
rtel [Wed, 4 Sep 2019 15:46:45 +0000 (15:46 +0000)]
RISC-V port updates:  The machine timer compare register can now be for any HART, and correct the sequence used to update the 64-bit machine timer compare register on 32-bit cores.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2720 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoMinor bug fix in NTPDemo.c -> use of FREERTOS_INVALID_SOCKET in place of NULL.
rtel [Wed, 4 Sep 2019 00:13:17 +0000 (00:13 +0000)]
Minor bug fix in NTPDemo.c -> use of FREERTOS_INVALID_SOCKET in place of NULL.
Update trace recorder code to account for uxPendedTicks renaming to xPendedTicks.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2719 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdd IAR RISC-V port to SVN - a work in progress.
rtel [Tue, 3 Sep 2019 01:39:29 +0000 (01:39 +0000)]
Add IAR RISC-V port to SVN - a work in progress.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2718 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAtollic project update for CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC, GCC port.
yuhzheng [Fri, 30 Aug 2019 00:18:41 +0000 (00:18 +0000)]
Atollic project update for CORTEX_M0_Infineon_XMC1000_IAR_Keil_GCC, GCC port.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2717 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoCorrect alignment of stack top in RISC-V port when configISR_STACK_SIZE_WORDS is...
rtel [Tue, 27 Aug 2019 15:57:45 +0000 (15:57 +0000)]
Correct alignment of stack top in RISC-V port when configISR_STACK_SIZE_WORDS is defined to a non zero value.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2716 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years ago+ Moved the History.txt file from the website git repo into the source code SVN repo.
rtel [Sun, 25 Aug 2019 19:35:59 +0000 (19:35 +0000)]
+ Moved the History.txt file from the website git repo into the source code SVN repo.
+ Added xTaskCatchUpTicks() which corrects the tick count value after the application code has held interrupts disabled for an extended period.
+ Updated the xTaskResumeAll() implementation so it uses the new xTaskCatchUpTicks() function mentioned above to unwind ticks that were pended while the scheduler was suspended.
+ Various maintenance on the message buffer, stream buffer and abort delay demos.
+ Change type of uxPendedTicks from UBaseType_t to TickType_t to ensure it has same type as variables it is compared to, and therefore also rename the variable xPendingTicks.
+ Correct spelling mistake within a comment that was common to all the ARMv7-M ports.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2715 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoStarting point for IAR RISC-V project created some time ago - checking in now so...
rtel [Sun, 4 Aug 2019 15:24:15 +0000 (15:24 +0000)]
Starting point for IAR RISC-V project created some time ago - checking in now so it can be completed - currently work in progress.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2714 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoTidy up Win32 port layer - include addition of new variable that prevents recursive...
rtel [Sun, 4 Aug 2019 01:14:43 +0000 (01:14 +0000)]
Tidy up Win32 port layer - include addition of new variable that prevents recursive attempts to obtain a mutex when the trace recorder is used inside an interrupt.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2713 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoUpdate the FreeRTOS version number in task.h
gaurav-aws [Mon, 29 Jul 2019 23:48:11 +0000 (23:48 +0000)]
Update the FreeRTOS version number in task.h

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2712 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoAdd the default definition of configPRECONDITION to FreeRTOS.h.
gaurav-aws [Sat, 27 Jul 2019 23:03:23 +0000 (23:03 +0000)]
Add the default definition of configPRECONDITION to FreeRTOS.h.

This is needed for CBMC proofs.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2711 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoFiles as per 190725_FreeRTOS_IoT_Libs_Task_Pool_and_MQTT_Preview interim release.
rtel [Thu, 25 Jul 2019 20:20:24 +0000 (20:20 +0000)]
Files as per 190725_FreeRTOS_IoT_Libs_Task_Pool_and_MQTT_Preview interim release.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2708 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

5 years agoDelete obsolete makefiles that were causing confusion from RISC-V-Qemu-sifive_e-Freed...
rtel [Thu, 25 Jul 2019 20:11:37 +0000 (20:11 +0000)]
Delete obsolete makefiles that were causing confusion from RISC-V-Qemu-sifive_e-FreedomStudio demo.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2707 1d2547de-c912-0410-9cb9-b8ca96c0e9e2