Skip to content

Commit

Permalink
cfe, Osal, and psp merges
Browse files Browse the repository at this point in the history
  • Loading branch information
@astrogeco
astrogeco committed Nov 3, 2021
1 parent cd93e37 commit 9d1e3f5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 52 files
+1 −1 cmake/mission_defaults.cmake
+29 −0 modules/config/CMakeLists.txt
+22 −0 modules/config/cmake/cfe_config_ids.h.in
+8 −0 modules/config/cmake/cfe_config_map.c.in
+175 −0 modules/config/fsw/src/cfe_config_get.c
+229 −0 modules/config/fsw/src/cfe_config_init.c
+69 −0 modules/config/fsw/src/cfe_config_lookup.c
+43 −0 modules/config/fsw/src/cfe_config_map.h
+100 −0 modules/config/fsw/src/cfe_config_priv.h
+92 −0 modules/config/fsw/src/cfe_config_set.c
+56 −0 modules/config/fsw/src/cfe_config_table.h
+61 −0 modules/config/mission_build.cmake
+22 −0 modules/config/ut-coverage/CMakeLists.txt
+285 −0 modules/config/ut-coverage/test_cfe_config.c
+124 −0 modules/core_api/fsw/inc/cfe_config.h
+55 −0 modules/core_api/fsw/inc/cfe_config_api_typedefs.h
+2 −0 modules/core_api/ut-stubs/CMakeLists.txt
+96 −0 modules/core_api/ut-stubs/src/cfe_config_handlers.c
+124 −0 modules/core_api/ut-stubs/src/cfe_config_stubs.c
+16 −16 modules/core_api/ut-stubs/src/cfe_es_stubs.c
+3 −3 modules/core_api/ut-stubs/src/cfe_evs_stubs.c
+9 −9 modules/core_api/ut-stubs/src/cfe_fs_stubs.c
+18 −18 modules/core_api/ut-stubs/src/cfe_msg_stubs.c
+4 −4 modules/core_api/ut-stubs/src/cfe_resourceid_stubs.c
+15 −15 modules/core_api/ut-stubs/src/cfe_sb_stubs.c
+3 −3 modules/core_api/ut-stubs/src/cfe_tbl_stubs.c
+9 −9 modules/core_api/ut-stubs/src/cfe_time_stubs.c
+53 −0 modules/core_private/fsw/inc/cfe_config_core_internal.h
+2 −2 modules/core_private/fsw/inc/cfe_es_core_internal.h
+3 −3 modules/core_private/fsw/inc/cfe_evs_core_internal.h
+1 −1 modules/core_private/fsw/inc/cfe_fs_core_internal.h
+3 −3 modules/core_private/fsw/inc/cfe_sb_core_internal.h
+3 −3 modules/core_private/fsw/inc/cfe_tbl_core_internal.h
+3 −3 modules/core_private/fsw/inc/cfe_time_core_internal.h
+1 −0 modules/core_private/ut-stubs/CMakeLists.txt
+68 −0 modules/core_private/ut-stubs/src/cfe_config_core_internal_stubs.c
+1 −1 modules/core_private/ut-stubs/src/cfe_es_core_internal_stubs.c
+1 −1 modules/core_private/ut-stubs/src/cfe_fs_core_internal_stubs.c
+1 −1 modules/core_private/ut-stubs/src/ut_support.c
+3 −3 modules/es/fsw/src/cfe_es_global.h
+4 −1 modules/es/fsw/src/cfe_es_objtab.c
+8 −8 modules/es/fsw/src/cfe_es_resource.h
+5 −5 modules/es/fsw/src/cfe_es_start.h
+26 −97 modules/es/fsw/src/cfe_es_task.c
+1 −1 modules/es/ut-coverage/es_UT.c
+2 −2 modules/evs/fsw/src/cfe_evs_task.h
+4 −4 modules/fs/fsw/src/cfe_fs_priv.h
+9 −2 modules/resourceid/fsw/inc/cfe_core_resourceid_basevalues.h
+1 −1 modules/sb/fsw/src/cfe_sb_priv.h
+1 −1 modules/tbl/fsw/src/cfe_tbl_internal.h
+1 −1 modules/tbl/fsw/src/cfe_tbl_task.h
+4 −4 modules/tbl/fsw/src/cfe_tbl_task_cmds.h
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 5 files
+6 −0 src/os/inc/common_types.h
+16 −0 src/os/inc/osapi-error.h
+1 −1 src/os/portable/os-impl-posix-gettime.c
+3 −1 src/unit-test-coverage/ut-stubs/src/vxworks-intLib-stubs.c
+27 −4 ut_assert/scripts/generate_stubs.pl
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 1 files
+18 −18 fsw/pc-linux/src/cfe_psp_memory.c

0 comments on commit 9d1e3f5

Please sign in to comment.