*Reverting the USB FAT Option (was a bad idea, going to search for a better solution)

This commit is contained in:
dimok321 2009-07-05 23:50:55 +00:00
parent 7b2454befd
commit e9385e9448
23 changed files with 42 additions and 109 deletions

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ msgstr ""
msgid "USB Device not found"
msgstr ""
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr ""

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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."

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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é"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ msgstr "ツールヒント"
msgid "USB Device not found"
msgstr "USBデバイスを検出できませんでした"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loaderは保護されています"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ msgstr "Tooltips"
msgid "USB Device not found"
msgstr "USB 장치가 없습니다."
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB 로더 GX 잠김 상태"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ msgstr "Подсказки"
msgid "USB Device not found"
msgstr "USB устройство не найдено"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX заблокирован"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ msgstr "工具提示"
msgid "USB Device not found"
msgstr "找不到 USB 设备"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX 被锁定"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ msgstr "工具提示"
msgid "USB Device not found"
msgstr "找不到 USB 裝置"
msgid "USB FAT Partition"
msgstr ""
msgid "USB Loader GX is protected"
msgstr "USB Loader GX 被鎖定"

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-06 00:43+0200\n"
"POT-Creation-Date: 2009-07-06 01:48+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
@ -651,9 +651,6 @@ 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"

View File

@ -7,9 +7,6 @@
#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
@ -17,8 +14,6 @@ extern struct SSettings Settings;
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
@ -34,8 +29,6 @@ int USBDevice_Init()
void USBDevice_deInit()
{
if(!Settings.usbfatsupport)
return;
//closing all open Files write back the cache and then shutdown em!
fatUnmount("USB:/");
}

View File

@ -13,7 +13,7 @@
#include "menu.h"
#include "filelist.h"
#include "sys.h"
#define MAXOPTIONS 13
#define MAXOPTIONS 12
/*** Extern functions ***/
extern void ResumeGui();
@ -480,7 +480,6 @@ 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);
@ -525,8 +524,6 @@ 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"));
@ -572,9 +569,6 @@ 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();
@ -685,9 +679,7 @@ int MenuSettings()
case 11:
Settings.screensaver++;
break;
case 12:
Settings.usbfatsupport++;
break;
}
}
optionBrowser2.SetEffect(EFFECT_FADE, -20);

View File

@ -326,7 +326,6 @@ 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;
@ -989,13 +988,6 @@ 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) {
@ -1265,7 +1257,6 @@ 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;
}

View File

@ -354,7 +354,6 @@ struct SSettings {
char Cheatcodespath[100];
char TxtCheatcodespath[100];
short error002;
short usbfatsupport;
int titlesOverride; // db_titles
char db_url[200];
char db_language[100];

View File

@ -114,15 +114,6 @@ err:
}
return -1;
}
void USBStorage_Deinit(void)
{
/* Close USB device */
if (fd > 0) {
IOS_Close(fd);
fd = -1;
}
}
/** Hermes **/
@ -137,7 +128,28 @@ s32 USBStorage_Watchdog(u32 on_off)
}
return IPC_ENOENT;
}
}
s32 USBStorage_Umount(void)
{
if (fd >= 0) {
s32 ret;
ret = IOS_IoctlvFormat(hid, fd, USB_IOCTL_UMS_UNMOUNT, ":");
return ret;
}
return IPC_ENOENT;
}
void USBStorage_Deinit(void)
{
USBStorage_Umount();
/* Close USB device */
if (fd > 0) {
IOS_Close(fd);
fd = -1;
}
}
s32 USBStorage_ReadSectors(u32 sector, u32 numSectors, void *buffer)
{