Skip to content

Commit

Permalink
cFS bundle Integration Candidate: 2021-04-02
Browse files Browse the repository at this point in the history 
*Submodule ICs:*
nasa/cFE#1279, nasa/PSP#288

*Contents:*

nasa/cFE#1274 - Fix #1273, remove PspConfig global object
nasa/cFE#1278 - Fix #1277, ZeroCopy typo in ReadMe

nasa/PSP#287 - Fix #280, remove psp configdata global object
nasa/PSP#283 - Fix #281, cleanup memory range table
  • Loading branch information
@astrogeco
astrogeco committed Apr 2, 2021
1 parent 7b97e0d commit 3607a1d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 5 files
+7 −1 README.md
+0 −2 cmake/target/inc/target_config.h
+0 −1 cmake/target/src/target_config.c
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+6 −6 modules/es/fsw/src/cfe_es_task.c
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 23 files
+7 −0 README.md
+3 −22 fsw/inc/cfe_psp.h
+0 −86 fsw/inc/cfe_psp_configdata.h
+2 −3 fsw/mcp750-vxworks/CMakeLists.txt
+3 −1 fsw/mcp750-vxworks/inc/psp_version.h
+5 −0 fsw/mcp750-vxworks/src/cfe_psp_memory.c
+0 −54 fsw/mcp750-vxworks/src/cfe_psp_memtab.c
+2 −3 fsw/pc-linux/CMakeLists.txt
+3 −1 fsw/pc-linux/inc/psp_version.h
+7 −0 fsw/pc-linux/src/cfe_psp_memory.c
+0 −55 fsw/pc-linux/src/cfe_psp_memtab.c
+2 −3 fsw/pc-rtems/CMakeLists.txt
+3 −1 fsw/pc-rtems/inc/psp_version.h
+7 −0 fsw/pc-rtems/src/cfe_psp_memory.c
+0 −55 fsw/pc-rtems/src/cfe_psp_memtab.c
+0 −1 fsw/shared/CMakeLists.txt
+22 −0 fsw/shared/inc/cfe_psp_memory.h
+0 −52 fsw/shared/src/cfe_psp_configdata.c
+35 −30 fsw/shared/src/cfe_psp_memrange.c
+0 −1 fsw/shared/src/cfe_psp_module.c
+8 −8 fsw/shared/src/cfe_psp_version.c
+1 −2 unit-test-coverage/ut-stubs/src/cfe-configdata-stubs.c
+2 −4 ut-stubs/ut_psp_stubs.c

0 comments on commit 3607a1d

Please sign in to comment.