Refactor version check

Author: Extrems

include/ogc/mmce.h

@@ -36,6 +36,7 @@ distribution.
 #define MMCE_RESULT_BUSY        -1
 #define MMCE_RESULT_WRONGDEVICE -2
 #define MMCE_RESULT_NOCARD      -3
+#define MMCE_RESULT_VERSION     -4
 #define MMCE_RESULT_FATAL_ERROR -128
 
 #ifdef __cplusplus

libogc/mmce.c

@@ -137,6 +137,8 @@ s32 MMCE_GetDeviceID(s32 chan, u32 *id)
 		return MMCE_RESULT_NOCARD;
 	else if ((*id & ~0xFFFF) != EXI_MEMCARDPRO)
 		return MMCE_RESULT_WRONGDEVICE;
+	else if ((*id << 16) == EXI_MEMCARDPRO || (*id & 0xFFFF) == 0xFFFF)
+		return MMCE_RESULT_VERSION;
 	else
 		return MMCE_RESULT_READY;
 }
@@ -542,7 +544,7 @@ static bool __mmce_startup(DISC_INTERFACE *disc)
 		if (!EXI_Attach(chan, ExtHandler))
 			return false;
 
-	if (MMCE_GetDeviceID(chan, &id) < 0 || (id << 16) == EXI_MEMCARDPRO || (u16)id < 0x0101 || (u16)id == 0xFFFF) {
+	if (MMCE_GetDeviceID(chan, &id) != MMCE_RESULT_READY || (u16)id < 0x0101) {
 		if (chan < EXI_CHANNEL_2)
 			EXI_Detach(chan);
 		return false;