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.

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

Integration Candidate: 2020-05-20 #91

Merged
merged 9 commits into from
May 29, 2020
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
Expand Down
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 69 files
+49 −29 CMakeLists.txt
+16 −0 README.md
+7 −0 osconfig.h.in
+0 −1 src/bsp/mcp750-vxworks/CMakeLists.txt
+0 −3 src/bsp/mcp750-vxworks/build_options.cmake
+11 −0 src/bsp/mcp750-vxworks/src/bsp_start.c
+0 −60 src/bsp/mcp750-vxworks/src/bsp_voltab.c
+0 −1 src/bsp/pc-linux/CMakeLists.txt
+0 −5 src/bsp/pc-linux/build_options.cmake
+11 −32 src/bsp/pc-linux/src/bsp_start.c
+0 −49 src/bsp/pc-linux/src/bsp_voltab.c
+0 −1 src/bsp/pc-rtems/CMakeLists.txt
+0 −5 src/bsp/pc-rtems/build_options.cmake
+53 −77 src/bsp/pc-rtems/src/bsp_start.c
+0 −52 src/bsp/pc-rtems/src/bsp_voltab.c
+5 −1 src/bsp/pc-rtems/src/pcrtems_bsp_internal.h
+14 −1 src/bsp/shared/inc/bsp-impl.h
+62 −0 src/bsp/shared/src/bsp_default_voltab.c
+47 −1 src/os/inc/osapi-os-core.h
+40 −23 src/os/inc/osapi-os-filesys.h
+1 −1 src/os/inc/osapi-version.h
+1 −0 src/os/inc/osapi.h
+21 −2 src/os/portable/os-impl-bsd-select.c
+2 −3 src/os/portable/os-impl-posix-gettime.c
+50 −4 src/os/posix/src/os-impl-binsem.c
+19 −4 src/os/posix/src/os-impl-filesys.c
+3 −8 src/os/posix/src/os-impl-idmap.c
+106 −68 src/os/rtems/src/os-impl-filesys.c
+2 −0 src/os/rtems/src/os-impl-idmap.c
+6 −3 src/os/shared/inc/os-shared-filesys.h
+53 −2 src/os/shared/inc/os-shared-idmap.h
+2 −0 src/os/shared/inc/os-shared-select.h
+2 −2 src/os/shared/src/osapi-binsem.c
+2 −2 src/os/shared/src/osapi-countsem.c
+2 −2 src/os/shared/src/osapi-dir.c
+10 −10 src/os/shared/src/osapi-file.c
+94 −68 src/os/shared/src/osapi-filesys.c
+280 −101 src/os/shared/src/osapi-idmap.c
+4 −4 src/os/shared/src/osapi-module.c
+2 −2 src/os/shared/src/osapi-mutex.c
+1 −1 src/os/shared/src/osapi-printf.c
+2 −2 src/os/shared/src/osapi-queue.c
+7 −7 src/os/shared/src/osapi-sockets.c
+8 −8 src/os/shared/src/osapi-task.c
+4 −4 src/os/shared/src/osapi-time.c
+4 −4 src/os/shared/src/osapi-timebase.c
+55 −12 src/os/vxworks/src/os-impl-filesys.c
+2 −0 src/os/vxworks/src/os-impl-idmap.c
+17 −0 src/tests/bin-sem-test/bin-sem-test.c
+15 −4 src/tests/file-api-test/file-api-test.c
+294 −0 src/tests/idmap-api-test/idmap-api-test.c
+94 −0 src/tests/osal-core-test/osal-core-test.c
+4 −0 src/unit-test-coverage/portable/src/coveragetest-bsd-select.c
+11 −67 src/unit-test-coverage/shared/src/coveragetest-filesys.c
+68 −44 src/unit-test-coverage/shared/src/coveragetest-idmap.c
+17 −2 src/unit-test-coverage/vxworks/src/coveragetest-filesys.c
+25 −19 src/unit-tests/oscore-test/ut_oscore_select_test.c
+1 −1 src/unit-tests/osfile-test/ut_osfile_dirio_test.h
+1 −1 src/unit-tests/osfile-test/ut_osfile_test.c
+4 −4 src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.c
+1 −1 src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.h
+1 −1 src/unit-tests/osloader-test/CMakeLists.txt
+2 −4 src/unit-tests/osloader-test/ut_osloader_module_test.c
+17 −22 src/unit-tests/osloader-test/ut_osloader_symtable_test.c
+13 −0 src/unit-tests/osloader-test/ut_osloader_test.c
+6 −32 src/unit-tests/osloader-test/ut_osloader_test_platforms.h
+67 −0 src/ut-stubs/osapi-utstub-idmap.c
+1 −1 src/ut-stubs/utstub-helpers.c
+2 −2 ut_assert/src/utbsp.c
2 changes: 1 addition & 1 deletion tools/elf2cfetbl
Submodule elf2cfetbl updated 4 files
+358 −359 ELF_Structures.h
+5 −0 README.md
+7 −7 SampleTblImg.c
+692 −564 elf2cfetbl.c
2 changes: 1 addition & 1 deletion tools/tblCRCTool
Submodule tblCRCTool updated 2 files
+13 −5 README.md
+97 −112 cfe_ts_crc.c