Fix #367, Remove redundant/inconsistent comments (/* end of function */, /* end if */ etc.) and clean up empty lines.

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;
 
 /*

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

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)

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.

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

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

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.

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.

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

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;