Skip to content

Commit

Permalink
Integration Candidate: 2020-10-07 (#145)
Browse files Browse the repository at this point in the history 
Combines 
- nasa/cFE#936
- nasa/osal#612

*** 

* Add osal#541

* Add cfe#898

* Add cfe#925

* Add cfe#917

* Add cFE#899

* Add nasa/cFE#888

* Add CFE hotfix for documentation link warnings

* Add FastTracked nasa/osal#616

* Set submodules to main for IC-2020-10-07

Co-authored-by: Joseph Hickey <[email protected]>
  • Loading branch information
@astrogeco @jphickey
astrogeco and jphickey authored Oct 6, 2020
1 parent 52467f0 commit 70912aa
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 34 files
+13 −0 README.md
+35 −1 cmake/sample_defs/cpu1_platform_cfg.h
+1 −1 docs/src/cfe_es.dox
+39 −5 fsw/cfe-core/src/es/cfe_es_apps.c
+725 −0 fsw/cfe-core/src/es/cfe_es_generic_pool.c
+296 −0 fsw/cfe-core/src/es/cfe_es_generic_pool.h
+6 −0 fsw/cfe-core/src/es/cfe_es_global.h
+691 −0 fsw/cfe-core/src/es/cfe_es_mempool.c
+175 −0 fsw/cfe-core/src/es/cfe_es_mempool.h
+5 −4 fsw/cfe-core/src/es/cfe_es_task.c
+0 −700 fsw/cfe-core/src/es/cfe_esmempool.c
+0 −78 fsw/cfe-core/src/es/cfe_esmempool.h
+2 −0 fsw/cfe-core/src/evs/cfe_evs_task.h
+2 −2 fsw/cfe-core/src/evs/cfe_evs_utils.c
+37 −0 fsw/cfe-core/src/inc/cfe_error.h
+116 −70 fsw/cfe-core/src/inc/cfe_es.h
+16 −15 fsw/cfe-core/src/inc/cfe_evs.h
+5 −4 fsw/cfe-core/src/inc/cfe_fs.h
+35 −34 fsw/cfe-core/src/inc/cfe_msg_api.h
+20 −35 fsw/cfe-core/src/inc/cfe_sb.h
+25 −28 fsw/cfe-core/src/inc/cfe_tbl.h
+3 −2 fsw/cfe-core/src/inc/cfe_time.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+7 −9 fsw/cfe-core/src/sb/cfe_sb_api.c
+2 −2 fsw/cfe-core/src/sb/cfe_sb_init.c
+1 −1 fsw/cfe-core/src/sb/cfe_sb_priv.c
+1 −1 fsw/cfe-core/src/sb/cfe_sb_task.c
+5 −3 fsw/cfe-core/src/tbl/cfe_tbl_api.c
+2 −2 fsw/cfe-core/src/tbl/cfe_tbl_internal.c
+1 −1 fsw/cfe-core/src/tbl/cfe_tbl_task_cmds.c
+521 −209 fsw/cfe-core/unit-test/es_UT.c
+2 −1 fsw/cfe-core/unit-test/es_UT.h
+1 −1 fsw/cfe-core/unit-test/ut_support.h
+37 −21 fsw/cfe-core/ut-stubs/ut_es_stubs.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 12 files
+10 −3 README.md
+88 −0 src/os/inc/osapi-os-core.h
+1 −1 src/os/inc/osapi-version.h
+2 −1 src/os/rtems/src/os-impl-binsem.c
+6 −2 src/os/rtems/src/os-impl-countsem.c
+10 −1 src/os/rtems/src/os-impl-queues.c
+18 −4 src/os/rtems/src/os-impl-tasks.c
+16 −0 src/os/shared/inc/os-shared-common.h
+43 −0 src/os/shared/src/osapi-common.c
+27 −0 src/os/shared/src/osapi-idmap.c
+6 −0 src/os/shared/src/osapi-task.c
+34 −0 src/ut-stubs/osapi-utstub-common.c

0 comments on commit 70912aa

Please sign in to comment.