Small improvement to IGR & Remove unneeded option.

ee_core/src/padhook.c

@@ -83,6 +83,17 @@ static void t_loadElf(void)
     LoadModule("rom0:SIO2MAN", 0, NULL);
     LoadModule("rom0:MCMAN", 0, NULL);
 
+    if (ExitPath[1] == 'a') { // ie mass:
+        ret = LoadModule("mc0:SYS-CONF/USBD.IRX", 0, NULL);
+        if (ret >= 0)
+            LoadModule("mc0:SYS-CONF/USBHDFSD.IRX", 0, NULL);
+        else {
+            LoadModule("mc1:SYS-CONF/USBD.IRX", 0, NULL);
+            LoadModule("mc1:SYS-CONF/USBHDFSD.IRX", 0, NULL);
+        }
+        delay(5); // Wait for device to be detected.
+    }
+
     // Load exit ELF
     argv[0] = ExitPath;
     argv[1] = NULL;

include/config.h

@@ -79,7 +79,6 @@ enum CONFIG_INDEX {
 #define CONFIG_OPL_DEFAULT_DEVICE "default_device"
 #define CONFIG_OPL_ENABLE_WRITE "enable_delete_rename"
 #define CONFIG_OPL_HDD_SPINDOWN "hdd_spindown"
-#define CONFIG_OPL_USB_CHECK_FRAG "check_usb_frag"
 #define CONFIG_OPL_USB_PREFIX "usb_prefix"
 #define CONFIG_OPL_ETH_PREFIX "eth_prefix"
 #define CONFIG_OPL_REMEMBER_LAST "remember_last"

include/dialogs.h

@@ -34,7 +34,6 @@ enum UI_ITEMS {
     CFG_HDDMODE,
     CFG_ETHMODE,
     CFG_APPMODE,
-    CFG_CHECKUSBFRAG,
     CFG_LASTPLAYED,
     CFG_LBL_AUTOSTARTLAST,
     CFG_AUTOSTARTLAST,

include/lang.h

@@ -104,7 +104,6 @@ enum _STR_IDS {
     _STR_RUN,
     _STR_GFX_SETTINGS,
     _STR_ENABLE_WRITE,
-    _STR_CHECKUSBFRAG,
     _STR_LASTPLAYED,
     _STR_SELECTBUTTON,
     _STR_ERR_FRAGMENTED,

include/opl.h

@@ -164,7 +164,6 @@ extern int gDefaultDevice;
 
 extern int gEnableWrite;
 
-extern int gCheckUSBFragmentation;
 //These prefixes are relative to the device's name (meaning that they do not include the device name).
 extern char gUSBPrefix[32];
 extern char gETHPrefix[32];

src/dialogs.c

@@ -179,11 +179,6 @@ struct UIItem diaConfig[] = {
     {UI_ENUM, CFG_SELECTBUTTON, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
     {UI_SPLITTER},
 
-    {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_CHECKUSBFRAG}}},
-    {UI_SPACER},
-    {UI_BOOL, CFG_CHECKUSBFRAG, 1, 1, -1, 0, 0, {.intvalue = {0, 0}}},
-    {UI_BREAK},
-
     {UI_LABEL, 0, 1, 1, -1, -40, 0, {.label = {NULL, _STR_USB_PREFIX}}},
     {UI_SPACER},
     {UI_STRING, CFG_USBPREFIX, 1, 1, -1, 0, 0, {.stringvalue = {"", "", NULL}}},

src/gui.c

@@ -451,7 +451,6 @@ void guiShowConfig()
     diaSetString(diaConfig, CFG_EXITTO, gExitPath);
     diaSetInt(diaConfig, CFG_ENWRITEOP, gEnableWrite);
     diaSetInt(diaConfig, CFG_HDDSPINDOWN, gHDDSpindown);
-    diaSetInt(diaConfig, CFG_CHECKUSBFRAG, gCheckUSBFragmentation);
     diaSetString(diaConfig, CFG_USBPREFIX, gUSBPrefix);
     diaSetString(diaConfig, CFG_ETHPREFIX, gETHPrefix);
     diaSetInt(diaConfig, CFG_LASTPLAYED, gRememberLastPlayed);
@@ -474,7 +473,6 @@ void guiShowConfig()
         diaGetString(diaConfig, CFG_EXITTO, gExitPath, sizeof(gExitPath));
         diaGetInt(diaConfig, CFG_ENWRITEOP, &gEnableWrite);
         diaGetInt(diaConfig, CFG_HDDSPINDOWN, &gHDDSpindown);
-        diaGetInt(diaConfig, CFG_CHECKUSBFRAG, &gCheckUSBFragmentation);
         diaGetString(diaConfig, CFG_USBPREFIX, gUSBPrefix, sizeof(gUSBPrefix));
         diaGetString(diaConfig, CFG_ETHPREFIX, gETHPrefix, sizeof(gETHPrefix));
         diaGetInt(diaConfig, CFG_LASTPLAYED, &gRememberLastPlayed);

src/lang.c

@@ -107,7 +107,6 @@ static char *internalEnglish[LANG_STR_COUNT] = {
     "Run",
     "Display Settings",
     "Enable Write Operations",
-    "Check USB Game Fragmentation",
     "Remember Last Played Game",
     "Select Button",
     "Error, the game is fragmented.",

src/opl.c

@@ -175,7 +175,6 @@ int gDisableDebug;
 int gPS2Logo;
 int gDefaultDevice;
 int gEnableWrite;
-int gCheckUSBFragmentation;
 char gUSBPrefix[32];
 char gETHPrefix[32];
 int gRememberLastPlayed;
@@ -839,7 +838,6 @@ static void _loadConfig()
             configGetInt(configOPL, CONFIG_OPL_DEFAULT_DEVICE, &gDefaultDevice);
             configGetInt(configOPL, CONFIG_OPL_ENABLE_WRITE, &gEnableWrite);
             configGetInt(configOPL, CONFIG_OPL_HDD_SPINDOWN, &gHDDSpindown);
-            configGetInt(configOPL, CONFIG_OPL_USB_CHECK_FRAG, &gCheckUSBFragmentation);
             configGetStrCopy(configOPL, CONFIG_OPL_USB_PREFIX, gUSBPrefix, sizeof(gUSBPrefix));
             configGetStrCopy(configOPL, CONFIG_OPL_ETH_PREFIX, gETHPrefix, sizeof(gETHPrefix));
             configGetInt(configOPL, CONFIG_OPL_REMEMBER_LAST, &gRememberLastPlayed);
@@ -989,7 +987,6 @@ static void _saveConfig()
         configSetInt(configOPL, CONFIG_OPL_DEFAULT_DEVICE, gDefaultDevice);
         configSetInt(configOPL, CONFIG_OPL_ENABLE_WRITE, gEnableWrite);
         configSetInt(configOPL, CONFIG_OPL_HDD_SPINDOWN, gHDDSpindown);
-        configSetInt(configOPL, CONFIG_OPL_USB_CHECK_FRAG, gCheckUSBFragmentation);
         configSetStr(configOPL, CONFIG_OPL_USB_PREFIX, gUSBPrefix);
         configSetStr(configOPL, CONFIG_OPL_ETH_PREFIX, gETHPrefix);
         configSetInt(configOPL, CONFIG_OPL_REMEMBER_LAST, gRememberLastPlayed);
@@ -1568,7 +1565,6 @@ static void setDefaults(void)
     gRememberLastPlayed = 0;
     gAutoStartLastPlayed = 9;
     gSelectButton = KEY_CIRCLE; //Default to Japan.
-    gCheckUSBFragmentation = 1;
     gUSBPrefix[0] = '\0';
     gETHPrefix[0] = '\0';
     gEnableNotifications = 0;

src/usbsupport.c

@@ -295,17 +295,15 @@ static void usbLaunchGame(int id, config_set_t *configSet)
         fd = open(partname, O_RDONLY);
         if (fd >= 0) {
             settings->LBAs[i] = fileXioIoctl(fd, USBMASS_IOCTL_GET_LBA, partname);
-            if (gCheckUSBFragmentation) {
-                if ((startCluster = (unsigned int)fileXioIoctl(fd, USBMASS_IOCTL_GET_CLUSTER, partname)) == 0 || fileXioDevctl("xmass0:", XUSBHDFSD_CHECK_CLUSTER_CHAIN, &startCluster, 4, NULL, 0) == 0) {
+            if ((startCluster = (unsigned int)fileXioIoctl(fd, USBMASS_IOCTL_GET_CLUSTER, partname)) == 0 || fileXioDevctl("xmass0:", XUSBHDFSD_CHECK_CLUSTER_CHAIN, &startCluster, 4, NULL, 0) == 0) {
 
-                    close(fd);
-                    //Game is fragmented. Do not continue.
-                    if (settings != NULL)
-                        sbUnprepare(&settings->common);
+                close(fd);
+                //Game is fragmented. Do not continue.
+                if (settings != NULL)
+                    sbUnprepare(&settings->common);
 
-                    guiMsgBox(_l(_STR_ERR_FRAGMENTED), 0, NULL);
-                    return;
-                }
+                guiMsgBox(_l(_STR_ERR_FRAGMENTED), 0, NULL);
+                return;
             }
 
             if ((gPS2Logo) && (i == 0))