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

cFS Bundle Integration Candidate: 2021-01-12 #174

Merged
merged 18 commits into from
Jan 13, 2021
Merged

cFS Bundle Integration Candidate: 2021-01-12 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f1d208d
Add nasa/cfe#1067 and nasa/osal#704
astrogeco Jan 12, 2021
5881113
Add nasa/osal#716
astrogeco Jan 12, 2021
4dc4c1d
Add nasa/osal#717
astrogeco Jan 12, 2021
1cea293
Add nasa/cfe#1063
astrogeco Jan 12, 2021
96c8e77
Add nasa/osal#709 and nasa/osal#711
astrogeco Jan 12, 2021
87c46b4
Add nasa/cfe#1050
astrogeco Jan 12, 2021
b8a3afb
Add nasa/osal#720
astrogeco Jan 12, 2021
0416699
Add nasa/osal#734
astrogeco Jan 13, 2021
140c792
Add nasa/osal#706
astrogeco Jan 13, 2021
c0a147b
Add nasa/osal#733
astrogeco Jan 13, 2021
21c330b
Add nasa/osal#715
astrogeco Jan 13, 2021
1a54380
Add nasa/osal#723
astrogeco Jan 13, 2021
2e14da6
Add nasa/cfe#1058
astrogeco Jan 13, 2021
4f0c6c8
Add nasa/psp#231
astrogeco Jan 13, 2021
e39d320
Add Doxygen HOTFIX to nasa/osal
astrogeco Jan 13, 2021
98ceeb2
Add nasa/cfe#1082
astrogeco Jan 13, 2021
79c5808
Add nasa/osal#756
astrogeco Jan 13, 2021
27596d3
Bump submodule versions and update ReadMes
astrogeco Jan 13, 2021
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 cfe
Open in desktop
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
Open in desktop
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
Open in desktop
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