diff --git a/CHANGELOG.md b/CHANGELOG.md index c854afae..37716189 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## Development Build: v1.6.0-rc4+dev61 +- Stop empty function catching CI workflow format checks +- Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines. +- See and + ## Development Build: v1.6.0-rc4+dev55 - Create Changelog File - Remove unnecessary parentheses around return values. diff --git a/fsw/mcp750-vxworks/inc/cfe_psp_config.h b/fsw/mcp750-vxworks/inc/cfe_psp_config.h index e335a1df..dcf76695 100644 --- a/fsw/mcp750-vxworks/inc/cfe_psp_config.h +++ b/fsw/mcp750-vxworks/inc/cfe_psp_config.h @@ -83,7 +83,6 @@ typedef struct uint32 spare1; uint32 spare2; uint32 spare3; - } CFE_PSP_ReservedMemoryBootRecord_t; /** @@ -101,7 +100,6 @@ typedef struct int vector; /* vector number */ ESFPPC esf; /* Exception stack frame */ FP_CONTEXT fp; /* floating point registers */ - } CFE_PSP_Exception_ContextDataEntry_t; /* diff --git a/fsw/mcp750-vxworks/inc/psp_version.h b/fsw/mcp750-vxworks/inc/psp_version.h index b4995e25..a90287ae 100644 --- a/fsw/mcp750-vxworks/inc/psp_version.h +++ b/fsw/mcp750-vxworks/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 55 +#define CFE_PSP_IMPL_BUILD_NUMBER 61 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4" /* diff --git a/fsw/mcp750-vxworks/src/bsp-integration/cfeSupport.c b/fsw/mcp750-vxworks/src/bsp-integration/cfeSupport.c index a8d59b68..f9ad825d 100644 --- a/fsw/mcp750-vxworks/src/bsp-integration/cfeSupport.c +++ b/fsw/mcp750-vxworks/src/bsp-integration/cfeSupport.c @@ -58,7 +58,6 @@ extern SYMTAB_ID sysSymTbl; extern int DriveNum; /* -** Function: GetWrsKernelTextStart ** Purpose: This function returns the start address of the kernel code. ** */ @@ -68,7 +67,6 @@ unsigned int GetWrsKernelTextStart(void) } /* -** Function: GetWrsKernelTextEnd ** Purpose: This function returns the end address of the kernel code. ** */ @@ -78,7 +76,6 @@ unsigned int GetWrsKernelTextEnd(void) } /* -** Function: loadCfeCore ** Purpose: This function unzips ( if needed ) , loads, and starts the cFE core. ** */ @@ -168,7 +165,6 @@ int startCfeCore(char *cfevolume, char *cfepath) } /****************************************************************************** -** Function: CFE_PSP_InitFlashDisk() ** ** Purpose: ** Initialize the Compact flash disk in vxWorks diff --git a/fsw/mcp750-vxworks/src/cfe_psp_exception.c b/fsw/mcp750-vxworks/src/cfe_psp_exception.c index bcfd1b00..1c641b46 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_exception.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_exception.c @@ -72,8 +72,6 @@ void CFE_PSP_ExceptionHook(TASK_ID task_id, int vector, void *vpEsf); /* ** -** Name: CFE_PSP_AttachExceptions -** ** Purpose: This function Initializes the task exceptions and adds a hook ** into the VxWorks exception handling. The below hook is called ** for every exception that VxWorks catches. @@ -92,7 +90,6 @@ void CFE_PSP_AttachExceptions(void) } /* -** Name: CFE_PSP_ExceptionHook ** ** Purpose: Make the proper call to CFE_ES_EXCEPTION_FUNCTION (defined in ** cfe_es_platform.cfg) @@ -153,13 +150,10 @@ void CFE_PSP_ExceptionHook(TASK_ID task_id, int vector, void *vpEsf) /* notify the CFE of the event */ GLOBAL_CFE_CONFIGDATA.SystemNotify(); } - -} /* end function */ +} /* ** -** Name: CFE_PSP_SetDefaultExceptionEnvironment -** ** Purpose: This function sets a default exception environment that can be used ** ** Notes: The exception environment is local to each task Therefore this must be @@ -184,8 +178,6 @@ void CFE_PSP_SetDefaultExceptionEnvironment(void) } /* - * Name: CFE_PSP_ExceptionGetSummary_Impl - * * Purpose: Translate a stored exception log entry into a summary string */ int32 CFE_PSP_ExceptionGetSummary_Impl(const CFE_PSP_Exception_LogData_t *Buffer, char *ReasonBuf, uint32 ReasonSize) diff --git a/fsw/mcp750-vxworks/src/cfe_psp_memory.c b/fsw/mcp750-vxworks/src/cfe_psp_memory.c index f95cf2b9..648a917f 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_memory.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_memory.c @@ -81,7 +81,6 @@ CFE_PSP_MemoryBlock_t MCP750_ReservedMemBlock; */ /****************************************************************************** -** Function: CFE_PSP_GetCDSSize ** ** Purpose: ** This function fetches the size of the OS Critical Data Store area. @@ -110,7 +109,6 @@ int32 CFE_PSP_GetCDSSize(uint32 *SizeOfCDS) } /****************************************************************************** -** Function: CFE_PSP_WriteToCDS ** ** Purpose: ** This function writes to the CDS Block. @@ -152,7 +150,6 @@ int32 CFE_PSP_WriteToCDS(const void *PtrToDataToWrite, uint32 CDSOffset, uint32 } /****************************************************************************** -** Function: CFE_PSP_ReadFromCDS ** ** Purpose: ** This function reads from the CDS Block @@ -201,7 +198,6 @@ int32 CFE_PSP_ReadFromCDS(void *PtrToDataToRead, uint32 CDSOffset, uint32 NumByt */ /****************************************************************************** -** Function: CFE_PSP_GetResetArea ** ** Purpose: ** This function returns the location and size of the ES Reset information area. @@ -239,7 +235,6 @@ int32 CFE_PSP_GetResetArea(cpuaddr *PtrToResetArea, uint32 *SizeOfResetArea) */ /****************************************************************************** -** Function: CFE_PSP_GetUserReservedArea ** ** Purpose: ** This function returns the location and size of the memory used for the cFE @@ -276,7 +271,6 @@ int32 CFE_PSP_GetUserReservedArea(cpuaddr *PtrToUserArea, uint32 *SizeOfUserArea */ /****************************************************************************** -** Function: CFE_PSP_GetVolatileDiskMem ** ** Purpose: ** This function returns the location and size of the memory used for the cFE @@ -313,7 +307,6 @@ int32 CFE_PSP_GetVolatileDiskMem(cpuaddr *PtrToVolDisk, uint32 *SizeOfVolDisk) */ /****************************************************************************** -** Function: CFE_PSP_InitProcessorReservedMemory ** ** Purpose: ** This function performs the top level reserved memory initialization. @@ -343,7 +336,6 @@ int32 CFE_PSP_InitProcessorReservedMemory(uint32 RestartType) } /****************************************************************************** -** Function: CFE_PSP_SetupReservedMemoryMap ** ** Purpose: ** Set up the CFE_PSP_ReservedMemoryMap global data structure @@ -414,7 +406,6 @@ void CFE_PSP_SetupReservedMemoryMap(void) } /****************************************************************************** - * Function: CFE_PSP_DeleteProcessorReservedMemory * * No action on MCP750 - reserved block is statically allocated at sysMemTop. * Implemented for API consistency with other PSPs. @@ -428,7 +419,6 @@ void CFE_PSP_DeleteProcessorReservedMemory(void) {} */ /****************************************************************************** -** Function: CFE_PSP_GetKernelTextSegmentInfo ** ** Purpose: ** This function returns the start and end address of the kernel text segment. @@ -470,7 +460,6 @@ int32 CFE_PSP_GetKernelTextSegmentInfo(cpuaddr *PtrToKernelSegment, uint32 *Size } /****************************************************************************** -** Function: CFE_PSP_GetCFETextSegmentInfo ** ** Purpose: ** This function returns the start and end address of the CFE text segment. diff --git a/fsw/mcp750-vxworks/src/cfe_psp_ssr.c b/fsw/mcp750-vxworks/src/cfe_psp_ssr.c index add7dcaf..2b8c14be 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_ssr.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_ssr.c @@ -61,7 +61,6 @@ #include "cfe_psp_memory.h" /****************************************************************************** -** Function: CFE_PSP_InitSSR ** ** Purpose: ** Initializes the Solid State Recorder device. For the MCP750, this simply diff --git a/fsw/mcp750-vxworks/src/cfe_psp_start.c b/fsw/mcp750-vxworks/src/cfe_psp_start.c index 63e39d84..9a105266 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_start.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_start.c @@ -75,7 +75,6 @@ IMPORT void sysPciWrite32(UINT32, UINT32); #define CFE_PSP_NONVOL_STARTUP_FILE (GLOBAL_CONFIGDATA.CfeConfig->NonvolStartupFile) /****************************************************************************** -** Function: OS_Application_Startup() ** ** Purpose: ** Application startup entry point from OSAL BSP. @@ -187,7 +186,6 @@ void OS_Application_Startup(void) } else if (reset_register & SYS_REG_BLRR_SWHRST) { - /* ** For a Software hard reset, we want to look at the special ** BSP reset variable to determine if we wanted a diff --git a/fsw/mcp750-vxworks/src/cfe_psp_support.c b/fsw/mcp750-vxworks/src/cfe_psp_support.c index 30c4d24e..b912c94c 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_support.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_support.c @@ -72,7 +72,6 @@ extern CFE_PSP_MemoryBlock_t MCP750_ReservedMemBlock; /****************************************************************************** -** Function: CFE_PSP_Restart() ** ** Purpose: ** Provides a common interface to the processor reset. @@ -86,7 +85,6 @@ extern CFE_PSP_MemoryBlock_t MCP750_ReservedMemBlock; void CFE_PSP_Restart(uint32 reset_type) { - if (reset_type == CFE_PSP_RST_TYPE_POWERON) { CFE_PSP_ReservedMemoryMap.BootPtr->bsp_reset_type = CFE_PSP_RST_TYPE_POWERON; @@ -102,7 +100,6 @@ void CFE_PSP_Restart(uint32 reset_type) } /****************************************************************************** -** Function: CFE_PSP_Panic() ** ** Purpose: ** Provides a common interface to abort the cFE startup process and return @@ -122,7 +119,6 @@ void CFE_PSP_Panic(int32 ErrorCode) } /****************************************************************************** -** Function: CFE_PSP_FlushCaches() ** ** Purpose: ** Provides a common interface to flush the processor caches. This routine @@ -144,7 +140,6 @@ void CFE_PSP_FlushCaches(uint32 type, void *address, uint32 size) } /* -** Name: CFE_PSP_GetProcessorId ** ** Purpose: ** return the processor ID. @@ -166,7 +161,6 @@ uint32 CFE_PSP_GetProcessorId(void) } /* -** Name: CFE_PSP_GetSpacecraftId ** ** Purpose: ** return the spacecraft ID. @@ -186,7 +180,6 @@ uint32 CFE_PSP_GetSpacecraftId(void) } /* -** Name: CFE_PSP_GetProcessorName ** ** Purpose: ** return the processor name. diff --git a/fsw/mcp750-vxworks/src/cfe_psp_watchdog.c b/fsw/mcp750-vxworks/src/cfe_psp_watchdog.c index 393f4bd5..8129c865 100644 --- a/fsw/mcp750-vxworks/src/cfe_psp_watchdog.c +++ b/fsw/mcp750-vxworks/src/cfe_psp_watchdog.c @@ -72,7 +72,7 @@ */ uint32 CFE_PSP_WatchdogValue = CFE_PSP_WATCHDOG_MAX; -/* Function: CFE_PSP_WatchdogInit() +/****************************************************************************** ** ** Purpose: ** To setup the timer resolution and/or other settings custom to this platform. @@ -83,7 +83,6 @@ uint32 CFE_PSP_WatchdogValue = CFE_PSP_WATCHDOG_MAX; */ void CFE_PSP_WatchdogInit(void) { - /* ** Just set it to a value right now ** The pc-linux desktop platform does not actually implement a watchdog @@ -93,7 +92,6 @@ void CFE_PSP_WatchdogInit(void) } /****************************************************************************** -** Function: CFE_PSP_WatchdogEnable() ** ** Purpose: ** Enable the watchdog timer @@ -112,7 +110,6 @@ void CFE_PSP_WatchdogEnable(void) } /****************************************************************************** -** Function: CFE_PSP_WatchdogDisable() ** ** Purpose: ** Disable the watchdog timer @@ -131,7 +128,6 @@ void CFE_PSP_WatchdogDisable(void) } /****************************************************************************** -** Function: CFE_PSP_WatchdogService() ** ** Purpose: ** Load the watchdog timer with a count that corresponds to the millisecond @@ -174,8 +170,8 @@ void CFE_PSP_WatchdogService(void) PCI_OUT_LONG(0xFEFF0068, 0xFFFFFFAA); } } + /****************************************************************************** -** Function: CFE_PSP_WatchdogGet ** ** Purpose: ** Get the current watchdog value. @@ -195,7 +191,6 @@ uint32 CFE_PSP_WatchdogGet(void) } /****************************************************************************** -** Function: CFE_PSP_WatchdogSet ** ** Purpose: ** Get the current watchdog value. diff --git a/fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c b/fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c index 698aa101..a1406d86 100644 --- a/fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c +++ b/fsw/modules/eeprom_direct/cfe_psp_eeprom_direct.c @@ -51,7 +51,6 @@ void eeprom_direct_Init(uint32 PspModuleId) */ /* - ** Name: CFE_PSP_EepromWrite32 ** ** Purpose: ** @@ -88,7 +87,6 @@ int32 CFE_PSP_EepromWrite32(cpuaddr MemoryAddress, uint32 uint32Value) } /* - ** Name: CFE_PSP_EepromWrite16 ** ** Purpose: ** @@ -183,7 +181,6 @@ int32 CFE_PSP_EepromWrite16(cpuaddr MemoryAddress, uint16 uint16Value) } /* - ** Name: CFE_PSP_EepromWrite8 ** ** Purpose: ** @@ -268,7 +265,6 @@ int32 CFE_PSP_EepromWrite8(cpuaddr MemoryAddress, uint8 ByteValue) } /* -** Name: CFE_PSP_EepromWriteEnable ** ** Purpose: ** Enable the eeprom for write operation @@ -292,7 +288,6 @@ int32 CFE_PSP_EepromWriteEnable(uint32 Bank) } /* -** Name: CFE_PSP_EepromWriteDisable ** ** Purpose: ** Disable the eeprom from write operation @@ -316,7 +311,6 @@ int32 CFE_PSP_EepromWriteDisable(uint32 Bank) } /* -** Name: CFE_PSP_EepromPowerUp ** ** Purpose: ** Power up the eeprom @@ -339,7 +333,6 @@ int32 CFE_PSP_EepromPowerUp(uint32 Bank) } /* -** Name: CFE_PSP_EepromPowerDown ** ** Purpose: ** Power down the eeprom diff --git a/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c b/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c index 5eeefb91..1b93393c 100644 --- a/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c +++ b/fsw/modules/eeprom_mmap_file/cfe_psp_eeprom_mmap_file.c @@ -46,7 +46,6 @@ CFE_PSP_MODULE_DECLARE_SIMPLE(eeprom_mmap_file); */ int32 CFE_PSP_SetupEEPROM(uint32 EEPROMSize, cpuaddr *EEPROMAddress) { - int FileDescriptor; int ReturnStatus; char * DataBuffer; diff --git a/fsw/modules/port_direct/cfe_psp_port_direct.c b/fsw/modules/port_direct/cfe_psp_port_direct.c index faf6fe48..147af09e 100644 --- a/fsw/modules/port_direct/cfe_psp_port_direct.c +++ b/fsw/modules/port_direct/cfe_psp_port_direct.c @@ -39,7 +39,6 @@ void port_direct_Init(uint32 PspModuleId) */ /* -** Name: CFE_PSP_PortRead8 ** ** Purpose: ** Read one byte of memory. @@ -60,14 +59,12 @@ void port_direct_Init(uint32 PspModuleId) */ int32 CFE_PSP_PortRead8(cpuaddr PortAddress, uint8 *ByteValue) { - (*ByteValue) = (uint8) * ((uint8 *)PortAddress); return CFE_PSP_SUCCESS; } /* -** Name: CFE_PSP_PortWrite8 ** ** Purpose: ** Write one byte of memory. @@ -94,7 +91,6 @@ int32 CFE_PSP_PortWrite8(cpuaddr PortAddress, uint8 ByteValue) } /* -** Name: CFE_PSP_PortRead16 ** ** Purpose: ** Read 2 bytes of memory. @@ -128,7 +124,6 @@ int32 CFE_PSP_PortRead16(cpuaddr PortAddress, uint16 *uint16Value) } /* -** Name: CFE_PSP_PortWrite16 ** ** Purpose: ** Write 2 byte of memory. @@ -162,7 +157,6 @@ int32 CFE_PSP_PortWrite16(cpuaddr PortAddress, uint16 uint16Value) } /* -** Name: CFE_PSP_PortRead32 ** ** Purpose: ** Read 4 bytes of memory. @@ -196,7 +190,6 @@ int32 CFE_PSP_PortRead32(cpuaddr PortAddress, uint32 *uint32Value) } /* -** Name: CFE_PSP_PortWrite32 ** ** Purpose: ** Write 4 byte of memory. diff --git a/fsw/modules/ram_direct/cfe_psp_ram_direct.c b/fsw/modules/ram_direct/cfe_psp_ram_direct.c index e916582b..e6abb08f 100644 --- a/fsw/modules/ram_direct/cfe_psp_ram_direct.c +++ b/fsw/modules/ram_direct/cfe_psp_ram_direct.c @@ -39,7 +39,6 @@ void ram_direct_Init(uint32 PspModuleId) */ /* - ** Name: CFE_PSP_MemRead8 ** ** Purpose: ** Read one byte of memory. @@ -59,14 +58,12 @@ void ram_direct_Init(uint32 PspModuleId) */ int32 CFE_PSP_MemRead8(cpuaddr MemoryAddress, uint8 *ByteValue) { - (*ByteValue) = *((uint8 *)MemoryAddress); return CFE_PSP_SUCCESS; } /* - ** Name: CFE_PSP_MemWrite8 ** ** Purpose: ** Write one byte of memory. @@ -92,7 +89,6 @@ int32 CFE_PSP_MemWrite8(cpuaddr MemoryAddress, uint8 ByteValue) } /* - ** Name: CFE_PSP_MemRead16 ** ** Purpose: ** Read 2 bytes of memory. @@ -124,8 +120,8 @@ int32 CFE_PSP_MemRead16(cpuaddr MemoryAddress, uint16 *uint16Value) (*uint16Value) = *((uint16 *)MemoryAddress); return CFE_PSP_SUCCESS; } + /* - ** Name: CFE_PSP_MemWrite16 ** ** Purpose: ** Write 2 byte of memory. @@ -157,8 +153,8 @@ int32 CFE_PSP_MemWrite16(cpuaddr MemoryAddress, uint16 uint16Value) *((uint16 *)MemoryAddress) = uint16Value; return CFE_PSP_SUCCESS; } + /* - ** Name: CFE_PSP_MemRead32 ** ** Purpose: ** Read 4 bytes of memory. @@ -193,7 +189,6 @@ int32 CFE_PSP_MemRead32(cpuaddr MemoryAddress, uint32 *uint32Value) } /* - ** Name: CFE_PSP_MemWrite32 ** ** Purpose: ** Write 4 byte of memory. @@ -217,7 +212,6 @@ int32 CFE_PSP_MemRead32(cpuaddr MemoryAddress, uint32 *uint32Value) */ int32 CFE_PSP_MemWrite32(cpuaddr MemoryAddress, uint32 uint32Value) { - /* check 32 bit alignment */ if (MemoryAddress & 0x00000003) { diff --git a/fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c b/fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c index a4f2fa65..5c679889 100644 --- a/fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c +++ b/fsw/modules/timebase_posix_clock/cfe_psp_timebase_posix_clock.c @@ -116,7 +116,6 @@ void CFE_PSP_GetTime(OS_time_t *LocalTime) } /****************************************************************************** -** Function: CFE_PSP_GetTimerTicksPerSecond() ** ** Purpose: ** Provides the resolution of the least significant 32 bits of the 64 bit @@ -137,7 +136,6 @@ uint32 CFE_PSP_GetTimerTicksPerSecond(void) } /****************************************************************************** -** Function: CFE_PSP_GetTimerLow32Rollover() ** ** Purpose: ** Provides the number that the least significant 32 bits of the 64 bit diff --git a/fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c b/fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c index 21226485..fa0d3190 100644 --- a/fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c +++ b/fsw/modules/timebase_vxworks/cfe_psp_timebase_vxworks.c @@ -144,7 +144,6 @@ void timebase_vxworks_Init(uint32 PspModuleId) } /****************************************************************************** -** Function: CFE_PSP_GetTimerTicksPerSecond() ** ** Purpose: ** Provides the resolution of the least significant 32 bits of the 64 bit @@ -164,7 +163,6 @@ uint32 CFE_PSP_GetTimerTicksPerSecond(void) } /****************************************************************************** -** Function: CFE_PSP_GetTimerLow32Rollover() ** ** Purpose: ** Provides the number that the least significant 32 bits of the 64 bit @@ -185,7 +183,6 @@ uint32 CFE_PSP_GetTimerLow32Rollover(void) } /****************************************************************************** -** Function: CFE_PSP_Get_Timebase() ** ** Purpose: ** Provides a common interface to system timebase. This routine @@ -203,7 +200,6 @@ void CFE_PSP_Get_Timebase(uint32 *Tbu, uint32 *Tbl) } /****************************************************************************** -** Function: CFE_PSP_GetTime() ** ** Purpose: Gets the value of the timebase from the hardware normalized as OS_time_t ** @@ -244,5 +240,4 @@ void CFE_PSP_GetTime(OS_time_t *LocalTime) /* Output the value as an OS_time_t */ *LocalTime = (OS_time_t) {NormalizedTicks}; - -} /* end CFE_PSP_GetLocalTime */ +} diff --git a/fsw/pc-linux/inc/cfe_psp_config.h b/fsw/pc-linux/inc/cfe_psp_config.h index abd60e94..5db48c55 100644 --- a/fsw/pc-linux/inc/cfe_psp_config.h +++ b/fsw/pc-linux/inc/cfe_psp_config.h @@ -88,7 +88,6 @@ typedef struct { uint32 ValidityFlag; uint32 NextResetType; - } CFE_PSP_ReservedMemoryBootRecord_t; /* diff --git a/fsw/pc-linux/inc/psp_version.h b/fsw/pc-linux/inc/psp_version.h index b4995e25..a90287ae 100644 --- a/fsw/pc-linux/inc/psp_version.h +++ b/fsw/pc-linux/inc/psp_version.h @@ -27,7 +27,7 @@ /* * Development Build Macro Definitions */ -#define CFE_PSP_IMPL_BUILD_NUMBER 55 +#define CFE_PSP_IMPL_BUILD_NUMBER 61 #define CFE_PSP_IMPL_BUILD_BASELINE "v1.6.0-rc4" /* diff --git a/fsw/pc-linux/src/cfe_psp_exception.c b/fsw/pc-linux/src/cfe_psp_exception.c index d8bacc08..7f7b6847 100644 --- a/fsw/pc-linux/src/cfe_psp_exception.c +++ b/fsw/pc-linux/src/cfe_psp_exception.c @@ -60,7 +60,6 @@ sigset_t CFE_PSP_AsyncMask; ***************************************************************************/ /* -** Name: CFE_PSP_ExceptionSigHandler ** ** Installed as a signal handler to log exception events. ** @@ -111,7 +110,6 @@ void CFE_PSP_ExceptionSigHandler(int signo, siginfo_t *si, void *ctxt) } /* -** Name: CFE_PSP_ExceptionSigHandlerSuspend ** ** An extension of CFE_PSP_ExceptionSigHandler that also ** suspends the calling task and prevents returning to the @@ -139,8 +137,7 @@ void CFE_PSP_ExceptionSigHandlerSuspend(int signo, siginfo_t *si, void *ctxt) * will be deleted by the CFE/OSAL. */ sigsuspend(&CFE_PSP_AsyncMask); - -} /* end function */ +} /* * Helper function to call sigaction() to attach a signal handler @@ -183,7 +180,6 @@ void CFE_PSP_AttachSigHandler(int signo) } /* -** Name: CFE_PSP_AttachExceptions ** ** This is called from the CFE Main task, before any other threads ** are started. Use this opportunity to install the handler for @@ -250,8 +246,6 @@ void CFE_PSP_AttachExceptions(void) /* ** -** Name: CFE_PSP_SetDefaultExceptionEnvironment -** ** Purpose: This function sets a default exception environment that can be used ** ** Notes: The exception environment is local to each task Therefore this must be diff --git a/fsw/pc-linux/src/cfe_psp_memory.c b/fsw/pc-linux/src/cfe_psp_memory.c index 247beca8..6715a637 100644 --- a/fsw/pc-linux/src/cfe_psp_memory.c +++ b/fsw/pc-linux/src/cfe_psp_memory.c @@ -118,7 +118,6 @@ CFE_PSP_ReservedMemoryMap_t CFE_PSP_ReservedMemoryMap; ** */ /****************************************************************************** -** Function: CFE_PSP_InitCDS ** ** Purpose: This function is used by the ES startup code to initialize the ** Critical Data store area @@ -167,7 +166,6 @@ void CFE_PSP_InitCDS(void) } /****************************************************************************** -** Function: CFE_PSP_DeleteCDS ** ** Purpose: ** This is an internal function to delete the CDS Shared memory segment. @@ -180,7 +178,6 @@ void CFE_PSP_InitCDS(void) */ void CFE_PSP_DeleteCDS(void) { - int ReturnCode; struct shmid_ds ShmCtrl; @@ -198,7 +195,6 @@ void CFE_PSP_DeleteCDS(void) } /****************************************************************************** -** Function: CFE_PSP_GetCDSSize ** ** Purpose: ** This function fetches the size of the OS Critical Data Store area. @@ -228,7 +224,6 @@ int32 CFE_PSP_GetCDSSize(uint32 *SizeOfCDS) } /****************************************************************************** -** Function: CFE_PSP_WriteToCDS ** ** Purpose: ** This function writes to the CDS Block. @@ -270,7 +265,6 @@ int32 CFE_PSP_WriteToCDS(const void *PtrToDataToWrite, uint32 CDSOffset, uint32 } /****************************************************************************** -** Function: CFE_PSP_ReadFromCDS ** ** Purpose: ** This function reads from the CDS Block @@ -318,7 +312,6 @@ int32 CFE_PSP_ReadFromCDS(void *PtrToDataToRead, uint32 CDSOffset, uint32 NumByt */ /****************************************************************************** -** Function: CFE_PSP_InitESResetArea ** ** Purpose: ** This function is used by the ES startup code to initialize the @@ -332,7 +325,6 @@ int32 CFE_PSP_ReadFromCDS(void *PtrToDataToRead, uint32 CDSOffset, uint32 NumByt */ void CFE_PSP_InitResetArea(void) { - key_t key; size_t total_size; size_t reset_offset; @@ -391,7 +383,6 @@ void CFE_PSP_InitResetArea(void) } /****************************************************************************** -** Function: CFE_PSP_DeleteResetArea ** ** Purpose: ** This is an internal function to delete the Reset Area Shared memory segment. @@ -423,7 +414,6 @@ void CFE_PSP_DeleteResetArea(void) /* */ /****************************************************************************** -** Function: CFE_PSP_GetResetArea ** ** Purpose: ** This function returns the location and size of the ES Reset information area. @@ -461,7 +451,6 @@ int32 CFE_PSP_GetResetArea(cpuaddr *PtrToResetArea, uint32 *SizeOfResetArea) */ /****************************************************************************** -** Function: CFE_PSP_InitUserReservedArea ** ** Purpose: ** This function is used by the ES startup code to initialize the @@ -509,7 +498,6 @@ void CFE_PSP_InitUserReservedArea(void) } /****************************************************************************** -** Function: CFE_PSP_DeleteUserReservedArea ** ** Purpose: ** This is an internal function to delete the User Reserved Shared memory segment. @@ -539,7 +527,6 @@ void CFE_PSP_DeleteUserReservedArea(void) } /****************************************************************************** -** Function: CFE_PSP_GetUserReservedArea ** ** Purpose: ** This function returns the location and size of the memory used for the cFE @@ -576,7 +563,6 @@ int32 CFE_PSP_GetUserReservedArea(cpuaddr *PtrToUserArea, uint32 *SizeOfUserArea */ /****************************************************************************** -** Function: CFE_PSP_InitVolatileDiskMem ** ** Purpose: ** This function is used by the ES startup code to initialize the memory @@ -598,7 +584,6 @@ void CFE_PSP_InitVolatileDiskMem(void) } /****************************************************************************** -** Function: CFE_PSP_GetVolatileDiskMem ** ** Purpose: ** This function returns the location and size of the memory used for the cFE @@ -635,7 +620,6 @@ int32 CFE_PSP_GetVolatileDiskMem(cpuaddr *PtrToVolDisk, uint32 *SizeOfVolDisk) */ /****************************************************************************** -** Function: CFE_PSP_InitProcessorReservedMemory ** ** Purpose: ** This function performs the top level reserved memory initialization. @@ -683,7 +667,6 @@ void CFE_PSP_SetupReservedMemoryMap(void) int32 CFE_PSP_InitProcessorReservedMemory(uint32 RestartType) { - /* * Clear the segments only on a POWER ON reset * @@ -736,7 +719,6 @@ int32 CFE_PSP_InitProcessorReservedMemory(uint32 RestartType) } /****************************************************************************** -** Function: CFE_PSP_DeleteProcessorReservedMemory ** ** Purpose: ** This function cleans up all of the shared memory segments in the @@ -750,7 +732,6 @@ int32 CFE_PSP_InitProcessorReservedMemory(uint32 RestartType) */ void CFE_PSP_DeleteProcessorReservedMemory(void) { - CFE_PSP_DeleteCDS(); CFE_PSP_DeleteResetArea(); CFE_PSP_DeleteUserReservedArea(); @@ -763,7 +744,6 @@ void CFE_PSP_DeleteProcessorReservedMemory(void) */ /****************************************************************************** -** Function: CFE_PSP_GetKernelTextSegmentInfo ** ** Purpose: ** This function returns the start and end address of the kernel text segment. @@ -789,7 +769,6 @@ int32 CFE_PSP_GetKernelTextSegmentInfo(cpuaddr *PtrToKernelSegment, uint32 *Size } /****************************************************************************** -** Function: CFE_PSP_GetCFETextSegmentInfo ** ** Purpose: ** This function returns the start and end address of the CFE text segment. diff --git a/fsw/pc-linux/src/cfe_psp_ssr.c b/fsw/pc-linux/src/cfe_psp_ssr.c index 94e01ec2..3f282dfb 100644 --- a/fsw/pc-linux/src/cfe_psp_ssr.c +++ b/fsw/pc-linux/src/cfe_psp_ssr.c @@ -49,7 +49,6 @@ #include /****************************************************************************** -** Function: CFE_PSP_InitSSR ** ** Purpose: ** Initializes the Solid State Recorder device. This can be filled in for the platform. diff --git a/fsw/pc-linux/src/cfe_psp_start.c b/fsw/pc-linux/src/cfe_psp_start.c index 5b2c2425..71e83b48 100644 --- a/fsw/pc-linux/src/cfe_psp_start.c +++ b/fsw/pc-linux/src/cfe_psp_start.c @@ -105,7 +105,6 @@ typedef struct uint32 SpacecraftId; /* Spacecraft ID */ uint32 GotSpacecraftId; /* Did we get a Spacecraft ID */ - } CFE_PSP_CommandData_t; /* @@ -142,7 +141,6 @@ static const struct option longOpts[] = {{"reset", required_argument, NULL, 'R'} {NULL, no_argument, NULL, 0}}; /****************************************************************************** -** Function: CFE_PSP_OS_EventHandler() ** ** Purpose: ** Linux Task creation event handler. @@ -211,7 +209,6 @@ int32 CFE_PSP_OS_EventHandler(OS_Event_t event, osal_id_t object_id, void *data) } /****************************************************************************** -** Function: main() ** ** Purpose: ** BSP Application entry point. @@ -491,7 +488,6 @@ void OS_Application_Run(void) } /****************************************************************************** -** Function: CFE_PSP_DisplayUsage ** ** Purpose: ** Display program usage, and exit. @@ -504,7 +500,6 @@ void OS_Application_Run(void) */ void CFE_PSP_DisplayUsage(char *Name) { - printf("usage : %s [-R ] [-S ] [-C