From c71e9163e178745472e60f5f2e05c811e6b95715 Mon Sep 17 00:00:00 2001 From: KrahJohlito Date: Sun, 17 Jan 2021 20:57:33 +1030 Subject: [PATCH] Remove option to check if usb games are fragmented and force the check --- include/config.h | 1 - include/dialogs.h | 1 - include/lang.h | 1 - include/opl.h | 1 - src/dialogs.c | 5 ----- src/gui.c | 2 -- src/lang.c | 1 - src/opl.c | 4 ---- src/usbsupport.c | 16 +++++++--------- 9 files changed, 7 insertions(+), 25 deletions(-) diff --git a/include/config.h b/include/config.h index 2a8c0f323..1465d9cc7 100644 --- a/include/config.h +++ b/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" diff --git a/include/dialogs.h b/include/dialogs.h index 334cb5d96..f9787d380 100644 --- a/include/dialogs.h +++ b/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, diff --git a/include/lang.h b/include/lang.h index 29b99594a..53538abb7 100644 --- a/include/lang.h +++ b/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, diff --git a/include/opl.h b/include/opl.h index 5dea7b098..47abf864d 100644 --- a/include/opl.h +++ b/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]; diff --git a/src/dialogs.c b/src/dialogs.c index d777787a9..73939a003 100644 --- a/src/dialogs.c +++ b/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}}}, diff --git a/src/gui.c b/src/gui.c index c97003c35..d70f893a1 100644 --- a/src/gui.c +++ b/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); diff --git a/src/lang.c b/src/lang.c index 22b833990..246cf7731 100644 --- a/src/lang.c +++ b/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.", diff --git a/src/opl.c b/src/opl.c index 99c3b1066..cd762c847 100644 --- a/src/opl.c +++ b/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; diff --git a/src/usbsupport.c b/src/usbsupport.c index a1280c303..3561efa6f 100644 --- a/src/usbsupport.c +++ b/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))