Integration Candidate 2021-01-19

Combines: nasa/cFE#1109 nasa/osal#767 nasa/PSP#243 nasa/sample_app#121 nasa/ci_lab#68 nasa/to_lab#79 nasa/sch_lab#62 nasa/sample_lib#41 nasa/tblCRCTool#29 nasa/elf2cfetbl#65 nasa/cFS-GroundSystem#150
nasa · Jan 27, 2021 · d859dde · d859dde
1 parent e1d71e4
commit d859dde
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/apps/sample_app b/apps/sample_app
diff --git a/apps/sample_lib b/apps/sample_lib
diff --git a/apps/sch_lab b/apps/sch_lab
diff --git a/apps/to_lab b/apps/to_lab
diff --git a/cfe b/cfe
diff --git a/osal b/osal
diff --git a/psp b/psp
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl
diff --git a/tools/tblCRCTool b/tools/tblCRCTool
+6 −0		README.md
+15 −0		SECURITY.md
+1 −1		fsw/src/sample_app.c
+1 −1		fsw/src/sample_app_version.h
+1 −1		unit-test/coveragetest/coveragetest_sample_app.c
+34 −0		README.md
+16 −0		SECURITY.md
+0 −43		cmake/sample_defs/cpu1_platform_cfg.h
+1 −1		cmake/sample_defs/sample_perfids.h
+4 −4		cmake/sample_defs/targets.cmake
+16 −13		fsw/cfe-core/src/es/cfe_es_api.c
+10 −2		fsw/cfe-core/src/es/cfe_es_apps.c
+14 −2		fsw/cfe-core/src/es/cfe_es_cds.c
+14 −0		fsw/cfe-core/src/es/cfe_es_cds.h
+2 −1		fsw/cfe-core/src/es/cfe_es_erlog.c
+1 −0		fsw/cfe-core/src/es/cfe_es_log.h
+14 −2		fsw/cfe-core/src/es/cfe_es_mempool.c
+27 −1		fsw/cfe-core/src/es/cfe_es_mempool.h
+43 −24		fsw/cfe-core/src/es/cfe_es_resource.c
+7 −115		fsw/cfe-core/src/es/cfe_es_resource.h
+2 −1		fsw/cfe-core/src/es/cfe_es_start.c
+3 −12		fsw/cfe-core/src/es/cfe_es_task.c
+5 −3		fsw/cfe-core/src/es/cfe_es_task.h
+1 −102		fsw/cfe-core/src/inc/cfe_es.h
+4 −12		fsw/cfe-core/src/inc/cfe_es_events.h
+150 −0		fsw/cfe-core/src/inc/cfe_resourceid.h
+35 −1		fsw/cfe-core/src/inc/cfe_sb.h
+32 −2		fsw/cfe-core/src/inc/cfe_sb_msg.h
+1 −1		fsw/cfe-core/src/inc/cfe_version.h
+165 −0		fsw/cfe-core/src/inc/private/cfe_resourceid_internal.h
+1,184 −801		fsw/cfe-core/src/sb/cfe_sb_api.c
+35 −11		fsw/cfe-core/src/sb/cfe_sb_buf.c
+6 −13		fsw/cfe-core/src/sb/cfe_sb_init.c
+64 −131		fsw/cfe-core/src/sb/cfe_sb_priv.c
+113 −21		fsw/cfe-core/src/sb/cfe_sb_priv.h
+286 −101		fsw/cfe-core/src/sb/cfe_sb_task.c
+0 −8		fsw/cfe-core/src/sb/cfe_sb_verify.h
+17 −10		fsw/cfe-core/src/tbl/cfe_tbl_api.c
+6 −4		fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+1 −7		fsw/cfe-core/src/tbl/cfe_tbl_task.c
+0 −2		fsw/cfe-core/src/tbl/cfe_tbl_task.h
+6 −2		fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+13 −14		fsw/cfe-core/src/time/cfe_time_api.c
+1 −3		fsw/cfe-core/src/time/cfe_time_task.c
+1 −1		fsw/cfe-core/src/time/cfe_time_tone.c
+0 −3		fsw/cfe-core/src/time/cfe_time_utils.c
+0 −3		fsw/cfe-core/src/time/cfe_time_utils.h
+215 −211		fsw/cfe-core/unit-test/es_UT.c
+76 −54		fsw/cfe-core/unit-test/evs_UT.c
+2 −2		fsw/cfe-core/unit-test/fs_UT.c
+247 −173		fsw/cfe-core/unit-test/sb_UT.c
+0 −17		fsw/cfe-core/unit-test/sb_UT.h
+210 −163		fsw/cfe-core/unit-test/tbl_UT.c
+2 −0		fsw/cfe-core/unit-test/ut_osprintf_stubs.c
+2 −0		fsw/cfe-core/unit-test/ut_osprintf_stubs.h
+2 −1		fsw/cfe-core/unit-test/ut_support.c
+0 −17		fsw/cfe-core/unit-test/ut_support.h
+61 −0		fsw/cfe-core/ut-stubs/ut_es_stubs.c
+1 −1		fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+1 −0		modules/msg/mission_inc/default_cfe_msg_hdr_pri.h
+1 −0		modules/msg/mission_inc/default_cfe_msg_hdr_priext.h
+19 −0		README.md
+15 −0		SECURITY.md
+41 −37		src/os/inc/osapi-clock.h
+11 −0		src/os/inc/osapi-filesys.h
+1 −1		src/os/inc/osapi-version.h
+5 −0		src/os/inc/osapi.h
+4 −0		src/os/shared/src/osapi-filesys.c
+12 −2		src/tests/file-api-test/file-api-test.c
+24 −5		src/tests/network-api-test/network-api-test.c
+93 −16		src/tests/queue-test/queue-test.c
+19 −13		src/tests/select-test/select-test.c
+4 −4		src/unit-test-coverage/portable/src/coveragetest-posix-files.c
+1 −1		src/unit-test-coverage/shared/src/coveragetest-binsem.c
+6 −6		src/unit-test-coverage/shared/src/coveragetest-clock.c
+1 −1		src/unit-test-coverage/shared/src/coveragetest-countsem.c
+3 −3		src/unit-test-coverage/shared/src/coveragetest-file.c
+7 −84		src/unit-test-coverage/shared/src/coveragetest-filesys.c
+1 −1		src/unit-test-coverage/shared/src/coveragetest-idmap.c
+1 −1		src/unit-test-coverage/shared/src/coveragetest-mutex.c
+2 −2		src/unit-test-coverage/shared/src/coveragetest-queue.c
+1 −1		src/unit-test-coverage/shared/src/coveragetest-select.c
+1 −1		src/unit-test-coverage/shared/src/coveragetest-sockets.c
+3 −3		src/unit-test-coverage/shared/src/coveragetest-task.c
+11 −11		src/unit-test-coverage/shared/src/coveragetest-time.c
+2 −2		src/unit-test-coverage/shared/src/coveragetest-timebase.c
+1 −1		src/unit-test-coverage/vxworks/src/coveragetest-common.c
+2 −2		src/unit-test-coverage/vxworks/src/coveragetest-console.c
+5 −5		src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
+1 −1		src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
+4 −4		src/unit-test-coverage/vxworks/src/coveragetest-loader.c
+4 −4		src/unit-test-coverage/vxworks/src/coveragetest-no-module.c
+3 −3		src/unit-test-coverage/vxworks/src/coveragetest-symtab.c
+1 −1		src/unit-test-coverage/vxworks/src/coveragetest-tasks.c
+2 −2		src/unit-test-coverage/vxworks/src/coveragetest-timebase.c
+2 −1		src/unit-tests/osfile-test/ut_osfile_fileio_test.c
+0 −217		src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.c
+0 −2		src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.h
+0 −2		src/unit-tests/osfilesys-test/ut_osfilesys_test.c
+3 −0		src/unit-tests/osloader-test/CMakeLists.txt
+4 −0		src/ut-stubs/osapi-utstub-filesys.c
+8 −0		src/ut-stubs/osapi-utstub-printf.c
+0 −23		src/ut-stubs/utstub-helpers.c
+0 −6		src/ut-stubs/utstub-helpers.h
+15 −9		ut_assert/inc/utstubs.h
+5 −0		ut_assert/inc/uttest.h
+2 −1		ut_assert/src/utassert.c
+1 −0		ut_assert/src/utbsp.c
+15 −10		ut_assert/src/utstubs.c
+7 −0		README.md
+15 −0		SECURITY.md
+1 −1		fsw/mcp750-vxworks/inc/psp_version.h
+1 −1		fsw/pc-linux/inc/psp_version.h
+1 −1		fsw/pc-rtems/inc/psp_version.h
+1 −3		fsw/shared/inc/cfe_psp_module.h
+1 −2		fsw/shared/src/cfe_psp_module.c
+2 −2		unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c
+1 −1		unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c
+18 −7		GroundSystem.py
+8 −1		README.md
+15 −0		SECURITY.md
+3 −0		Subsystems/cmdUtil/cmdUtil.c
+6 −7		_version.py
+7 −1		README.md
+15 −0		SECURITY.md
+31 −54		cfe_ts_crc.c
+1 −1		cfe_ts_crc_version.h