Deobfuscate comparisons

Author: Extrems

libogc/dvd.c

@@ -401,8 +401,8 @@ static u8 convert(u32 errorcode)
 {
 	u8 err,err_num;
 
-	if((errorcode-0x01230000)==0x4567) return 255;
-	else if((errorcode-0x01230000)==0x4568) return 254;
+	if(errorcode==0x01234567) return 255;
+	else if(errorcode==0x01234568) return 254;
 
 	err = _SHIFTR(errorcode,24,8);
 	err_num = err2num((errorcode&0x00ffffff));
@@ -514,28 +514,28 @@ static u32 __dvd_categorizeerror(u32 errorcode)
 #ifdef _DVD_DEBUG
 	printf("__dvd_categorizeerror(%08x)\n",errorcode);
 #endif
-	if((errorcode-0x20000)==0x0400) {
+	if(errorcode==DVD_ERROR_MOTOR_STOPPED) {
 		__dvd_lasterror = errorcode;
 		return 1;
 	}
 
-	if(DVD_ERROR(errorcode)==DVD_ERROR_MEDIUM_CHANGED
-		|| DVD_ERROR(errorcode)==DVD_ERROR_MEDIUM_NOT_PRESENT
-		|| DVD_ERROR(errorcode)==DVD_ERROR_MEDIUM_CHANGE_REQ
-		|| (DVD_ERROR(errorcode)-0x40000)==0x3100) return 0;
+	errorcode = DVD_ERROR(errorcode);
+	if(errorcode==DVD_ERROR_MEDIUM_CHANGED
+		|| errorcode==DVD_ERROR_MEDIUM_NOT_PRESENT
+		|| errorcode==DVD_ERROR_MEDIUM_CHANGE_REQ) return 0;
 
 	__dvd_internalretries++;
 	if(__dvd_internalretries==2) {
-		if(__dvd_lasterror==DVD_ERROR(errorcode)) {
-			__dvd_lasterror = DVD_ERROR(errorcode);
+		if(__dvd_lasterror==errorcode) {
+			__dvd_lasterror = errorcode;
 			return 1;
 		}
-		__dvd_lasterror = DVD_ERROR(errorcode);
+		__dvd_lasterror = errorcode;
 		return 2;
 	}
 
-	__dvd_lasterror = DVD_ERROR(errorcode);
-	if(DVD_ERROR(errorcode)!=DVD_ERROR_UNRECOVERABLE_READ) {
+	__dvd_lasterror = errorcode;
+	if(errorcode!=DVD_ERROR_UNRECOVERABLE_READ) {
 		if(__dvd_executing->cmd!=0x0005) return 3;
 	}
 	return 2;

libogc/gx.c

@@ -121,7 +121,7 @@ static const u32 _gxtexregionaddrtable[48] =
 };
 
 static struct __gx_regdef __gxregs __attribute__((section(".sbss")));
-static struct __gx_regdef* __gx = &__gxregs;
+static struct __gx_regdef *__gx = &__gxregs;
 static struct __gx_regdef _gx_saved_data;
 
 static s32 __gx_onreset(s32 final);

libogc/pad.c

@@ -384,8 +384,8 @@ static void __pad_typeandstatuscallback(s32 chan,u32 type)
 		return;
 	}
 
-	__pad_type[__pad_resettingchan] = (type&~0xff);
-	if(((type&SI_TYPE_MASK)-SI_TYPE_GC)
+	__pad_type[__pad_resettingchan] = type&~0xff;
+	if((type&SI_TYPE_MASK)!=SI_TYPE_GC
 		|| !(type&SI_GC_STANDARD)) {
 		__pad_doreset();
 		return;

libogc/si.c

@@ -282,7 +282,7 @@ static void __si_gettypecallback(s32 chan,u32 type)
 	sipad_en = __PADFixBits&SI_CHAN_BIT(chan);
 	__PADFixBits &= ~SI_CHAN_BIT(chan);
 
-	if(type&0x0f || ((si_type[chan]&SI_TYPE_MASK)-SI_TYPE_GC)
+	if(type&0x0f || (si_type[chan]&SI_TYPE_MASK)!=SI_TYPE_GC
 		|| !(si_type[chan]&SI_GC_WIRELESS) || si_type[chan]&SI_WIRELESS_IR) {
 		SYS_SetWirelessID(chan,0);
 		__si_calltypeandstatuscallback(chan,si_type[chan]);