diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/occ_405/occbuildname.c | 2 | ||||
| -rwxr-xr-x | src/occ_405/state.c | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/occ_405/occbuildname.c b/src/occ_405/occbuildname.c index 0e5dfeb..394d019 100755 --- a/src/occ_405/occbuildname.c +++ b/src/occ_405/occbuildname.c @@ -34,6 +34,6 @@ volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = #else -volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_180410a\0" /*</BuildName>*/ ; +volatile const char G_occ_buildname[16] __attribute__((section(".buildname"))) = /*<BuildName>*/ "op_occ_180411a\0" /*</BuildName>*/ ; #endif diff --git a/src/occ_405/state.c b/src/occ_405/state.c index ca503e0..7718ecf 100755 --- a/src/occ_405/state.c +++ b/src/occ_405/state.c @@ -326,7 +326,6 @@ errlHndl_t SMGR_standby_to_characterization() errlHndl_t SMGR_all_to_standby() { uint32_t wait_time = 0; - int rc; TRAC_IMP("SMGR: Transition from State (%d) to Standby Started", CURRENT_STATE()); @@ -349,18 +348,9 @@ errlHndl_t SMGR_all_to_standby() TRAC_ERR("SMGR_all_to_standby: Timeout waiting for Pstates start/suspend IPC task. OCCFLG[0x%08X]", in32(OCB_OCCFLG)); } - // Stop Pstates if enabled - else if(G_proc_pstate_status == PSTATES_ENABLED) - { - rc = pgpe_start_suspend(PGPE_ACTION_PSTATE_STOP, G_proc_pmcr_owner); - if(rc) - { - TRAC_ERR("SMGR_all_to_standby: Failed to stop the pstate protocol on PGPE. rc[0x%08X] OCCFLG[0x%08X]", - rc, in32(OCB_OCCFLG)); - } - } + // Leave pState protocol alone so if we are exiting active state the PGPE will take action + // when the watchdog goes off - // Pstates should be disabled, ready to safely transition to standby // Set the RTL Flags to indicate which tasks can run // - Clear ACTIVE b/c not in ACTIVE State // - Clear OBSERVATION b/c not in CHARACTERIZATION State |
