Skip to content

Commit

Permalink
cFS Bundle Integration Candidate: 2021-01-12 (#174)
Browse files Browse the repository at this point in the history 
Combines
- nasa/cFE#1088
- nasa/osal#750
- nasa/PSP#240
  • Loading branch information
@astrogeco
astrogeco authored Jan 13, 2021
1 parent 1406464 commit 9dd4ec7
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 13 files
+9 −0 README.md
+2 −15 fsw/cfe-core/src/es/cfe_es_backgroundtask.c
+9 −22 fsw/cfe-core/src/es/cfe_es_start.c
+1 −9 fsw/cfe-core/src/inc/cfe_sb.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+0 −86 fsw/cfe-core/src/inc/network_includes.h
+2 −2 fsw/cfe-core/src/sb/cfe_sb_api.c
+1 −1 fsw/cfe-core/src/sb/cfe_sb_priv.h
+16 −84 fsw/cfe-core/src/time/cfe_time_api.c
+2 −2 fsw/cfe-core/src/time/cfe_time_utils.c
+13 −14 fsw/cfe-core/unit-test/es_UT.c
+9 −44 fsw/cfe-core/unit-test/time_UT.c
+1 −2 fsw/cfe-core/unit-test/ut_support.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 72 files
+26 −0 README.md
+1 −1 src/bsp/pc-rtems/src/bsp_console.c
+1 −6 src/os/inc/common_types.h
+337 −3 src/os/inc/osapi-clock.h
+6 −5 src/os/inc/osapi-file.h
+47 −0 src/os/inc/osapi-filesys.h
+1 −1 src/os/inc/osapi-version.h
+104 −48 src/os/portable/os-impl-posix-files.c
+4 −5 src/os/portable/os-impl-posix-gettime.c
+44 −0 src/os/posix/inc/os-impl-idmap.h
+76 −119 src/os/posix/src/os-impl-idmap.c
+79 −7 src/os/posix/src/os-impl-tasks.c
+1 −1 src/os/posix/src/os-impl-timebase.c
+43 −0 src/os/rtems/inc/os-impl-idmap.h
+58 −81 src/os/rtems/src/os-impl-idmap.c
+1 −1 src/os/rtems/src/os-impl-network.c
+2 −2 src/os/rtems/src/os-impl-queues.c
+15 −1 src/os/rtems/src/os-impl-tasks.c
+0 −16 src/os/shared/inc/os-shared-common.h
+0 −16 src/os/shared/inc/os-shared-filesys.h
+59 −13 src/os/shared/inc/os-shared-idmap.h
+10 −0 src/os/shared/inc/os-shared-task.h
+1 −1 src/os/shared/src/osapi-clock.c
+11 −0 src/os/shared/src/osapi-common.c
+12 −2 src/os/shared/src/osapi-file.c
+55 −19 src/os/shared/src/osapi-filesys.c
+292 −213 src/os/shared/src/osapi-idmap.c
+7 −2 src/os/shared/src/osapi-module.c
+22 −53 src/os/shared/src/osapi-sockets.c
+2 −0 src/os/shared/src/osapi-task.c
+2 −0 src/os/shared/src/osapi-timebase.c
+6 −9 src/os/vxworks/CMakeLists.txt
+12 −0 src/os/vxworks/inc/os-impl-dirs.h
+44 −0 src/os/vxworks/inc/os-impl-idmap.h
+0 −20 src/os/vxworks/inc/os-vxworks.h
+0 −172 src/os/vxworks/src/os-impl-dirs.c
+66 −17 src/os/vxworks/src/os-impl-filesys.c
+115 −60 src/os/vxworks/src/os-impl-idmap.c
+19 −5 src/os/vxworks/src/os-impl-tasks.c
+17 −10 src/os/vxworks/src/os-impl-timebase.c
+22 −18 src/tests/file-api-test/file-api-test.c
+1 −1 src/tests/osal-core-test/osal-core-test.c
+13 −32 src/tests/select-test/select-test.c
+2 −10 src/tests/timer-add-api-test/timer-add-api-test.c
+1 −9 src/tests/timer-test/timer-test.c
+25 −19 src/unit-test-coverage/portable/src/coveragetest-posix-dirs.c
+12 −1 src/unit-test-coverage/portable/src/coveragetest-posix-files.c
+4 −6 src/unit-test-coverage/portable/src/coveragetest-posix-gettime.c
+102 −0 src/unit-test-coverage/shared/src/coveragetest-clock.c
+59 −3 src/unit-test-coverage/shared/src/coveragetest-filesys.c
+356 −12 src/unit-test-coverage/shared/src/coveragetest-idmap.c
+9 −1 src/unit-test-coverage/shared/src/coveragetest-sockets.c
+4 −0 src/unit-test-coverage/shared/src/coveragetest-timebase.c
+4 −0 src/unit-test-coverage/ut-stubs/inc/OCS_errno.h
+4 −0 src/unit-test-coverage/ut-stubs/inc/OCS_fcntl.h
+7 −5 src/unit-test-coverage/ut-stubs/inc/OCS_stat.h
+4 −0 src/unit-test-coverage/ut-stubs/override_inc/errno.h
+3 −0 src/unit-test-coverage/ut-stubs/override_inc/fcntl.h
+8 −2 src/unit-test-coverage/ut-stubs/src/osapi-idmap-impl-stubs.c
+1 −0 src/unit-test-coverage/ut-stubs/src/osapi-task-impl-stubs.c
+1 −1 src/unit-test-coverage/vxworks/CMakeLists.txt
+2 −1 src/unit-test-coverage/vxworks/adaptors/src/ut-adaptor-idmap.c
+34 −0 src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
+8 −15 src/unit-test-coverage/vxworks/src/coveragetest-idmap.c
+8 −10 src/unit-tests/oscore-test/ut_oscore_misc_test.c
+117 −0 src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.c
+1 −0 src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.h
+1 −0 src/unit-tests/osfilesys-test/ut_osfilesys_test.c
+2 −2 src/unit-tests/ostimer-test/ut_ostimer_test.c
+3 −4 src/ut-stubs/osapi-utstub-clock.c
+22 −0 src/ut-stubs/osapi-utstub-filesys.c
+33 −3 src/ut-stubs/osapi-utstub-idmap.c
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 8 files
+5 −0 README.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+12 −3 fsw/mcp750-vxworks/src/cfe_psp_timer.c
+1 −1 fsw/pc-linux/inc/psp_version.h
+2 −2 fsw/pc-linux/src/cfe_psp_timer.c
+1 −1 fsw/pc-rtems/inc/psp_version.h
+2 −3 fsw/pc-rtems/src/cfe_psp_timer.c
+1 −2 ut-stubs/ut_psp_stubs.c

0 comments on commit 9dd4ec7

Please sign in to comment.