The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-11-22 11:19:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Added a Setting to disable FAT/FAT32 Support for USB 2nd Partitions

Browse Source 
NOTE: This option is ONLY for those who have problems with their HDDs being detected. With this disabled you shouldn't get weird lists where all Games are the same or no Games at all.
This commit is contained in:
dimok321 2009-07-05 23:01:29 +00:00
parent 8c28cab3cb
commit 7b2454befd
24 changed files with 133 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Languages/danish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Værktøjtips"
msgid "USB Device not found"
msgstr ""
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX er beskyttet"

5
Languages/dutch.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Hulptekstbalonnen"
msgid "USB Device not found"
msgstr "USB Apparaat niet gevonden!"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX is vergrendeld"

5
Languages/english.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr ""
msgid "USB Device not found"
msgstr ""
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr ""

5
Languages/finnish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "vinkit"
msgid "USB Device not found"
msgstr "USB-laitetta ei löytynyt"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX on suojattu."

5
Languages/french.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Info-bulles"
msgid "USB Device not found"
msgstr "Périphérique USB introuvable"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX est verrouillé"

5
Languages/german.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "ToolTips"
msgid "USB Device not found"
msgstr "USB Gerät nicht gefunden"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX ist geschützt"

5
Languages/italian.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Suggerimenti"
msgid "USB Device not found"
msgstr "Dispositivo USB non Trovato"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX è Protetto"

5
Languages/japanese.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "ﾂｰﾙﾋﾝﾄ"
msgid "USB Device not found"
msgstr "USBﾃﾞﾊﾞｲｽを検出できませんでした"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loaderは保護されています"

5
Languages/korean.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Tooltips"
msgid "USB Device not found"
msgstr "USB 장치가 없습니다."
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB 로더 GX 잠김 상태"

5
Languages/norwegian.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Verktøystips"
msgid "USB Device not found"
msgstr "USB enhet ikke funnet"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX er beskyttet"

5
Languages/portuguese_br.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Dicas"
msgid "USB Device not found"
msgstr "Dispositivo USB não encontrado"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX está bloqueado"

5
Languages/portuguese_pt.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Dicas"
msgid "USB Device not found"
msgstr "Dispositivo USB não encontrado"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "O USB Loader GX está bloqueado"

5
Languages/russian.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Подсказки"
msgid "USB Device not found"
msgstr "USB устройство не найдено"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX заблокирован"

5
Languages/schinese.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "工具提示"
msgid "USB Device not found"
msgstr "找不到 USB 设备"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX 被锁定"

5
Languages/spanish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "InfoBurbujas"
msgid "USB Device not found"
msgstr "USB no encontrado"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX está protegido"

5
Languages/swedish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Verktygstips"
msgid "USB Device not found"
msgstr "USB-enhet ej hittad"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX är skyddad"

5
Languages/tchinese.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "工具提示"
msgid "USB Device not found"
msgstr "找不到 USB 裝置"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX 被鎖定"

5
Languages/turkish.lang
View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-05 08:32+0200\n"
"POT-Creation-Date: 2009-07-06 00:43+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,6 +651,9 @@ msgstr "Yardimlar"
msgid "USB Device not found"
msgstr "USB Aygiti bulunamadi"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX koruma altinda"

7
source/fatmounter.c
View File

@ -7,6 +7,9 @@
#include <sdcard/wiisd_io.h>
#include "usbloader/usbstorage.h"
#include "settings/cfg.h"
extern struct SSettings Settings;
//these are the only stable and speed is good
#define CACHE 8
@ -14,6 +17,8 @@
int USBDevice_Init()
{
if(!Settings.usbfatsupport)
return 1;
//closing all open Files write back the cache and then shutdown em!
fatUnmount("USB:/");
//right now mounts first FAT-partition
@ -29,6 +34,8 @@ int USBDevice_Init()
void USBDevice_deInit()
{
if(!Settings.usbfatsupport)
return;
//closing all open Files write back the cache and then shutdown em!
fatUnmount("USB:/");
}

52
source/main.cpp
View File

@ -33,8 +33,6 @@
#include "wpad.h"
#include "fat.h"
//#define SPECIAL_FOR_ARDI // Fix Problem with Trekstor Classic 250GB
/* Constants */
#define CONSOLE_XCOORD 260
#define CONSOLE_YCOORD 115
@ -48,22 +46,7 @@ int
main(int argc, char *argv[])
{
s32 ret2;
u8 preloaded_ios = 0;
#ifdef SPECIAL_FOR_ARDI
if( (ret2 = IOS_ReloadIOS(249)) >=0 )
preloaded_ios = 249;
else
{
if( (ret2 = IOS_ReloadIOS(222)) >=0 )
{
load_ehc_module();
preloaded_ios = 222;
}
}
#endif
SDCard_Init(); // mount SD for loading cfg's
USBDevice_Init(); // and mount USB:/
bool bootDevice_found=false;
if(argc >= 1)
{
@ -83,33 +66,49 @@ main(int argc, char *argv[])
strcpy(bootDevice, "USB:");
}
ret2 = IOS_ReloadIOS(249);
if(ret2 < 0) {
ret2 = IOS_ReloadIOS(222);
load_ehc_module();
}
SDCard_Init(); // mount SD for loading cfg's
USBDevice_Init(); // and mount USB:/
gettextCleanUp();
//lang_default();
CFG_Load();
SDCard_deInit();// unmount SD for reloading IOS
USBDevice_deInit();// unmount USB for reloading IOS
/* Load Custom IOS */
if(Settings.cios == ios222 && preloaded_ios != 222) {
if(Settings.cios == ios222 && IOS_GetVersion() != 222) {
SDCard_deInit();// unmount SD for reloading IOS
USBDevice_deInit();// unmount USB for reloading IOS
ret2 = IOS_ReloadIOS(222);
load_ehc_module();
if (ret2 < 0) {
Settings.cios = ios249;
ret2 = IOS_ReloadIOS(249);
}
} else if(preloaded_ios != 249) {
SDCard_Init(); // now mount SD:/
USBDevice_Init(); // and mount USB:/
} else if(Settings.cios == ios249 && IOS_GetVersion() != 249) {
SDCard_deInit();// unmount SD for reloading IOS
USBDevice_deInit();// unmount USB for reloading IOS
ret2 = IOS_ReloadIOS(249);
if(ret2 < 0) {
Settings.cios = ios222;
ret2 = IOS_ReloadIOS(222);
load_ehc_module();
}
SDCard_Init(); // now mount SD:/
USBDevice_Init(); // and mount USB:/
}
if (ret2 < 0) {
printf("ERROR: cIOS could not be loaded!");
sleep(5);
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
}
SDCard_Init(); // now mount SD:/
USBDevice_Init(); // and mount USB:/
Sys_Init();
/** PAD_Init has to be before InitVideo don't move that **/
@ -138,3 +137,4 @@ main(int argc, char *argv[])
MainMenu(MENU_CHECK);
return 0;
}

9
source/menu.cpp
View File

@ -1613,8 +1613,6 @@ static int MenuCheck()
if(wbfsinit < 0) {
sleep(1);
USBDevice_Init();
SDCard_Init();
}
//Spieleliste laden
@ -1623,6 +1621,13 @@ static int MenuCheck()
if(menu == MENU_NONE)
menu = MENU_DISCLIST;
//for HDDs with issues
if(wbfsinit < 0) {
sleep(1);
USBDevice_Init();
SDCard_Init();
}
return menu;
}

12
source/settings/Settings.cpp
View File

@ -13,7 +13,7 @@
#include "menu.h"
#include "filelist.h"
#include "sys.h"
#define MAXOPTIONS 12
#define MAXOPTIONS 13
/*** Extern functions ***/
extern void ResumeGui();
@ -480,6 +480,7 @@ int MenuSettings()
options2.SetName(8, "%s",tr("Rumble"));
options2.SetName(10, "%s",tr("Titles from XML"));
options2.SetName(11, "%s",tr("Screensaver"));
options2.SetName(12, "%s",tr("USB FAT Partition"));
for(int i = 0; i <= MAXOPTIONS; i++) options2.SetValue(i, NULL);
optionBrowser2.SetScrollbar(1);
w.Append(&optionBrowser2);
@ -524,6 +525,8 @@ int MenuSettings()
options2.SetValue(0, "%s", tr("Default"));
else
options2.SetValue(0, "%s", languagefile);
if(Settings.usbfatsupport >= settings_off_on_max)
Settings.usbfatsupport = 0; //RUMBLE
if (Settings.sinfo == GameID) options2.SetValue(1,"%s",tr("Game ID"));
else if (Settings.sinfo == GameRegion) options2.SetValue(1,"%s",tr("Game Region"));
@ -569,6 +572,9 @@ int MenuSettings()
else if (Settings.screensaver == 5) options2.SetValue(11,"30 min");
else if (Settings.screensaver == 6) options2.SetValue(11,"1 hour");
if (Settings.usbfatsupport == on) options2.SetValue(12,"Support ON");
else if (Settings.usbfatsupport == off) options2.SetValue(12,"Support OFF");
if(backBtn.GetState() == STATE_CLICKED)
{
backBtn.ResetState();
@ -679,7 +685,9 @@ int MenuSettings()
case 11:
Settings.screensaver++;
break;
case 12:
Settings.usbfatsupport++;
break;
}
}
optionBrowser2.SetEffect(EFFECT_FADE, -20);

9
source/settings/cfg.c
View File

@ -326,6 +326,7 @@ void Global_Default(void)
Settings.volume = 80;
Settings.sfxvolume = 80;
Settings.tooltips = TooltipsOn;
Settings.usbfatsupport = 1;
char * empty = "";
snprintf(Settings.unlockCode, sizeof(Settings.unlockCode), empty);
Settings.godmode = 1;
@ -988,6 +989,13 @@ void global_cfg_set(char *name, char *val)
}
return;
}
else if (strcmp(name, "usbfatsupport") == 0) {
int i;
if (sscanf(val, "%d", &i) == 1) {
Settings.usbfatsupport = i;
}
return;
}
else if (strcmp(name, "titlesOverride") == 0) {
int i;
if (sscanf(val, "%d", &i) == 1) {
@ -1257,6 +1265,7 @@ bool cfg_save_global()// save global settings
fprintf(f, "patchcountrystrings = %d\n ", Settings.patchcountrystrings);
fprintf(f, "screensaver = %d\n ", Settings.screensaver);
fprintf(f, "error002 = %d\n ", Settings.error002);
fprintf(f, "usbfatsupport = %d\n ", Settings.usbfatsupport);
fclose(f);
return true;
}

3
source/settings/cfg.h
View File

@ -233,7 +233,7 @@ enum {
enum {
anti=2,
};
enum {
GameID,
@ -354,6 +354,7 @@ struct SSettings {
char Cheatcodespath[100];
char TxtCheatcodespath[100];
short error002;
short usbfatsupport;
int titlesOverride; // db_titles
char db_url[200];
char db_language[100];