Merge pull request #193 from nasa/integration-candidate

cFS Bundle Integration Candidate: 2021-02-23
nasa · Feb 26, 2021 · 3bbfbd4 · 3bbfbd4
2 parents 5ca472a + 8d0f9dc
commit 3bbfbd4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cfe b/cfe
diff --git a/osal b/osal
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
+19 −0		README.md
+8 −38		cmake/README.md
+6 −1		cmake/arch_build.cmake
+2 −3		cmake/sample_defs/cpu1_platform_cfg.h
+11 −1		cmake/sample_defs/sample_mission_cfg.h
+1 −4		docs/cFE Application Developers Guide.md
+2 −5		docs/src/cfe_es.dox
+87 −99		fsw/cfe-core/src/es/cfe_es_api.c
+184 −195		fsw/cfe-core/src/es/cfe_es_apps.c
+57 −48		fsw/cfe-core/src/es/cfe_es_apps.h
+3 −3		fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+89 −97		fsw/cfe-core/src/es/cfe_es_erlog.c
+5 −5		fsw/cfe-core/src/es/cfe_es_objtab.c
+2 −2		fsw/cfe-core/src/es/cfe_es_resource.h
+11 −9		fsw/cfe-core/src/es/cfe_es_start.c
+1 −2		fsw/cfe-core/src/es/cfe_es_start.h
+53 −31		fsw/cfe-core/src/es/cfe_es_task.c
+3 −3		fsw/cfe-core/src/es/cfe_es_task.h
+245 −0		fsw/cfe-core/src/fs/cfe_fs_api.c
+87 −0		fsw/cfe-core/src/fs/cfe_fs_priv.h
+9 −0		fsw/cfe-core/src/inc/cfe_error.h
+29 −2		fsw/cfe-core/src/inc/cfe_es.h
+117 −0		fsw/cfe-core/src/inc/cfe_fs.h
+3 −3		fsw/cfe-core/src/inc/cfe_sb_msg.h
+1 −1		fsw/cfe-core/src/inc/cfe_version.h
+8 −8		fsw/cfe-core/src/sb/cfe_sb_api.c
+52 −7		fsw/cfe-core/src/sb/cfe_sb_priv.h
+336 −325		fsw/cfe-core/src/sb/cfe_sb_task.c
+9 −0		fsw/cfe-core/src/tbl/cfe_tbl_internal.h
+18 −0		fsw/cfe-core/src/tbl/cfe_tbl_task.h
+203 −149		fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+223 −190		fsw/cfe-core/unit-test/es_UT.c
+141 −0		fsw/cfe-core/unit-test/fs_UT.c
+13 −0		fsw/cfe-core/unit-test/fs_UT.h
+150 −196		fsw/cfe-core/unit-test/sb_UT.c
+17 −122		fsw/cfe-core/unit-test/sb_UT.h
+95 −47		fsw/cfe-core/unit-test/tbl_UT.c
+5 −0		fsw/cfe-core/ut-stubs/ut_es_stubs.c
+37 −0		fsw/cfe-core/ut-stubs/ut_fs_stubs.c
+1 −1		fsw/cfe-core/ut-stubs/ut_tbl_stubs.c
+29 −18		README.md
+0 −59		src/os/inc/osapi-file.h
+0 −46		src/os/inc/osapi-filesys.h
+0 −59		src/os/inc/osapi-os-core.h
+0 −49		src/os/inc/osapi-os-filesys.h
+0 −47		src/os/inc/osapi-os-loader.h
+0 −48		src/os/inc/osapi-os-net.h
+0 −48		src/os/inc/osapi-os-timer.h
+1 −1		src/os/inc/osapi-version.h
+0 −83		src/os/shared/src/osapi-file.c
+0 −87		src/os/shared/src/osapi-filesys.c
+2 −4		src/os/shared/src/osapi-sockets.c
+0 −1		src/os/vxworks/src/os-impl-network.c
+2 −2		src/os/vxworks/src/os-impl-timebase.c
+1 −1		src/tests/bin-sem-test/bin-sem-test.c
+1 −1		src/tests/bin-sem-timeout-test/bin-sem-timeout-test.c
+469 −444		src/tests/network-api-test/network-api-test.c
+1 −1		src/tests/queue-test/queue-test.c
+274 −224		src/tests/select-test/select-test.c
+2 −53		src/ut-stubs/osapi-utstub-file.c
+0 −43		src/ut-stubs/osapi-utstub-filesys.c
+2 −31		ut_assert/inc/utstubs.h
+7 −16		ut_assert/src/utstubs.c
+11 −6		README.md
+5 −9		Subsystems/cmdGui/CHeaderParser.py
+2 −2		Subsystems/cmdUtil/SendUdp.c
+2 −1		Subsystems/cmdUtil/cmdUtil.c
+1 −1		_version.py