Replaced delay and exit with CFE_PSP_Panic

nasa · Sep 21, 2021 · 1cd16e6 · 1cd16e6
1 parent 66fe296
commit 1cd16e6
Showing 1 changed file with 9 additions and 18 deletions.
diff --git a/fsw/pc-linux/src/cfe_psp_memory.c b/fsw/pc-linux/src/cfe_psp_memory.c
@@ -143,8 +143,7 @@ void CFE_PSP_InitCDS(void)
     if ((key = ftok(CFE_PSP_CDS_KEY_FILE, 'R')) == -1)
     {
         OS_printf("CFE_PSP: Cannot Create CDS Shared memory key!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     /*
@@ -153,8 +152,7 @@ void CFE_PSP_InitCDS(void)
     if ((CDSShmId = shmget(key, CFE_PSP_CDS_SIZE, 0644 | IPC_CREAT)) == -1)
     {
         OS_printf("CFE_PSP: Cannot shmget CDS Shared memory Segment!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     /*
@@ -164,8 +162,7 @@ void CFE_PSP_InitCDS(void)
     if (CFE_PSP_ReservedMemoryMap.CDSMemory.BlockPtr == (void *)(-1))
     {
         OS_printf("CFE_PSP: Cannot shmat to CDS Shared memory Segment!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     CFE_PSP_ReservedMemoryMap.CDSMemory.BlockSize = CFE_PSP_CDS_SIZE;
@@ -350,8 +347,7 @@ void CFE_PSP_InitResetArea(void)
     if ((key = ftok(CFE_PSP_RESET_KEY_FILE, 'R')) == -1)
     {
         OS_printf("CFE_PSP: Cannot Create Reset Area Shared memory key!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     /*
@@ -373,8 +369,7 @@ void CFE_PSP_InitResetArea(void)
     if ((ResetAreaShmId = shmget(key, total_size, 0644 | IPC_CREAT)) == -1)
     {
         OS_printf("CFE_PSP: Cannot shmget Reset Area Shared memory Segment!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     /*
@@ -384,8 +379,7 @@ void CFE_PSP_InitResetArea(void)
     if (block_addr == (cpuaddr)(-1))
     {
         OS_printf("CFE_PSP: Cannot shmat to Reset Area Shared memory Segment!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     FixedBlocksPtr = (CFE_PSP_LinuxReservedAreaFixedLayout_t *)block_addr;
@@ -491,8 +485,7 @@ void CFE_PSP_InitUserReservedArea(void)
     if ((key = ftok(CFE_PSP_RESERVED_KEY_FILE, 'R')) == -1)
     {
         OS_printf("CFE_PSP: Cannot Create User Reserved Area Shared memory key!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     /*
@@ -501,8 +494,7 @@ void CFE_PSP_InitUserReservedArea(void)
     if ((UserShmId = shmget(key, CFE_PSP_USER_RESERVED_SIZE, 0644 | IPC_CREAT)) == -1)
     {
         OS_printf("CFE_PSP: Cannot shmget User Reserved Area Shared memory Segment!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     /*
@@ -512,8 +504,7 @@ void CFE_PSP_InitUserReservedArea(void)
     if (CFE_PSP_ReservedMemoryMap.UserReservedMemory.BlockPtr == (void *)(-1))
     {
         OS_printf("CFE_PSP: Cannot shmat to User Reserved Area Shared memory Segment!\n");
-        OS_TaskDelay(1000);
-        exit(-1);
+        CFE_PSP_Panic(CFE_PSP_ERROR);
     }
 
     CFE_PSP_ReservedMemoryMap.UserReservedMemory.BlockSize = CFE_PSP_USER_RESERVED_SIZE;