IBL Config fixes

diff --git a/src/util/iblConfig/src/device.c b/src/util/iblConfig/src/device.c
index c02df1000d8becf5a80a6ed2c4dd25c1ca613466..aaf9ed2e402aeb544415312b688b619772f687ff 100644 (file)
--- a/src/util/iblConfig/src/device.c
+++ b/src/util/iblConfig/src/device.c
@@ -16,6 +16,7 @@
 ibl_t c6455_ibl_config(void)
 {
     ibl_t ibl; 
+    memset(&ibl, 0, sizeof(ibl_t));
        
     ibl.iblMagic = ibl_MAGIC_VALUE;
     ibl.iblEvmType = ibl_EVM_C6455L;
@@ -112,6 +113,7 @@ ibl_t c6455_ibl_config(void)
 ibl_t c6474_ibl_config(void)
 {
     ibl_t ibl;
+    memset(&ibl, 0, sizeof(ibl_t));
        
     ibl.iblMagic = ibl_MAGIC_VALUE;
     ibl.iblEvmType = ibl_EVM_C6474M;
@@ -222,6 +224,7 @@ ibl_t c6474_ibl_config(void)
 ibl_t c6474l_ibl_config(void)
 {
     ibl_t ibl;
+    memset(&ibl, 0, sizeof(ibl_t));
        
     ibl.iblMagic = ibl_MAGIC_VALUE;
     ibl.iblEvmType = ibl_EVM_C6474L;
@@ -388,6 +391,7 @@ ibl_t c6474l_ibl_config(void)
 ibl_t c6457_ibl_config(void)
 {
     ibl_t ibl;
+    memset(&ibl, 0, sizeof(ibl_t));
        
     ibl.iblMagic = ibl_MAGIC_VALUE;
     ibl.iblEvmType = ibl_EVM_C6457L;
@@ -552,6 +556,7 @@ ibl_t c6457_ibl_config(void)
 ibl_t c6472_ibl_config(void)
 {
     ibl_t ibl;
+    memset(&ibl, 0, sizeof(ibl_t));
        
     ibl.iblMagic = ibl_MAGIC_VALUE;
     ibl.iblEvmType = ibl_EVM_C6472L;
@@ -711,7 +716,8 @@ ibl_t c6472_ibl_config(void)
 ibl_t c6678_ibl_config(void)
 {
        ibl_t ibl;
-       
+    memset(&ibl, 0, sizeof(ibl_t));
+    
        ibl.iblMagic = ibl_MAGIC_VALUE;
        ibl.iblEvmType = ibl_EVM_C6678L;
 
@@ -928,6 +934,7 @@ ibl_t c6678_ibl_config(void)
 ibl_t c6670_ibl_config(void)
 {
        ibl_t ibl;
+    memset(&ibl, 0, sizeof(ibl_t));
        
        ibl.iblMagic = ibl_MAGIC_VALUE;
        ibl.iblEvmType = ibl_EVM_C6670L;

diff --git a/src/util/iblConfig/src/iblConfig.c b/src/util/iblConfig/src/iblConfig.c
index 258b52f038ade7b7de9eabccceac4e7b9857d339..5df594560a55f9ecdd3d8f7b0d19dfe04e40e65d 100644 (file)
--- a/src/util/iblConfig/src/iblConfig.c
+++ b/src/util/iblConfig/src/iblConfig.c
@@ -1,7 +1,4 @@
 #include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
 #include "device.h"
 
 #define TRUE 1
@@ -54,7 +51,7 @@ int main (void)
     }
 
 
-    fp = fopen (file_name, "r+");
+    fp = fopen (file_name, "r+b");
     if (fp == NULL)
     {
         printf ("Failed to open file %s\n", file_name);
@@ -76,6 +73,7 @@ int main (void)
         return -1;
     }
 
+
     printf ("Generated updated binary %s\n", file_name);
 
     fclose(fp);

diff --git a/src/util/iblConfig/src/types.h b/src/util/iblConfig/src/types.h
index 8f1895e3211fcae2c835a00052edf2ba79af03ca..3414e7faca91f9e1ba8e8b639af98087a1666269 100644 (file)
--- a/src/util/iblConfig/src/types.h
+++ b/src/util/iblConfig/src/types.h
@@ -53,26 +53,28 @@
 
 
 #include <stdlib.h>  /* Defines NULL */
+#include <stdint.h>
+#include <string.h>
 
 /* a signed 16-bit integer */
-typedef short int16;
-typedef unsigned short uint16;
+typedef int16_t int16;
+typedef uint16_t uint16;
 
-typedef int int32;
-typedef unsigned int uint32;
+typedef int32_t int32;
+typedef uint32_t uint32;
 
-typedef char char8;
-typedef unsigned char uchar8;
+typedef int8_t char8;
+typedef uint8_t uchar8;
 
-typedef char int8;
-typedef unsigned char uint8;
+typedef int8_t int8;
+typedef uint8_t uint8;
 
 
-typedef unsigned char word;
+typedef uint8_t word;
 
-typedef short BOOL;
-typedef short bool;
-typedef short Bool;
+typedef int16_t BOOL;
+typedef int16_t bool;
+typedef int16_t Bool;
 #ifndef FALSE
 #define FALSE 0
 #endif
@@ -83,25 +85,25 @@ typedef short Bool;
 
 
 /* tistdtypes.h types used from the emac driver */
-typedef unsigned char Uint8;
-typedef char Int8;
-typedef int Int32;
-typedef unsigned short Uint16;
-typedef unsigned int Uint32;
+typedef uint8_t Uint8;
+typedef int8_t Int8;
+typedef int32_t Int32;
+typedef uint16_t Uint16;
+typedef uint32_t Uint32;
 
 /* TI boot types */
-typedef unsigned char  UINT8;
-typedef unsigned short UINT16;
-typedef short          SINT16;
-typedef unsigned int   UINT32;
-typedef int            SINT32;
+typedef uint8_t  UINT8;
+typedef uint16_t UINT16;
+typedef int16_t          SINT16;
+typedef uint32_t   UINT32;
+typedef int32_t            SINT32;
 
 
 /* Types from evm driver */
-typedef volatile unsigned int  VUint32;
-typedef volatile unsigned char VUint8;
+typedef volatile uint32_t  VUint32;
+typedef volatile uint8_t VUint8;
 
 /* Types from the ethernet driver */
-typedef unsigned int  IPN;
+typedef uint32_t  IPN;
 
 #endif /* ibl_types.h */