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, 31 insertions, 22 deletions

diff --git a/src/occ_405/cent/centaur_control.c b/src/occ_405/cent/centaur_control.c
index 825de18..801bd04 100755
--- a/src/occ_405/cent/centaur_control.c
+++ b/src/occ_405/cent/centaur_control.c
@@ -23,12 +23,12 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-//*************************************************************************
+//*************************************************************************/
 // Includes
-//*************************************************************************
+//*************************************************************************/
 #include "centaur_control.h"
 #include "centaur_data.h"
-#include "pgp_async.h"
+#include "occhw_async.h"
 #include "threadSch.h"
 #include "pmc_register_addresses.h"
 #include "centaur_data_service_codes.h"
@@ -43,17 +43,17 @@
 #include "centaur_register_addresses.h"
 #include "amec_sys.h"
 
-//*************************************************************************
+//*************************************************************************/
 // Externs
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Macros
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Defines/Enums
-//*************************************************************************
+//*************************************************************************/
 
 // Used for Centaur Initialization of Registers
 typedef enum
@@ -65,13 +65,13 @@ typedef enum
 } eCentaurThrottleRegs;
 
 
-//*************************************************************************
+//*************************************************************************/
 // Structures
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Globals
-//*************************************************************************
+//*************************************************************************/
 
 //Pore flex request for the GPE job that is used for centaur init.
 PoreFlex G_centaur_control_pore_req;
@@ -94,13 +94,13 @@ centaur_throttle_t G_centaurThrottleLimits[MAX_NUM_CENTAURS][NUM_MBAS_PER_CENTAU
 //bitmap of configured MBA's (2 per centaur, lsb is centaur 0/mba 0)
 uint16_t G_configured_mbas = 0;
 
-//*************************************************************************
+//*************************************************************************/
 // Function Prototypes
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Functions
-//*************************************************************************
+//*************************************************************************/
 
 //////////////////////////
 // Function Specification
diff --git a/src/occ_405/cent/centaur_control.h b/src/occ_405/cent/centaur_control.h
index a92f7ad..9b37b0c 100755
--- a/src/occ_405/cent/centaur_control.h
+++ b/src/occ_405/cent/centaur_control.h
@@ -32,7 +32,7 @@
 #include <occ_common.h>
 #include <ssx.h>
 #include "rtls.h"
-#include "gpe_data.h"
+//#include "gpe_data.h"
 #include "occ_sys_config.h"
 
 //*************************************************************************
@@ -64,6 +64,8 @@ typedef enum
 } eCentaurControlTraceFlags;
 
 //Centaur data collect structures used for task data pointers
+// TEMP -- PORE ISSUES
+/*
 struct centaur_control_task {
         uint8_t  startCentaur;
         uint8_t  prevCentaur;
@@ -73,6 +75,7 @@ struct centaur_control_task {
         PoreFlex gpe_req;
 } __attribute__ ((__packed__));
 typedef struct centaur_control_task centaur_control_task_t;
+*/
 
 //per mba throttle values
 typedef struct
@@ -88,7 +91,8 @@ typedef struct
 //*************************************************************************
 
 //Global centaur structures used for task data pointers
-extern centaur_control_task_t G_centaur_control_task;
+// TEMP -- PORE ISSUES
+//extern centaur_control_task_t G_centaur_control_task;
 
 //*************************************************************************
 // Function Prototypes
diff --git a/src/occ_405/cent/centaur_data.h b/src/occ_405/cent/centaur_data.h
index 2eec5fd..63cc264 100755
--- a/src/occ_405/cent/centaur_data.h
+++ b/src/occ_405/cent/centaur_data.h
@@ -32,7 +32,7 @@
 #include <occ_common.h>
 #include <ssx.h>
 #include "rtls.h"
-#include "gpe_data.h"
+//#include "gpe_data.h"
 #include "occ_sys_config.h"
 
 //*************************************************************************
@@ -106,6 +106,8 @@ enum eOccCentaurs
 //*************************************************************************
 
 //Centaur data collect structures used for task data pointers
+// TEMP -- PORE ISSUES
+/*
 struct centaur_data_task {
         uint8_t start_centaur;
         uint8_t current_centaur;
@@ -115,6 +117,7 @@ struct centaur_data_task {
         PoreFlex gpe_req;
 } __attribute__ ((__packed__));
 typedef struct centaur_data_task centaur_data_task_t;
+*/
 
 typedef union
 {
@@ -129,7 +132,8 @@ typedef union
 //*************************************************************************
 
 //Global centaur structures used for task data pointers
-extern centaur_data_task_t G_centaur_data_task;
+// TEMP -- COMMENTED OUT DUE TO PORE ISSUES
+//extern centaur_data_task_t G_centaur_data_task;
 
 //Global is bitmask of centaurs
 extern uint32_t G_present_centaurs;
@@ -181,7 +185,8 @@ bool cent_chan_checkstop(const uint8_t i_cent);
 
 //Returns a pointer to the most up-to-date centaur data for the centaur
 //associated with the specified OCC centaur id.
-MemData * cent_get_centaur_data_ptr( const uint8_t i_centaur_id );
+// TEMP -- WHERE IS MemData ??
+//MemData * cent_get_centaur_data_ptr( const uint8_t i_centaur_id );
 
 #endif //_CENTAUR_DATA_H