Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration Candidate: 2020-04-15 #70

Merged
merged 7 commits into from
Apr 27, 2020
Merged

Integration Candidate: 2020-04-15 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39c6cf7
Switch to integration candidate 2020-04-15 for cfe, osal, psp, and cF…
Apr 21, 2020
6f6883a
Update cfe, osal and cFS-GroundSystem
Apr 23, 2020
430b93f
Update cfe and osal to fix build system OSTYPE/BSPTYPE problem
Apr 24, 2020
451c917
Update CFE to fix omit deprecated build
jphickey Apr 27, 2020
e11b263
Update cfe submodule to fix MAX_API error
Apr 27, 2020
b5353d3
Add sample_lib updates. Update to latest cfe, osal, psp, and groundsy…
Apr 27, 2020
69128b9
Update submodules to master for Integration Candidate: 2020-04-15
Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/sample_app
Open in desktop
Submodule sample_app updated 1 files
+1 −1 README.md
2 changes: 1 addition & 1 deletion apps/sample_lib
Open in desktop
Submodule sample_lib updated 1 files
+4 −6 fsw/public_inc/sample_lib.h
2 changes: 1 addition & 1 deletion cfe
Open in desktop
Submodule cfe updated 47 files
+3 −2 CMakeLists.txt
+79 −58 README.md
+19 −8 cmake/arch_build.cmake
+12 −18 cmake/mission_build.cmake
+3 −3 cmake/sample_defs/default_osconfig.h
+1 −1 cmake/sample_defs/global_build_options.cmake
+2 −4 cmake/sample_defs/sample_mission_cfg.h
+211 −251 fsw/cfe-core/src/es/cfe_es_api.c
+193 −145 fsw/cfe-core/src/es/cfe_es_apps.c
+23 −17 fsw/cfe-core/src/es/cfe_es_apps.h
+6 −0 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+1 −1 fsw/cfe-core/src/es/cfe_es_shell.c
+25 −25 fsw/cfe-core/src/es/cfe_es_task.c
+5 −0 fsw/cfe-core/src/es/cfe_es_task.h
+13 −7 fsw/cfe-core/src/evs/cfe_evs_task.c
+4 −2 fsw/cfe-core/src/evs/cfe_evs_utils.c
+38 −27 fsw/cfe-core/src/inc/cfe_error.h
+17 −2 fsw/cfe-core/src/inc/cfe_es_extern_typedefs.h
+1 −1 fsw/cfe-core/src/inc/cfe_fs.h
+83 −23 fsw/cfe-core/src/inc/cfe_sb.h
+1 −1 fsw/cfe-core/src/inc/cfe_sb_msg.h
+1 −1 fsw/cfe-core/src/inc/cfe_tbl_events.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+57 −32 fsw/cfe-core/src/sb/cfe_sb_api.c
+1 −3 fsw/cfe-core/src/sb/cfe_sb_init.c
+26 −16 fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
+0 −2 fsw/cfe-core/src/sb/cfe_sb_priv.c
+0 −13 fsw/cfe-core/src/sb/cfe_sb_priv.h
+25 −14 fsw/cfe-core/src/sb/cfe_sb_task.c
+0 −37 fsw/cfe-core/src/sb/cfe_sb_util.c
+0 −4 fsw/cfe-core/src/sb/cfe_sb_verify.h
+2 −2 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+13 −11 fsw/cfe-core/src/tbl/cfe_tbl_task.c
+15 −13 fsw/cfe-core/src/time/cfe_time_task.c
+6 −6 fsw/cfe-core/src/time/cfe_time_utils.c
+77 −55 fsw/cfe-core/unit-test/es_UT.c
+31 −31 fsw/cfe-core/unit-test/evs_UT.c
+221 −99 fsw/cfe-core/unit-test/sb_UT.c
+23 −2 fsw/cfe-core/unit-test/sb_UT.h
+12 −12 fsw/cfe-core/unit-test/tbl_UT.c
+24 −24 fsw/cfe-core/unit-test/time_UT.c
+1 −1 fsw/cfe-core/unit-test/ut_support.c
+16 −15 fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+0 −737 fsw/mission_inc/cfe_mission_cfg.h
+0 −65 fsw/mission_inc/cfe_perfids.h
+0 −102 fsw/platform_inc/cpu1/cfe_msgids.h
+0 −2,106 fsw/platform_inc/cpu1/cfe_platform_cfg.h
2 changes: 1 addition & 1 deletion osal
Open in desktop
Submodule osal updated 51 files
+42 −21 CMakeLists.txt
+36 −14 README.md
+3 −1 src/bsp/mcp750-vxworks/CMakeLists.txt
+3 −3 src/bsp/mcp750-vxworks/config/osconfig.h
+5 −0 src/bsp/pc-linux/CMakeLists.txt
+2 −2 src/bsp/pc-linux/config/osconfig.h
+4 −0 src/bsp/pc-rtems/CMakeLists.txt
+2 −2 src/bsp/pc-rtems/config/osconfig.h
+33 −17 src/os/inc/osapi-os-core.h
+2 −2 src/os/inc/osapi-os-filesys.h
+1 −1 src/os/inc/osapi-os-net.h
+3 −3 src/os/inc/osapi-os-timer.h
+1 −1 src/os/inc/osapi-version.h
+1 −1 src/os/inc/osapi.h
+30 −0 src/os/portable/os-impl-no-shell.c
+1 −1 src/os/posix/CMakeLists.txt
+4 −0 src/os/posix/osapi.c
+0 −68 src/os/posix/osfileapi.c
+94 −0 src/os/posix/osshell.c
+4 −3 src/os/posix/ostimer.c
+1 −0 src/os/rtems/CMakeLists.txt
+4 −0 src/os/rtems/osapi.c
+0 −44 src/os/rtems/osfileapi.c
+75 −0 src/os/rtems/osshell.c
+1 −11 src/os/shared/os-impl.h
+9 −0 src/os/shared/osapi-common.c
+2 −1 src/os/shared/osapi-fpu.c
+10 −0 src/os/shared/osapi-select.c
+2 −1 src/os/vxworks/CMakeLists.txt
+4 −0 src/os/vxworks/osapi.c
+0 −74 src/os/vxworks/osfileapi.c
+96 −0 src/os/vxworks/osshell.c
+1 −1 src/tests/file-api-test/file-api-test.c
+0 −46 src/unit-test-coverage/posix/src/coveragetest-osapi.c
+5 −0 src/unit-test-coverage/shared/src/coveragetest-common.c
+0 −134 src/unit-test-coverage/shared/src/coveragetest-fpu.c
+2 −0 src/unit-test-coverage/ut-stubs/src/osapi-base-impl-stubs.c
+1 −1 src/unit-test-coverage/vxworks/CMakeLists.txt
+21 −0 src/unit-test-coverage/vxworks/modules/src/ut-osshell.c
+0 −51 src/unit-test-coverage/vxworks/src/coveragetest-osapi.c
+0 −31 src/unit-test-coverage/vxworks/src/coveragetest-osfileapi.c
+98 −0 src/unit-test-coverage/vxworks/src/coveragetest-osshell.c
+1 −1 src/unit-tests/oscore-test/CMakeLists.txt
+0 −164 src/unit-tests/oscore-test/ut_oscore_exception_test.c
+0 −48 src/unit-tests/oscore-test/ut_oscore_interrupt_test.h
+164 −0 src/unit-tests/oscore-test/ut_oscore_select_test.c
+10 −9 src/unit-tests/oscore-test/ut_oscore_select_test.h
+4 −5 src/unit-tests/oscore-test/ut_oscore_test.c
+1 −2 src/unit-tests/oscore-test/ut_oscore_test.h
+29 −11 src/unit-tests/ostimer-test/ut_ostimer_timerio_test.c
+2 −0 src/ut-stubs/osapi-utstub-fpu.c
2 changes: 1 addition & 1 deletion psp
Open in desktop
Submodule psp updated 7 files
+26 −12 README.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+14 −1 fsw/mcp750-vxworks/src/cfe_psp_timer.c
+1 −1 fsw/pc-linux/inc/psp_version.h
+1 −1 fsw/pc-rtems/inc/psp_version.h
+2 −3 fsw/shared/cfe_psp_configdata.c
+1 −2 fsw/shared/cfe_psp_module.c
2 changes: 1 addition & 1 deletion tools/cFS-GroundSystem
Open in desktop
Submodule cFS-GroundSystem updated 107 files