diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2015-12-10 14:26:52 -0600 |
|---|---|---|
| committer | Wael Elessawy <welessa@us.ibm.com> | 2015-12-15 14:39:03 -0600 |
| commit | ff50d1ba87a4affe60b26d581b668f12a355de29 (patch) | |
| tree | b6233c1e566036c276a9261431cd2e089faa8654 /src/occ_405/main.c | |
| parent | 99ef891b7853232a80d5c1914f201c81e8a725c3 (diff) | |
| download | talos-occ-ff50d1ba87a4affe60b26d581b668f12a355de29.tar.gz talos-occ-ff50d1ba87a4affe60b26d581b668f12a355de29.zip | |
Enable state transition to observation
Enabled DCOM thread
RTC:140900
Change-Id: I857e2c4b2a15903ccddc2df5db910dddf155a8e5
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22658
Tested-by: FSP CI Jenkins
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: Wael Elessawy <welessa@us.ibm.com>
Diffstat (limited to 'src/occ_405/main.c')
| -rwxr-xr-x | src/occ_405/main.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/occ_405/main.c b/src/occ_405/main.c index b7bd4fb..2d0c37b 100755 --- a/src/occ_405/main.c +++ b/src/occ_405/main.c @@ -596,8 +596,6 @@ void slave_occ_init() // Run AMEC Slave Init Code amec_slave_init(); -// @TODO - TEMP: SMGR not ready yet -/* // Initialize SMGR State Semaphores extern SsxSemaphore G_smgrModeChangeSem; ssx_semaphore_create(&G_smgrModeChangeSem, 1, 1); @@ -605,7 +603,6 @@ void slave_occ_init() // Initialize SMGR Mode Semaphores extern SsxSemaphore G_smgrStateChangeSem; ssx_semaphore_create(&G_smgrStateChangeSem, 1, 1); -*/ } /* @@ -770,13 +767,15 @@ void Main_thread_routine(void *private) // TEMP -- NO DCOM YET, init as OCC Master //dcom_initialize_roles(); +#if STRAIGHT_TO_OBS_HACK // Remove the next LOC when dcom_initialize_roles() is un-commented G_occ_role = OCC_MASTER; // TEMP - @TODO - // Remove the next 2 LOC when dcom_initialize_roles is un-commented - // AND cmdh is running to call master_occ_init - rtl_set_run_mask(RTL_FLAG_MSTR); - master_occ_init(); + // Remove the next 2 LOC when dcom_initialize_roles is un-commented + // AND cmdh is running to call master_occ_init + rtl_set_run_mask(RTL_FLAG_MSTR); + master_occ_init(); +#endif CHECKPOINT(ROLES_INITIALIZED); @@ -832,11 +831,14 @@ void Main_thread_routine(void *private) // TEMP: Normally these flags are set elsewhere, after the BMC/FSP // send us configuration data. This is a temporary hack until // that communication is enabled. Required for APSS tasks. +#if STRAIGHT_TO_OBS_HACK rtl_set_run_mask(RTL_FLAG_OBS); rtl_clr_run_mask(RTL_FLAG_STANDBY); rtl_clr_run_mask(RTL_FLAG_APSS_NOT_INITD); rtl_clr_run_mask(RTL_FLAG_RST_REQ); +#endif // END TEMP + while (TRUE) { // Count each loop so the watchdog can tell the main thread is |
