From 709dabbdc6502e40470a2c718735b2d7497584d0 Mon Sep 17 00:00:00 2001 From: Avi Date: Wed, 1 Sep 2021 17:35:30 +0200 Subject: [PATCH 1/3] Fixed minor documentation typos. --- README.md | 4 ++-- SECURITY.md | 2 +- fsw/pc-rtems/README.txt | 4 ++-- fsw/pc-rtems/README_RTEMS_5.txt | 6 +++--- unit-test-coverage/mcp750-vxworks/adaptors/CMakeLists.txt | 2 +- unit-test-coverage/ut-stubs/inc/README.md | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 047fef61..5672b9b8 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ or any other system where direct access is not possible. Renames the existing ` ### Development Build: v1.5.0-rc1+dev101 -- Removes unnecessary global config structure `Target_PspConfigData` and associated elements infavor of the new version API. +- Removes unnecessary global config structure `Target_PspConfigData` and associated elements in favor of the new version API. - The mem pool stats TLM command now works on 64-bit Linux and sends out the expected telemetry packet. Converts `CFE_PSP_MemoryTable` to internal object (instead of external) that should only be accessed via the PSP API. Replace `uint32`s with `size_t`. Use full range (SIZE_MAX) in the Linux/RTEMS implementation. - See and @@ -61,7 +61,7 @@ Converts `CFE_PSP_MemoryTable` to internal object (instead of external) that sho ### Development Build: 1.5.0-rc1+dev68 -- Updates continuous integration workfow by adding static analysis with timeout and code format check. Adds status badges to ReadMe and removes old TravisCI artifacts. +- Updates continuous integration workflow by adding static analysis with timeout and code format check. Adds status badges to ReadMe and removes old TravisCI artifacts. - Adds CodeQL analysis to continuous integration - Apply standard formatting to psp codebase. Only changes whitespace. - Adds missing "+dev" to development version output diff --git a/SECURITY.md b/SECURITY.md index fd381864..54c9a35e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,7 +6,7 @@ To report a vulnerability for the PSP subsystem please [submit an issue](https:/ For general cFS vulnerabilities please [open a cFS framework issue](https://github.com/nasa/cfs/issues/new/choose) and see our [top-level security policy](https://github.com/nasa/cFS/security/policy). -In either case please use the "Bug Report" template and provide as much information as possible. Apply appropraite labels for each report. For security related reports, tag the issue with the "security" label. +In either case please use the "Bug Report" template and provide as much information as possible. Apply appropriate labels for each report. For security related reports, tag the issue with the "security" label. ## Testing diff --git a/fsw/pc-rtems/README.txt b/fsw/pc-rtems/README.txt index cd13243b..3066b4e8 100644 --- a/fsw/pc-rtems/README.txt +++ b/fsw/pc-rtems/README.txt @@ -19,9 +19,9 @@ I. Setting up and compiling RTEMS BSP 1) install RTEMS toolchain for i386-rtems4.11 (or relevant target arch) into /opt/rtems-4.11 -The RTEMS official docs have instructions for this, which should supercede anything here. +The RTEMS official docs have instructions for this, which should supersede anything here. -Basic use of the the "rtems source builder" tool which works at the time of this writing: +Basic use of the "rtems source builder" tool which works at the time of this writing: OFFICIAL RTEMS SOURCE BUILDER CLONE URL: git://git.rtems.org/rtems-source-builder.git diff --git a/fsw/pc-rtems/README_RTEMS_5.txt b/fsw/pc-rtems/README_RTEMS_5.txt index b2f1f753..0b03a4f2 100644 --- a/fsw/pc-rtems/README_RTEMS_5.txt +++ b/fsw/pc-rtems/README_RTEMS_5.txt @@ -20,9 +20,9 @@ I. Setting up and compiling RTEMS BSP 1) install RTEMS toolchain for i386-rtems5 (or relevant target arch) into ${HOME}/rtems5 -The RTEMS official docs have instructions for this, which should supercede anything here. +The RTEMS official docs have instructions for this, which should supersede anything here. -Basic use of the the "rtems source builder" tool which works at the time of this writing: +Basic use of the "rtems source builder" tool which works at the time of this writing: OFFICIAL RTEMS SOURCE BUILDER CLONE URL: git://git.rtems.org/rtems-source-builder.git @@ -37,7 +37,7 @@ cd rtems-source-builder/rtems Note - at the time of this writing 5.1 is the current "stable" branch and 5.1 represents the latest point release tag on that branch. We are going to use the "5" branch, which will eventually be released as 5.2. The latest -5 branch has a bux fix for the RFS file system needed by the cFS for this target. +5 branch has a bug fix for the RFS file system needed by the cFS for this target. If you use the 5.1 release tag (or tarball) you will most likely not be able to run the cFS without an error. diff --git a/unit-test-coverage/mcp750-vxworks/adaptors/CMakeLists.txt b/unit-test-coverage/mcp750-vxworks/adaptors/CMakeLists.txt index c670ddd3..df809f49 100644 --- a/unit-test-coverage/mcp750-vxworks/adaptors/CMakeLists.txt +++ b/unit-test-coverage/mcp750-vxworks/adaptors/CMakeLists.txt @@ -12,7 +12,7 @@ # "Adaptors" help enable the unit test code to reach functions/objects that # are otherwise not exposed. -# NOTE: These source files are compile with OVERRIDES on the headers just like +# NOTE: These source files are compiled with OVERRIDES on the headers just like # the FSW code is compiled. This is how it is able to include internal headers # which otherwise would fail. But that also means that adaptor code cannot call # any library functions, as this would also reach a stub, not the real function. diff --git a/unit-test-coverage/ut-stubs/inc/README.md b/unit-test-coverage/ut-stubs/inc/README.md index 720a7bff..5a8cd1f0 100644 --- a/unit-test-coverage/ut-stubs/inc/README.md +++ b/unit-test-coverage/ut-stubs/inc/README.md @@ -1,7 +1,7 @@ ABOUT THE SYSTEM HEADER OVERRIDES ================================= -The "overrides" directory contain replacement versions of many system-provided +The "overrides" directory contains replacement versions of many system-provided header files. All replacement functions and types are identified using an `OCS_` prefix. From f981fb120bc381ad4ab61a9dff0d317b79b4d946 Mon Sep 17 00:00:00 2001 From: Avi Date: Wed, 1 Sep 2021 17:39:58 +0200 Subject: [PATCH 2/3] Fixed minor comment typos. --- fsw/inc/cfe_psp.h | 4 ++-- fsw/mcp750-vxworks/inc/cfe_psp_config.h | 2 +- fsw/mcp750-vxworks/src/cfe_psp_exception.c | 4 ++-- fsw/mcp750-vxworks/src/cfe_psp_memory.c | 4 ++-- fsw/mcp750-vxworks/src/cfe_psp_ssr.c | 2 +- fsw/mcp750-vxworks/src/cfe_psp_start.c | 2 +- fsw/mcp750-vxworks/src/cfe_psp_support.c | 2 +- fsw/mcp750-vxworks/src/cfe_psp_watchdog.c | 2 +- fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c | 2 +- fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c | 2 +- fsw/pc-linux/inc/cfe_psp_config.h | 2 +- fsw/pc-linux/src/cfe_psp_memory.c | 2 +- fsw/pc-linux/src/cfe_psp_ssr.c | 2 +- fsw/pc-linux/src/cfe_psp_support.c | 2 +- fsw/pc-linux/src/cfe_psp_watchdog.c | 2 +- fsw/pc-rtems/inc/cfe_psp_config.h | 2 +- fsw/pc-rtems/src/cfe_psp_memory.c | 8 ++++---- fsw/pc-rtems/src/cfe_psp_ssr.c | 2 +- fsw/pc-rtems/src/cfe_psp_support.c | 2 +- fsw/pc-rtems/src/cfe_psp_watchdog.c | 2 +- fsw/shared/inc/cfe_psp_module.h | 4 ++-- fsw/shared/src/cfe_psp_memrange.c | 8 ++++---- fsw/shared/src/cfe_psp_module.c | 2 +- unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h | 2 +- 24 files changed, 34 insertions(+), 34 deletions(-) diff --git a/fsw/inc/cfe_psp.h b/fsw/inc/cfe_psp.h index 8884e0d5..21e9b911 100644 --- a/fsw/inc/cfe_psp.h +++ b/fsw/inc/cfe_psp.h @@ -178,7 +178,7 @@ extern void CFE_PSP_Main(void); * * Outputs an OS_time_t value indicating the time elapsed since an epoch. The * epoch is not defined, but typically represents the system boot time. The - * value increases continously over time and cannot be reset by software. + * value increases continuously over time and cannot be reset by software. * * This is similar to the CFE_PSP_Get_Timebase(), but additionally it normalizes * the output value to an OS_time_t, thereby providing consistent units to @@ -221,7 +221,7 @@ extern uint32 CFE_PSP_GetProcessorId(void); extern uint32 CFE_PSP_GetSpacecraftId(void); /* -** CFE_PSP_GetSpacecraftId retuns the Spacecraft ID (if any ) +** CFE_PSP_GetSpacecraftId returns the Spacecraft ID (if any ) */ extern const char *CFE_PSP_GetProcessorName(void); diff --git a/fsw/mcp750-vxworks/inc/cfe_psp_config.h b/fsw/mcp750-vxworks/inc/cfe_psp_config.h index 7a5b2498..5b9901a4 100644 --- a/fsw/mcp750-vxworks/inc/cfe_psp_config.h +++ b/fsw/mcp750-vxworks/inc/cfe_psp_config.h @@ -55,7 +55,7 @@ #define CFE_PSP_VX_TIMEBASE_PERIOD_DENOMINATOR 1 /* -** This define sets the number of memory ranges that are defined in the memory range defintion +** This define sets the number of memory ranges that are defined in the memory range definition ** table. */ #define CFE_PSP_MEM_TABLE_SIZE 10 diff --git a/fsw/mcp750-vxworks/src/cfe_psp_exception.c b/fsw/mcp750-vxworks/src/cfe_psp_exception.c index c546110b..e1330a2c 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_exception.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_exception.c @@ -76,7 +76,7 @@ void CFE_PSP_ExceptionHook(TASK_ID task_id, int vector, void *vpEsf); ** ** Name: CFE_PSP_AttachExceptions ** -** Purpose: This function Initializes the task execptions and adds a hook +** Purpose: This function Initializes the task exceptions and adds a hook ** into the VxWorks exception handling. The below hook is called ** for every exception that VxWorks catches. ** @@ -178,7 +178,7 @@ void CFE_PSP_SetDefaultExceptionEnvironment(void) vxFpscrSet(vxFpscrGet() | _PPC_FPSCR_VE | /* enable exceptions for invalid operations */ _PPC_FPSCR_OE | /* enable overflow exceptions */ - _PPC_FPSCR_NI | /* Non-IEEE mode for denormailized numbers */ + _PPC_FPSCR_NI | /* Non-IEEE mode for denormalized numbers */ _PPC_FPSCR_ZE); /* enable divide by zero exceptions */ vxFpscrSet(vxFpscrGet() | _PPC_FPSCR_XE | /* fp inexact exc enable */ diff --git a/fsw/mcp750-vxworks/src/cfe_psp_memory.c b/fsw/mcp750-vxworks/src/cfe_psp_memory.c index 31795876..26e036b8 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_memory.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_memory.c @@ -26,7 +26,7 @@ ** Purpose: ** cFE PSP Memory related functions. This is the implementation of the cFE ** memory areas that have to be preserved, and the API that is designed to allow -** acccess to them. It also contains memory related routines to return the +** access to them. It also contains memory related routines to return the ** address of the kernel code used in the cFE checksum. ** ** History: @@ -457,7 +457,7 @@ int32 CFE_PSP_GetKernelTextSegmentInfo(cpuaddr *PtrToKernelSegment, uint32 *Size /* ** Get the kernel start and end ** addresses from the BSP, because the - ** symbol table does not contain the symbls we need for this + ** symbol table does not contain the symbols we need for this */ StartAddress = (cpuaddr)GetWrsKernelTextStart(); EndAddress = (cpuaddr)GetWrsKernelTextEnd(); diff --git a/fsw/mcp750-vxworks/src/cfe_psp_ssr.c b/fsw/mcp750-vxworks/src/cfe_psp_ssr.c index e5139310..6bbd9a61 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_ssr.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_ssr.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ** History: ** 2005/06/05 Alan Cudmore | Initial version, diff --git a/fsw/mcp750-vxworks/src/cfe_psp_start.c b/fsw/mcp750-vxworks/src/cfe_psp_start.c index e0e268a5..c0b3a003 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_start.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_start.c @@ -118,7 +118,7 @@ void OS_Application_Startup(void) /* ** Set up the virtual FS mapping for the "/cf" directory - ** On this platform it is will use the CF:0 physical device. + ** On this platform it will use the CF:0 physical device. */ Status = OS_FileSysAddFixedMap(&fs_id, "CF:0", "/cf"); if (Status != OS_SUCCESS) diff --git a/fsw/mcp750-vxworks/src/cfe_psp_support.c b/fsw/mcp750-vxworks/src/cfe_psp_support.c index bf9b0110..1f91a461 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_support.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_support.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ** History: ** 2005/06/05 Alan Cudmore | Initial version, diff --git a/fsw/mcp750-vxworks/src/cfe_psp_watchdog.c b/fsw/mcp750-vxworks/src/cfe_psp_watchdog.c index 8a1636a6..cdb9089f 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_watchdog.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_watchdog.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ** History: ** 2009/07/20 A. Cudmore | Initial version, diff --git a/fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c b/fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c index 57ab14de..e9465aff 100644 --- a/fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c +++ b/fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c @@ -273,7 +273,7 @@ int32 CFE_PSP_EepromWrite8(cpuaddr MemoryAddress, uint8 ByteValue) ** Name: CFE_PSP_EepromWriteEnable ** ** Purpose: -** Eable the eeprom for write operation +** Enable the eeprom for write operation ** ** Assumptions and Notes: ** diff --git a/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c b/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c index 63505926..25e2fba9 100644 --- a/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c +++ b/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c @@ -128,7 +128,7 @@ int32 CFE_PSP_SetupEEPROM(uint32 EEPROMSize, cpuaddr *EEPROMAddress) /* For read/write - As this is mmap'ed we dereference the pointer directly. * Hopefully the caller didn't get it wrong. - * No need to anything special for 8/16/32 width access in this mode. + * No need to do anything special for 8/16/32 width access in this mode. */ int32 CFE_PSP_EepromWrite32(cpuaddr MemoryAddress, uint32 uint32Value) { diff --git a/fsw/pc-linux/inc/cfe_psp_config.h b/fsw/pc-linux/inc/cfe_psp_config.h index 316a9529..719b4d13 100644 --- a/fsw/pc-linux/inc/cfe_psp_config.h +++ b/fsw/pc-linux/inc/cfe_psp_config.h @@ -32,7 +32,7 @@ #include /* -** This define sets the number of memory ranges that are defined in the memory range defintion +** This define sets the number of memory ranges that are defined in the memory range definition ** table. */ #define CFE_PSP_MEM_TABLE_SIZE 10 diff --git a/fsw/pc-linux/src/cfe_psp_memory.c b/fsw/pc-linux/src/cfe_psp_memory.c index 8a2325f6..a1b539b9 100644 --- a/fsw/pc-linux/src/cfe_psp_memory.c +++ b/fsw/pc-linux/src/cfe_psp_memory.c @@ -26,7 +26,7 @@ ** Purpose: ** cFE PSP Memory related functions. This is the implementation of the cFE ** memory areas that have to be preserved, and the API that is designed to allow -** acccess to them. It also contains memory related routines to return the +** access to them. It also contains memory related routines to return the ** address of the kernel code used in the cFE checksum. ** ** History: diff --git a/fsw/pc-linux/src/cfe_psp_ssr.c b/fsw/pc-linux/src/cfe_psp_ssr.c index f32b5958..e9e73673 100644 --- a/fsw/pc-linux/src/cfe_psp_ssr.c +++ b/fsw/pc-linux/src/cfe_psp_ssr.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ** History: ** 2005/06/05 Alan Cudmore | Initial version, diff --git a/fsw/pc-linux/src/cfe_psp_support.c b/fsw/pc-linux/src/cfe_psp_support.c index 019e7dbc..352f4fff 100644 --- a/fsw/pc-linux/src/cfe_psp_support.c +++ b/fsw/pc-linux/src/cfe_psp_support.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ******************************************************************************/ diff --git a/fsw/pc-linux/src/cfe_psp_watchdog.c b/fsw/pc-linux/src/cfe_psp_watchdog.c index ed6949da..2d3c91c0 100644 --- a/fsw/pc-linux/src/cfe_psp_watchdog.c +++ b/fsw/pc-linux/src/cfe_psp_watchdog.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ** History: ** 2009/07/20 A. Cudmore | Initial version, diff --git a/fsw/pc-rtems/inc/cfe_psp_config.h b/fsw/pc-rtems/inc/cfe_psp_config.h index 2ef50afe..02ae9e1d 100644 --- a/fsw/pc-rtems/inc/cfe_psp_config.h +++ b/fsw/pc-rtems/inc/cfe_psp_config.h @@ -30,7 +30,7 @@ #include /* -** This define sets the number of memory ranges that are defined in the memory range defintion +** This define sets the number of memory ranges that are defined in the memory range definition ** table. */ #define CFE_PSP_MEM_TABLE_SIZE 10 diff --git a/fsw/pc-rtems/src/cfe_psp_memory.c b/fsw/pc-rtems/src/cfe_psp_memory.c index c8cc16fe..5b86f991 100644 --- a/fsw/pc-rtems/src/cfe_psp_memory.c +++ b/fsw/pc-rtems/src/cfe_psp_memory.c @@ -26,7 +26,7 @@ ** Purpose: ** cFE PSP Memory related functions. This is the implementation of the cFE ** memory areas that have to be preserved, and the API that is designed to allow -** acccess to them. It also contains memory related routines to return the +** access to them. It also contains memory related routines to return the ** address of the kernel code used in the cFE checksum. ** ** History: @@ -421,7 +421,7 @@ void CFE_PSP_SetupReservedMemoryMap(void) /* * Set up the "RAM" entry in the memory table. - * On RTEMS this is just encompasses the entire memory space, but an entry needs + * On RTEMS this just encompasses the entire memory space, but an entry needs * to exist so that CFE_PSP_ValidateMemRange() works as intended. */ CFE_PSP_MemRangeSet(0, CFE_PSP_MEM_RAM, 0, SIZE_MAX, CFE_PSP_MEM_SIZE_DWORD, CFE_PSP_MEM_ATTR_READWRITE); @@ -480,7 +480,7 @@ int32 CFE_PSP_GetKernelTextSegmentInfo(cpuaddr *PtrToKernelSegment, uint32 *Size /* ** Get the kernel start and end ** addresses from the BSP, because the - ** symbol table does not contain the symbls we need for this + ** symbol table does not contain the symbols we need for this */ StartAddress = (cpuaddr)0x0; EndAddress = (cpuaddr)0x1024; @@ -522,7 +522,7 @@ int32 CFE_PSP_GetCFETextSegmentInfo(cpuaddr *PtrToCFESegment, uint32 *SizeOfCFES /* ** Get the kernel start and end ** addresses from the BSP, because the - ** symbol table does not contain the symbls we need for this + ** symbol table does not contain the symbols we need for this */ StartAddress = (cpuaddr)0x0; EndAddress = (cpuaddr)0x1024; diff --git a/fsw/pc-rtems/src/cfe_psp_ssr.c b/fsw/pc-rtems/src/cfe_psp_ssr.c index a4facc6f..9c4bbff5 100644 --- a/fsw/pc-rtems/src/cfe_psp_ssr.c +++ b/fsw/pc-rtems/src/cfe_psp_ssr.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ** History: ** 2005/06/05 Alan Cudmore | Initial version, diff --git a/fsw/pc-rtems/src/cfe_psp_support.c b/fsw/pc-rtems/src/cfe_psp_support.c index 29014f31..9fbf4b88 100644 --- a/fsw/pc-rtems/src/cfe_psp_support.c +++ b/fsw/pc-rtems/src/cfe_psp_support.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ** History: ** 2005/06/05 Alan Cudmore | Initial version, diff --git a/fsw/pc-rtems/src/cfe_psp_watchdog.c b/fsw/pc-rtems/src/cfe_psp_watchdog.c index 48176f84..66c43898 100644 --- a/fsw/pc-rtems/src/cfe_psp_watchdog.c +++ b/fsw/pc-rtems/src/cfe_psp_watchdog.c @@ -24,7 +24,7 @@ ** Purpose: ** This file contains glue routines between the cFE and the OS Board Support Package ( BSP ). ** The functions here allow the cFE to interface functions that are board and OS specific -** and usually dont fit well in the OS abstraction layer. +** and usually don't fit well in the OS abstraction layer. ** ** History: ** 2009/07/20 A. Cudmore | Initial version, diff --git a/fsw/shared/inc/cfe_psp_module.h b/fsw/shared/inc/cfe_psp_module.h index 7bbfc727..e8b7d0ef 100644 --- a/fsw/shared/inc/cfe_psp_module.h +++ b/fsw/shared/inc/cfe_psp_module.h @@ -41,7 +41,7 @@ typedef enum } CFE_PSP_ModuleType_t; /** - * Protoype for a PSP module initialization function + * Prototype for a PSP module initialization function */ typedef void (*CFE_PSP_ModuleInitFunc_t)(uint32 PspModuleId); @@ -77,7 +77,7 @@ typedef const struct * * This function should only be called during PSP initialization before the * system is operational. It is not intended to be called from application code after - * CFE has started. The function is not necessarily be thread-safe and should be called + * CFE has started. The function is not necessarily thread-safe and should be called * before any child threads are created. * * Note that this does _not_ return any status -- diff --git a/fsw/shared/src/cfe_psp_memrange.c b/fsw/shared/src/cfe_psp_memrange.c index ac8a2898..d810e745 100644 --- a/fsw/shared/src/cfe_psp_memrange.c +++ b/fsw/shared/src/cfe_psp_memrange.c @@ -205,7 +205,7 @@ uint32 CFE_PSP_MemRanges(void) ** Global Outputs: Changes CFE_PSP_MemoryTable ** ** Return Values: -** CFE_PSP_SUCCESS -- Memory range set successfuly. +** CFE_PSP_SUCCESS -- Memory range set successfully. ** CFE_PSP_INVALID_MEM_RANGE -- The index into the table is invalid ** CFE_PSP_INVALID_MEM_ADDR -- Starting address is not valid ** CFE_PSP_INVALID_MEM_TYPE -- Memory type associated with the range does not match the passed in type. @@ -262,7 +262,7 @@ int32 CFE_PSP_MemRangeSet(uint32 RangeNum, uint32 MemoryType, cpuaddr StartAddr, ** This function retrieves one of the records in the CFE_PSP_MemoryTable. ** ** Assumptions and Notes: -** Becasue the table is fixed size, the entries are accessed by using the integer index. +** Because the table is fixed size, the entries are accessed by using the integer index. ** ** Parameters: ** RangeNum -- A 32 bit integer ( starting with 0 ) specifying the MemoryTable entry. @@ -272,7 +272,7 @@ int32 CFE_PSP_MemRangeSet(uint32 RangeNum, uint32 MemoryType, cpuaddr StartAddr, ** is stored. ** *Size -- A pointer to the 32 bit integer where the 32 bit size of the memory range ** is stored. -** *WordSize -- A pointer to the 32 bit integer where the the minimum addressable size of the range: +** *WordSize -- A pointer to the 32 bit integer where the minimum addressable size of the range: ** ( CFE_PSP_MEM_SIZE_BYTE, CFE_PSP_MEM_SIZE_WORD, CFE_PSP_MEM_SIZE_DWORD ) ** Attributes -- The attributes of the Memory Range: ** (CFE_PSP_MEM_ATTR_WRITE, CFE_PSP_MEM_ATTR_READ, CFE_PSP_MEM_ATTR_READWRITE) @@ -282,7 +282,7 @@ int32 CFE_PSP_MemRangeSet(uint32 RangeNum, uint32 MemoryType, cpuaddr StartAddr, ** Global Outputs: Changes CFE_PSP_MemoryTable ** ** Return Values: -** CFE_PSP_SUCCESS -- Memory range returned successfuly. +** CFE_PSP_SUCCESS -- Memory range returned successfully. ** CFE_PSP_INVALID_POINTER -- Parameter error ** CFE_PSP_INVALID_MEM_RANGE -- The index into the table is invalid */ diff --git a/fsw/shared/src/cfe_psp_module.c b/fsw/shared/src/cfe_psp_module.c index adc18174..a4b4ff77 100644 --- a/fsw/shared/src/cfe_psp_module.c +++ b/fsw/shared/src/cfe_psp_module.c @@ -48,7 +48,7 @@ static uint32 CFE_PSP_ModuleCount = 0; /*************************************************** * Function Name: CFE_PSP_ModuleInitList * - * Helper function to initalize a list of modules (not externally called) + * Helper function to initialize a list of modules (not externally called) */ void CFE_PSP_ModuleInitList(CFE_StaticModuleLoadEntry_t *ListPtr) { diff --git a/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h b/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h index 6f6e06e8..15ceacd4 100644 --- a/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h +++ b/unit-test-coverage/ut-stubs/inc/PCS_vxWorks.h @@ -58,7 +58,7 @@ typedef long PCS_Vx_usr_arg_t; * without arguments, e.g. "int (*FUNCPTR)()". This is acceptable * by some compilers but generally incompatible with the * "-Wstrict-prototype" gcc warning option. So in this override it - * is defined as a int argument. This means that application code + * is defined as an int argument. This means that application code * may need to cast it at the time of use (which is generally done anyway). */ typedef int (*PCS_FUNCPTR)(int); From 6ae8144076511742f7c306d7b825e995523c4d7a Mon Sep 17 00:00:00 2001 From: Avi Date: Wed, 1 Sep 2021 17:42:06 +0200 Subject: [PATCH 3/3] Fixed minor text typo in source code (printf string). --- fsw/pc-rtems/src/cfe_psp_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsw/pc-rtems/src/cfe_psp_memory.c b/fsw/pc-rtems/src/cfe_psp_memory.c index 5b86f991..45432071 100644 --- a/fsw/pc-rtems/src/cfe_psp_memory.c +++ b/fsw/pc-rtems/src/cfe_psp_memory.c @@ -373,7 +373,7 @@ void CFE_PSP_SetupReservedMemoryMap(void) RequiredSize += CDSSize; RequiredSize += UserReservedSize; - OS_printf("Sizeof BSP reserved memory = %u bytes\n", (unsigned int)RequiredSize); + OS_printf("Size of BSP reserved memory = %u bytes\n", (unsigned int)RequiredSize); PcRtems_ReservedMemBlock.BlockPtr = malloc(RequiredSize);