FASTTRACK: Merge #1 #2 #10

Fasttracked to test

CMakeLists.txt

@@ -0,0 +1,15 @@
+# CMake recipe for building tblCRCTool
+#
+
+# This tool references the definitions of the CFE_TBL_FileHdr_t and CFE_FS_Header_t
+# structures, which are defined in the CFE header files.  This, in turn, requires
+# the common_types.h file from OSAL and the global cfe_mission_cfg.h file. 
+include_directories(${MISSION_BINARY_DIR}/inc)
+include_directories(${osal_MISSION_DIR}/src/os/inc)
+include_directories(${cfe-core_MISSION_DIR}/src/inc)
+
+add_executable(cfe_ts_crc cfe_ts_crc.c)
+
+install(TARGETS cfe_ts_crc DESTINATION host)
+
+

cfe_ts_crc.c

@@ -42,7 +42,8 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
-
+#include <stdlib.h>
+#include <unistd.h>
 
 #define CFE_ES_CRC_8   1  /**< \brief CRC ( 8 bit additive - returns 32 bit total) (Currently not implemented) */
 #define CFE_ES_CRC_16  2  /**< \brief CRC (16 bit additive - returns 32 bit total) */
@@ -177,7 +178,14 @@ int main( int argc, char **argv )
 		if (readSize != 100) done=1;	
 	}
 	/* print the size/CRC results */
-     printf("\nTable File Name:            %s\nTable Size:                 %d Bytes\nExpected TS Validation CRC: 0x%08X\n\n", argv[1], fileSize, fileCRC);
+    printf("\nTable File Name:            %s\nTable Size:                 %d Bytes\nExpected TS Validation CRC: 0x%08X\n\n", argv[1], fileSize, fileCRC);
+
+    /* Close file and check*/
+    if( close(fd) != 0 )
+    {
+        printf("\nerror: Cannot close file!\n");
+        exit(0);
+    }
 
-     return(fileCRC);
+    return(fileCRC);
 }