Skip to content

Commit

Permalink
IC:2021-05-04, Combine cFE and osal
Browse files Browse the repository at this point in the history 
cfe v6.8.0-rc1+dev559 and osal v5.1.0-rc1+dev417

Combines:

nasa/osal#979
nasa/cFE#1481

Includes:

nasa/osal#973, UtPrintx function
nasa/osal#976, add socket shutdown implementation

nasa/cFE#1418, add ES CDS Functional test
nasa/cFE#1429, Function comment blocks
nasa/cFE#1414, Add Header Functional tests.
nasa/cFE#1415, add Current Time Functional Test
  • Loading branch information
@astrogeco
astrogeco committed May 5, 2021
1 parent c845253 commit a596f32
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 82 files
+8 −1 README.md
+3 −0 modules/cfe_testcase/CMakeLists.txt
+3 −0 modules/cfe_testcase/src/cfe_test.c
+3 −0 modules/cfe_testcase/src/cfe_test.h
+90 −0 modules/cfe_testcase/src/es_cds_test.c
+111 −0 modules/cfe_testcase/src/fs_header_test.c
+126 −0 modules/cfe_testcase/src/time_current_test.c
+13 −2 modules/core_api/fsw/inc/cfe_es.h
+1 −1 modules/core_api/fsw/inc/cfe_fs_core_internal.h
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+394 −254 modules/es/fsw/src/cfe_es_api.c
+135 −164 modules/es/fsw/src/cfe_es_apps.c
+118 −69 modules/es/fsw/src/cfe_es_apps.h
+32 −31 modules/es/fsw/src/cfe_es_backgroundtask.c
+154 −141 modules/es/fsw/src/cfe_es_cds.c
+26 −14 modules/es/fsw/src/cfe_es_cds.h
+60 −50 modules/es/fsw/src/cfe_es_cds_mempool.c
+26 −2 modules/es/fsw/src/cfe_es_cds_mempool.h
+42 −49 modules/es/fsw/src/cfe_es_erlog.c
+116 −98 modules/es/fsw/src/cfe_es_generic_pool.c
+10 −0 modules/es/fsw/src/cfe_es_generic_pool.h
+21 −3 modules/es/fsw/src/cfe_es_global.h
+11 −6 modules/es/fsw/src/cfe_es_log.h
+108 −38 modules/es/fsw/src/cfe_es_mempool.c
+8 −0 modules/es/fsw/src/cfe_es_mempool.h
+72 −82 modules/es/fsw/src/cfe_es_perf.c
+8 −1 modules/es/fsw/src/cfe_es_perf.h
+95 −78 modules/es/fsw/src/cfe_es_resource.c
+108 −4 modules/es/fsw/src/cfe_es_resource.h
+45 −39 modules/es/fsw/src/cfe_es_start.c
+31 −2 modules/es/fsw/src/cfe_es_start.h
+81 −71 modules/es/fsw/src/cfe_es_syslog.c
+271 −220 modules/es/fsw/src/cfe_es_task.c
+179 −6 modules/es/fsw/src/cfe_es_task.h
+69 −49 modules/evs/fsw/src/cfe_evs.c
+39 −53 modules/evs/fsw/src/cfe_evs_log.c
+25 −2 modules/evs/fsw/src/cfe_evs_log.h
+244 −335 modules/evs/fsw/src/cfe_evs_task.c
+171 −1 modules/evs/fsw/src/cfe_evs_task.h
+147 −200 modules/evs/fsw/src/cfe_evs_utils.c
+69 −0 modules/evs/fsw/src/cfe_evs_utils.h
+117 −65 modules/fs/fsw/src/cfe_fs_api.c
+29 −52 modules/fs/fsw/src/cfe_fs_priv.c
+28 −0 modules/fs/fsw/src/cfe_fs_priv.h
+88 −33 modules/msg/fsw/src/cfe_msg_ccsdsext.c
+120 −45 modules/msg/fsw/src/cfe_msg_ccsdspri.c
+2 −2 modules/msg/fsw/src/cfe_msg_defaults.h
+8 −3 modules/msg/fsw/src/cfe_msg_init.c
+8 −3 modules/msg/fsw/src/cfe_msg_initdefaulthdr_pri.c
+8 −3 modules/msg/fsw/src/cfe_msg_initdefaulthdr_priext.c
+8 −4 modules/msg/fsw/src/cfe_msg_msgid_shared.c
+14 −10 modules/msg/fsw/src/cfe_msg_msgid_v1.c
+16 −6 modules/msg/fsw/src/cfe_msg_msgid_v2.c
+3 −3 modules/msg/fsw/src/cfe_msg_priv.h
+25 −14 modules/msg/fsw/src/cfe_msg_sechdr_checksum.c
+16 −8 modules/msg/fsw/src/cfe_msg_sechdr_fc.c
+16 −6 modules/msg/fsw/src/cfe_msg_sechdr_time.c
+28 −20 modules/resourceid/fsw/src/cfe_resourceid_api.c
+225 −212 modules/sb/fsw/src/cfe_sb_api.c
+75 −128 modules/sb/fsw/src/cfe_sb_buf.c
+29 −52 modules/sb/fsw/src/cfe_sb_init.c
+9 −4 modules/sb/fsw/src/cfe_sb_msg_id_util.c
+119 −154 modules/sb/fsw/src/cfe_sb_priv.c
+425 −26 modules/sb/fsw/src/cfe_sb_priv.h
+226 −244 modules/sb/fsw/src/cfe_sb_task.c
+61 −37 modules/sb/fsw/src/cfe_sb_util.c
+23 −9 modules/sbr/fsw/src/cfe_sbr_map_direct.c
+32 −12 modules/sbr/fsw/src/cfe_sbr_map_hash.c
+2 −0 modules/sbr/fsw/src/cfe_sbr_priv.h
+56 −24 modules/sbr/fsw/src/cfe_sbr_route_unsorted.c
+159 −88 modules/tbl/fsw/src/cfe_tbl_api.c
+249 −244 modules/tbl/fsw/src/cfe_tbl_internal.c
+46 −46 modules/tbl/fsw/src/cfe_tbl_internal.h
+49 −25 modules/tbl/fsw/src/cfe_tbl_task.c
+8 −8 modules/tbl/fsw/src/cfe_tbl_task.h
+151 −147 modules/tbl/fsw/src/cfe_tbl_task_cmds.c
+31 −29 modules/tbl/fsw/src/cfe_tbl_task_cmds.h
+227 −136 modules/time/fsw/src/cfe_time_api.c
+254 −306 modules/time/fsw/src/cfe_time_task.c
+132 −175 modules/time/fsw/src/cfe_time_tone.c
+196 −181 modules/time/fsw/src/cfe_time_utils.c
+456 −25 modules/time/fsw/src/cfe_time_utils.h
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 19 files
+6 −0 README.md
+1 −0 src/os/inc/osapi-error.h
+24 −0 src/os/inc/osapi-sockets.h
+1 −1 src/os/inc/osapi-version.h
+43 −0 src/os/portable/os-impl-bsd-sockets.c
+10 −0 src/os/portable/os-impl-no-sockets.c
+1 −0 src/os/posix/inc/os-impl-sockets.h
+9 −0 src/os/shared/inc/os-shared-sockets.h
+56 −0 src/os/shared/src/osapi-sockets.c
+147 −69 src/tests/network-api-test/network-api-test.c
+18 −0 src/unit-test-coverage/portable/src/coveragetest-bsd-sockets.c
+1 −0 src/unit-test-coverage/portable/src/coveragetest-no-sockets.c
+85 −0 src/unit-test-coverage/shared/src/coveragetest-sockets.c
+5 −1 src/unit-test-coverage/ut-stubs/inc/OCS_sys_socket.h
+4 −0 src/unit-test-coverage/ut-stubs/override_inc/sys/socket.h
+17 −0 src/unit-test-coverage/ut-stubs/src/os-shared-sockets-impl-stubs.c
+8 −0 src/unit-test-coverage/ut-stubs/src/sys-socket-stubs.c
+17 −0 src/ut-stubs/osapi-sockets-stubs.c
+6 −3 ut_assert/src/uttools.c

0 comments on commit a596f32

Please sign in to comment.