OCC405 Stripped Down and Compiles

Change-Id: Ic5c0536de429106975f5b5b0831c645d6f53e86c
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19650
Tested-by: William A. Bryan <wilbryan@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

3 files changed, 16 insertions, 4 deletions

diff --git a/src/occ_405/trac/trac.h b/src/occ_405/trac/trac.h
index 87f669b..ea9961c 100755
--- a/src/occ_405/trac/trac.h
+++ b/src/occ_405/trac/trac.h
@@ -58,6 +58,7 @@
 //      TRAC_DBG must be used for debug purpose only. This traces will be
 //               turned OFF with product code.
 #ifdef TRAC_TO_SIMICS
+
 #define TRAC_ERR(frmt,args...)  \
         printf(ERR_MRK "%s: "frmt "\n",__FUNCTION__,##args)
 #define TRAC_INFO(frmt,args...)  \
@@ -74,6 +75,7 @@ extern void dumpHexString(const void *i_data, const unsigned int len, const char
 
 #else  //TRAC_TO_SIMICS
 
+/*
 #define TRAC_ERR(frmt,args...)  \
         TRACE(g_trac_err,ERR_MRK frmt,##args)
 #define TRAC_INFO(frmt,args...)  \
@@ -84,7 +86,12 @@ extern void dumpHexString(const void *i_data, const unsigned int len, const char
         TRACE(g_trac_inf,DBG_MRK fmt,##args)
 #define DEBUG_HEXDUMP(data, len, string)  \
         TRACEBIN(g_trac_inf, string, data,len)
-
+*/
+#define TRAC_ERR SSX_TRACE
+#define TRAC_INFO SSX_TRACE
+#define TRAC_IMP SSX_TRACE
+#define DBG_PRINT SSX_TRACE
+#define DEBUG_HEXDUMP SSX_TRACE_BIN
 #endif  //TRAC_TO_SIMICS
 
 
diff --git a/src/occ_405/trac/trac_interface.c b/src/occ_405/trac/trac_interface.c
index 56a7cfb..c524d79 100755
--- a/src/occ_405/trac/trac_interface.c
+++ b/src/occ_405/trac/trac_interface.c
@@ -466,7 +466,8 @@ UINT trac_write_int(tracDesc_t io_td,const trace_hash_val i_hash,
                 l_entry_size = l_entry_size + ((1 - i_num_args)*4);
 
                 // fill trace field
-                l_entry.head.hash = trace_adal_hash("IMP: ISR Circular Buffer is full, %d entries lost", -1);
+// TEMP -- I don't think we use this...
+//                l_entry.head.hash = trace_adal_hash("IMP: ISR Circular Buffer is full, %d entries lost", -1);
                 l_entry.head.line = __LINE__;
 
                 // one argument for this trace
diff --git a/src/occ_405/trac/trac_interface.h b/src/occ_405/trac/trac_interface.h
index d448a0e..f573899 100755
--- a/src/occ_405/trac/trac_interface.h
+++ b/src/occ_405/trac/trac_interface.h
@@ -41,11 +41,15 @@
 //*************************************************************************
 /* Used to trace 0 - 5 arguments or a binary buffer when using a hash value. */
 
+
 #define TRACE(i_td,i_string,args...)                  \
-                trace_adal_write_all(i_td,trace_adal_hash(i_string,-1),__LINE__,0,##args)
+                  SSX_TRACE(i_string, args...)
+//                trace_adal_write_all(i_td,trace_adal_hash(i_string,-1),__LINE__,0,##args)
 
 #define TRACEBIN(i_td,i_string,i_ptr,i_size)          \
-                trac_write_bin(i_td,trace_adal_hash(i_string,0),__LINE__,i_ptr,i_size)
+                  SSX_TRACE_BIN(i_string, i_ptr, i_size)
+//                trac_write_bin(i_td,trace_adal_hash(i_string,0),__LINE__,i_ptr,i_size)
+
 
 #ifndef NO_TRAC_STRINGS