Improve power button disable/throttle code

Author: Zarithya

gc/ogc/system.h

@@ -391,7 +391,6 @@ void* SYS_GetArena2Hi(void);
 void SYS_SetArena2Hi(void *newHi);
 u32 SYS_GetArena2Size(void);
 powercallback SYS_SetPowerCallback(powercallback cb);
-void SYS_DisablePowerButton(u32 duration);
 void SYS_DoPowerCB(void);
 #endif
 

libogc/system.c

@@ -157,7 +157,6 @@ static powercallback __POWCallback = NULL;
 
 static u32 __sys_resetdown = 0;
 static u64 __sys_powerenabletime = 0;
-static u64 __sys_powercbtime = 0;
 #endif
 
 static vu64* const _bootTime = (u64*)0x800030d8;
@@ -457,18 +456,11 @@ static void __STMEventHandler(u32 event)
 	}
 
 	if(event==STM_EVENT_POWER) {
-		if(gettime() >= __sys_powerenabletime) {
-			_CPU_ISR_Disable(level);
-			SYS_DoPowerCB();
-			_CPU_ISR_Restore(level);
-		}
+		_CPU_ISR_Disable(level);
+		SYS_DoPowerCB();
+		_CPU_ISR_Restore(level);
 	}
 }
-
-void SYS_DisablePowerButton(u32 disableTime)
-{
-	__sys_powerenabletime = gettime() + millisecs_to_ticks(disableTime);
-}
 #endif
 
 void * __attribute__ ((weak)) __myArena1Lo = 0;
@@ -1034,12 +1026,17 @@ void SYS_DoPowerCB(void)
 
 	// Power button events fire repeatedly for one second after button is pressed
 	// Throttle events so only one callback gets called per button press
-	if(gettime() >= __sys_powercbtime) {
+	if(gettime() >= __sys_powerenabletime) {
 		_CPU_ISR_Disable(level);
 		__POWCallback();
 		_CPU_ISR_Restore(level);
 	}
-	__sys_powercbtime = gettime() + millisecs_to_ticks(10);
+	__sys_powerenabletime = gettime() + millisecs_to_ticks(50);
+}
+
+void __SYS_DisablePowerButton(u32 disableTime)
+{
+	__sys_powerenabletime = gettime() + millisecs_to_ticks(disableTime);
 }
 #endif
 

wiiuse/io_wii.c

@@ -22,6 +22,8 @@ extern void parse_event(struct wiimote_t *wm);
 extern void idle_cycle(struct wiimote_t* wm);
 extern void hexdump(void *d, int len);
 
+extern void __SYS_DisablePowerButton(u32 duration);
+
 static __inline__ u32 ACR_ReadReg(u32 reg)
 {
 	return _ipcReg[reg>>2];
@@ -39,10 +41,12 @@ static s32 __wiiuse_disconnected(void *arg,struct bte_pcb *pcb,u8 err)
 
 	if(!wm) return ERR_OK;
 
-	// Disable system power button events for 1100ms after Wiimote disconnection
+	// Disable system power button events for a bit after Wiimote disconnection
 	// BT module hardware will trigger power button press in GPIO just like front panel
 	// if auth'd Wiimote power button pressed, so this is the only way to disambiguate
-	SYS_DisablePowerButton(1100);
+	// It sends power button events for ~1s, but if we disable for 200ms, we can get
+	// power button event throttling to take care of the rest
+	__SYS_DisablePowerButton(200);
 
 	WIIMOTE_DISABLE_STATE(wm, (WIIMOTE_STATE_BATTERY_CRITICAL));
 	WIIMOTE_DISABLE_STATE(wm, (WIIMOTE_STATE_IR|WIIMOTE_STATE_IR_INIT));