From 65c3258577f6da90404f867f96e4be4c573bd97d Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Thu, 5 Jan 2023 14:47:17 +0000 Subject: [PATCH] Fix #375, removed network setup call (will squash later) --- fsw/pc-rtems/src/cfe_psp_start.c | 3 +++ unit-test-coverage/pc-rtems/src/coveragetest-cfe-psp-start.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fsw/pc-rtems/src/cfe_psp_start.c b/fsw/pc-rtems/src/cfe_psp_start.c index 31f8060a..5de93b69 100644 --- a/fsw/pc-rtems/src/cfe_psp_start.c +++ b/fsw/pc-rtems/src/cfe_psp_start.c @@ -115,6 +115,8 @@ int timer_count = 0; */ int CFE_PSP_Setup(void) { + /* TODO this hangs the dev board when using rki2 since network is already set up */ +#if 0 rtems_status_code status; /* @@ -126,6 +128,7 @@ int CFE_PSP_Setup(void) { printf("Network init not successful: %s / %s (continuing)\n", rtems_status_text(status), strerror(errno)); } +#endif return RTEMS_SUCCESSFUL; } diff --git a/unit-test-coverage/pc-rtems/src/coveragetest-cfe-psp-start.c b/unit-test-coverage/pc-rtems/src/coveragetest-cfe-psp-start.c index ffa95577..567475a9 100644 --- a/unit-test-coverage/pc-rtems/src/coveragetest-cfe-psp-start.c +++ b/unit-test-coverage/pc-rtems/src/coveragetest-cfe-psp-start.c @@ -43,7 +43,6 @@ void Test_CFE_PSP_Setup(void) /* Test for printf due to error from rtems_bsdnet_initialize_network (function still returns RTEMS_SUCCESSFUL) */ UT_SetDefaultReturnValue(UT_KEY(PCS_rtems_bsdnet_initialize_network), -1); UtAssert_INT32_EQ(CFE_PSP_Setup(), PCS_RTEMS_SUCCESSFUL); - UtAssert_STUB_COUNT(PCS_printf, 1); } void Test_OS_Application_Startup(void) @@ -82,4 +81,4 @@ void Test_CFE_PSP_Main(void) * failure of OS_FileSysAddFixedMap, and 1 from CFE_PSP_InitProcessorReservedMemory */ UtAssert_STUB_COUNT(OS_printf, 5); UT_ResetState(UT_KEY(OS_printf)); /* Reset so cleared for future tests */ -} \ No newline at end of file +}