system: check reset button state correctly on gamecube (#124)

DacoTaco · web-flow · commit e1705d1d6242 · 2022-01-24T17:10:14.000+01:00
also unmask the irq after callback so pressing it again re-triggers the irq
diff --git a/libogc/system.c b/libogc/system.c
@@ -446,14 +446,14 @@ static void __RSWHandler(u32 irq, void* ctx)
 	do  {
 		now = gettime();
 		if(diff_usec(hold_down,now)>=100) break;
-	} while(!(_piReg[0]&0x10000));
+	} while(!SYS_ResetButtonDown());
 
-	if(_piReg[0]&0x10000) {
+	if(SYS_ResetButtonDown()){
 		__MaskIrq(IRQMASK(IRQ_PI_RSW));
-
 		if(__RSWCallback) {
 			__RSWCallback(irq, ctx);
 		}
+		__UnmaskIrq(IRQMASK(IRQ_PI_RSW));
 	}
 	_piReg[0] = 2;
 }

Original file line number	Diff line number	Diff line change
`@@ -446,14 +446,14 @@ static void __RSWHandler(u32 irq, void* ctx)`
`446`	`446`	`do {`
`447`	`447`	`now = gettime();`
`448`	`448`	`if(diff_usec(hold_down,now)>=100) break;`
`449`		`- } while(!(_piReg[0]&0x10000));`
	`449`	`+ } while(!SYS_ResetButtonDown());`
`450`	`450`
`451`		`- if(_piReg[0]&0x10000) {`
	`451`	`+ if(SYS_ResetButtonDown()){`
`452`	`452`	`__MaskIrq(IRQMASK(IRQ_PI_RSW));`
`453`		`-`
`454`	`453`	`if(__RSWCallback) {`
`455`	`454`	`__RSWCallback(irq, ctx);`
`456`	`455`	`}`
	`456`	`+ __UnmaskIrq(IRQMASK(IRQ_PI_RSW));`
`457`	`457`	`}`
`458`	`458`	`_piReg[0] = 2;`
`459`	`459`	`}`