*Sorting files a bit

Makefile

@@ -17,7 +17,9 @@ include $(DEVKITPPC)/wii_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	boot
 BUILD		:=	build
-SOURCES		:=	source source/libwiigui source/images source/fonts source/sounds source/libwbfs source/unzip source/language
+SOURCES		:=	source source/libwiigui source/images source/fonts source/sounds \
+				source/libwbfs source/unzip source/language source/mload source/patches \
+				source/usbloader source/xml source/network source/settings source/prompts
 INCLUDES	:=	source
 SVNDEV		:=	-D'SVN_REV="$(shell svnversion -n ..)"'
 

gui.pnps

@@ -1 +1 @@
-<pd><ViewState><e p="gui" x="true"></e><e p="gui\source\language" x="false"></e><e p="gui\source" x="true"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\libwbfs" x="false"></e><e p="gui\source\libwiigui" x="true"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\unzip" x="false"></e></ViewState></pd>
+<pd><ViewState><e p="gui" x="true"></e><e p="gui\source\language" x="false"></e><e p="gui\source\mload" x="false"></e><e p="gui\source\settings" x="false"></e><e p="gui\source" x="true"></e><e p="gui\source\images" x="false"></e><e p="gui\source\libwbfs" x="false"></e><e p="gui\source\libwiigui" x="true"></e><e p="gui\source\patches" x="false"></e><e p="gui\source\prompts" x="false"></e><e p="gui\source\network" x="false"></e><e p="gui\source\unzip" x="false"></e><e p="gui\source\usbloader" x="false"></e><e p="gui\source\xml" x="false"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\sounds" x="false"></e></ViewState></pd>

source/FreeTypeGX.cpp

@@ -23,9 +23,10 @@
 #include "FreeTypeGX.h"
 #include "language/CH2Unicode.h"
 #include "language/GB2Unicode.h"
-#include "language/sjis2unicode.h"
+#include "language/sjis2unicode.h"
+#include "settings/cfg.h"
+
 #include "main.h"
-#include "cfg.h"
 
 /*! \struct ftgxCharData_
  *

source/fatmounter.c

@@ -7,7 +7,8 @@
 #include <ogc/system.h>
 #include <ogc/usbstorage.h>
 #include <sdcard/wiisd_io.h>
-#include "usbstorage.h"
+
+#include "usbloader/usbstorage.h"
 
 //these are the only stable and speed is good
 #define CACHE 32

source/language/language.c

@@ -5,7 +5,10 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <ogcsys.h>
+
+#include "usbloader/disc.h"
 #include "language.h"
+
 static char *cfg_name, *cfg_val;
 
 char* strcopy(char *dest, char *src, int size)

source/language/language.h

@@ -1,5 +1,4 @@
 #include <gctypes.h>
-#include "disc.h"
 
 #ifndef _LANGUAGE_H_
 #define _LANGUAGE_H_

source/libwiigui/gui_customoptionbrowser.cpp

@@ -9,7 +9,7 @@
 #include "gui.h"
 #include "../wpad.h"
 #include "../main.h"
-#include "../cfg.h"
+#include "../settings/cfg.h"
 #include "gui_customoptionbrowser.h"
 
 #include <unistd.h>

source/libwiigui/gui_gamebrowser.cpp

@@ -11,7 +11,7 @@
 
 #include <unistd.h>
 #include "gui_gamebrowser.h"
-#include "../cfg.h"
+#include "../settings/cfg.h"
 #include "../main.h"
 
 #include <string.h>

source/libwiigui/gui_gamebrowser.h

@@ -2,7 +2,7 @@
 #define _GUIGAMEBROWSER_H_
 
 #include "gui.h"
-#include "../disc.h"
+#include "../usbloader/disc.h"
 
 class GuiGameBrowser : public GuiElement
 {

source/libwiigui/gui_gamecarousel.cpp

@@ -11,7 +11,7 @@
 
 #include <unistd.h>
 #include "gui_gamecarousel.h"
-#include "../cfg.h"
+#include "../settings/cfg.h"
 #include "../main.h"
 
 #include <string.h>

source/libwiigui/gui_gamecarousel.h

@@ -2,7 +2,7 @@
 #define _GUIGAMECAROUSEL_H_
 
 #include "gui.h"
-#include "../disc.h"
+#include "../usbloader/disc.h"
 
 class GuiGameCarousel : public GuiElement
 {

source/libwiigui/gui_gamegrid.cpp

@@ -11,7 +11,7 @@
 
 #include <unistd.h>
 #include "gui_gamegrid.h"
-#include "../cfg.h"
+#include "../settings/cfg.h"
 
 #include <string.h>
 #include <math.h>

source/libwiigui/gui_gamegrid.h

@@ -2,7 +2,7 @@
 #define _GUIGAMEGRID_H_
 
 #include "gui.h"
-#include "../disc.h"
+#include "../usbloader/disc.h"
 
 class GuiGameGrid : public GuiElement
 {

source/libwiigui/gui_keyboard.cpp

@@ -10,7 +10,7 @@
 
 #include "gui.h"
 #include "../main.h"
-#include "../cfg.h"
+#include "../settings/cfg.h"
 #include <stdio.h>
 #include <string.h>
 /**

source/main.cpp

@@ -16,6 +16,13 @@
 #include <unistd.h>
 #include <wiiuse/wpad.h>
 
+#include "usbloader/wbfs.h"
+#include "usbloader/video2.h"
+#include "network/http.h"
+#include "network/dns.h"
+#include "settings/cfg.h"
+#include "language/language.h"
+#include "mload/mload.h"
 #include "FreeTypeGX.h"
 #include "video.h"
 #include "audio.h"
@@ -23,18 +30,10 @@
 #include "input.h"
 #include "filelist.h"
 #include "main.h"
-#include "http.h"
-#include "dns.h"
 #include "fatmounter.h"
-#include "disc.h"
-#include "wbfs.h"
 #include "sys.h"
-#include "video2.h"
 #include "wpad.h"
-#include "cfg.h"
-#include "language/language.h"
 #include "fat.h"
-#include "mload.h"
 
 
 /* Constants */
@@ -45,25 +44,6 @@
 
 FreeTypeGX *fontSystem=0;
 FreeTypeGX *fontClock=0;
-bool netcheck = false;
-
-
-/*Networking - Forsaekn*/
-int Net_Init(char *ip){
-
-	s32 res;
-    while ((res = net_init()) == -EAGAIN)
-	{
-		usleep(100 * 1000); //100ms
-	}
-
-    if (if_config(ip, NULL, NULL, true) < 0) {
-		printf("      Error reading IP address, exiting");
-		usleep(1000 * 1000 * 1); //1 sec
-		return FALSE;
-	}
-	return TRUE;
-}
 
 int
 main(int argc, char *argv[])
@@ -100,6 +80,7 @@ main(int argc, char *argv[])
     /* Load Custom IOS */
     if(Settings.cios == ios222) {
         ret2 = IOS_ReloadIOS(222);
+        load_ehc_module();
         if (ret2 < 0) {
             Settings.cios = ios249;
             ret2 = IOS_ReloadIOS(249);
@@ -113,8 +94,6 @@ main(int argc, char *argv[])
 		SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
 	}
 
-    if(Settings.cios == ios222) load_ehc_module();
-
     SDCard_Init(); // now mount SD:/
     USBDevice_Init(); // and mount USB:/
 

source/main.h

@@ -14,7 +14,5 @@ extern struct SSettings Settings;
 
 void DefaultSettings();
 extern FreeTypeGX *fontSystem;
-extern bool netcheck;
-extern int Net_Init(char *ip);
 
 #endif

source/menu.cpp

@@ -16,24 +16,25 @@
 #include "libwiigui/gui_gamegrid.h"
 #include "libwiigui/gui_gamecarousel.h"
 #include "libwiigui/gui_gamebrowser.h"
+#include "usbloader/usbstorage.h"
+#include "usbloader/wbfs.h"
+#include "usbloader/disc.h"
+#include "usbloader/getentries.h"
+#include "language/language.h"
+#include "settings/Settings.h"
+#include "prompts/PromptWindows.h"
+#include "prompts/gameinfo.h"
+#include "mload/mload.h"
+#include "patches/patchcode.h"
+#include "network/updater.h"
 #include "menu.h"
 #include "audio.h"
 #include "input.h"
-#include "wbfs.h"
-#include "disc.h"
 #include "filelist.h"
 #include "sys.h"
-#include "patchcode.h"
 #include "wpad.h"
-#include "language/language.h"
 #include "listfiles.h"
 #include "fatmounter.h"
-#include "getentries.h"
-#include "PromptWindows.h"
-#include "Settings.h"
-#include "gameinfo.h"
-#include "mload.h"
-#include "usbstorage.h"
 
 //#include "xml.h" /* XML - Lustar*/
 
@@ -147,6 +148,7 @@ UpdateGUI (void *arg)
 					Menu_DrawRectangle(0,0,screenwidth,screenheight,(GXColor){0, 0, 0, a},1);
 					Menu_Render();
 				}
+				mainWindow->RemoveAll();
 				ShutoffRumble();
 				return 0;
 			}
@@ -1814,7 +1816,6 @@ int MainMenu(int menu)
 				break;
 		}
 	}
-
 	ExitGUIThreads();
 
     bgMusic->Stop();

source/menu.h

@@ -9,9 +9,9 @@
 #ifndef _MENU_H_
 #define _MENU_H_
 
-#include <ogcsys.h>
+#include <ogcsys.h>
+#include "settings/cfg.h"
 #include "main.h"
-#include "cfg.h"
 
 void InitGUIThreads(void);
 void ExitGUIThreads(void);

source/network/http.h

@@ -2,14 +2,9 @@
 #define _HTTP_H_
 
 #include <errno.h>
-#include <network.h>
 #include <ogcsys.h>
-#include <string.h>
-
-#include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <errno.h>
 
 #ifdef __cplusplus
 extern "C"

source/network/updater.c

@@ -6,6 +6,24 @@
 #include "http.h"
 
 static s32 connection;
+bool netcheck = false;
+
+/*Networking - Forsaekn*/
+int Net_Init(char *ip){
+
+	s32 res;
+    while ((res = net_init()) == -EAGAIN)
+	{
+		usleep(100 * 1000); //100ms
+	}
+
+    if (if_config(ip, NULL, NULL, true) < 0) {
+		printf("      Error reading IP address, exiting");
+		usleep(1000 * 1000 * 1); //1 sec
+		return FALSE;
+	}
+	return TRUE;
+}
 
 s32 network_request(const char * request)
 {

source/network/updater.h

@@ -6,6 +6,9 @@ extern "C"
 {
 #endif
 
+extern bool netcheck;
+
+int Net_Init(char *ip);
 s32 network_request(const char * request);
 s32 network_read(void *buf, u32 len);
 s32 downloadrev(const char * url);

source/patches/fst.c

@@ -27,11 +27,12 @@
 #include <malloc.h>
 #include <sys/unistd.h>
 #include <sdcard/wiisd_io.h>
+
+#include "settings/cfg.h"
 #include "ogc/ipc.h"
 #include "fst.h"
 #include "dvd_broadway.h"
 #include "wpad.h"
-#include "cfg.h"
 #include "fatmounter.h"
 
 extern struct SSettings Settings;

source/patches/patchcode.c

@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gccore.h>
+#include "usbloader/apploader.h"
 #include "geckomenu.h"
-#include "apploader.h"
 #include "patchcode.h"
 #include "fwrite_patch.h"
 

source/prompts/PromptWindows.cpp

@@ -5,23 +5,23 @@
 #include <string.h>
 #include <dirent.h>
 
+#include "usbloader/wbfs.h"
+#include "usbloader/wdvd.h"
+#include "usbloader/partition.h"
+#include "usbloader/usbstorage.h"
+#include "usbloader/getentries.h"
+#include "language/language.h"
+#include "libwiigui/gui.h"
+#include "libwiigui/gui_diskcover.h"
+#include "network/updater.h"
+#include "network/http.h"
+#include "mload/mload.h"
+#include "fatmounter.h"
+#include "listfiles.h"
 #include "menu.h"
 #include "filelist.h"
 #include "sys.h"
 #include "wpad.h"
-#include "wbfs.h"
-#include "wdvd.h"
-#include "language/language.h"
-#include "libwiigui/gui.h"
-#include "libwiigui/gui_diskcover.h"
-#include "fatmounter.h"
-#include "listfiles.h"
-#include "updater.h"
-#include "http.h"
-#include "partition.h"
-#include "usbstorage.h"
-#include "getentries.h"
-#include "mload.h"
 
 /*** Variables that are also used extern ***/
 int cntMissFiles = 0;

source/prompts/PromptWindows.h

@@ -8,7 +8,7 @@
 #ifndef _PROMPTWINDOWS_H_
 #define _PROMPTWINDOWS_H_
 
-#include "partition.h"
+#include "usbloader/partition.h"
 
 void WindowCredits();
 int OnScreenKeyboard(char * var, u32 maxlen, int min);

source/prompts/gameinfo.cpp

@@ -5,20 +5,18 @@
 #include <string.h>
 #include <dirent.h>
 
-
-#include "gameinfo.h"
-
+#include "usbloader/wbfs.h"
+#include "language/language.h"
+#include "libwiigui/gui.h"
+#include "../xml/xml.h"
 #include "menu.h"
 #include "filelist.h"
 #include "sys.h"
 #include "wpad.h"
-#include "wbfs.h"
-#include "language/language.h"
-#include "libwiigui/gui.h"
 #include "fatmounter.h"
 #include "listfiles.h"
+#include "gameinfo.h"
 
-#include "xml.h"
 
 /*** Extern variables ***/
 extern GuiWindow * mainWindow;

source/settings/Settings.cpp

@@ -1,17 +1,17 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "menu.h"
-#include "filelist.h"
-#include "sys.h"
-#include "wbfs.h"
+#include "usbloader/wbfs.h"
+#include "usbloader/getentries.h"
 #include "language/language.h"
 #include "libwiigui/gui.h"
 #include "libwiigui/gui_customoptionbrowser.h"
+#include "prompts/PromptWindows.h"
+#include "settings/SettingsPrompts.h"
 #include "fatmounter.h"
-#include "PromptWindows.h"
-#include "getentries.h"
-#include "SettingsPrompts.h"
+#include "menu.h"
+#include "filelist.h"
+#include "sys.h"
 
 #define MAXOPTIONS 11
 
@@ -960,7 +960,7 @@ int MenuSettings()
                                             if (Settings.godmode == 0) {
                                                 WindowPrompt(LANGUAGE.CorrectPassword,LANGUAGE.InstallRenameandDeleteareunlocked,LANGUAGE.ok,0,0,0);
                                                 Settings.godmode = 1;
-                                                __Menu_GetEntries();
+                                                //__Menu_GetEntries();
                                                 menu = MENU_DISCLIST;
                                             }
                                         } else {
@@ -972,7 +972,7 @@ int MenuSettings()
                                     if(choice == 1) {
                                         WindowPrompt(LANGUAGE.ConsoleLocked,LANGUAGE.USBLoaderisprotected,LANGUAGE.ok,0,0,0);
                                         Settings.godmode = 0;
-                                        __Menu_GetEntries();
+                                        //__Menu_GetEntries();
                                         menu = MENU_DISCLIST;
                                     }
                                 }
@@ -1906,7 +1906,7 @@ int GameSettings(struct discHdr * header)
 					LANGUAGE.ok,0,0,0);
 				}
 				else {
-					__Menu_GetEntries();
+					//__Menu_GetEntries();
 					WindowPrompt(
 					LANGUAGE.Successfullydeleted,
 					gameName,

source/settings/SettingsPrompts.cpp

@@ -2,16 +2,16 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "filelist.h"
-#include "sys.h"
 #include "language/language.h"
+#include "prompts/PromptWindows.h"
 #include "libwiigui/gui.h"
 #include "libwiigui/gui_customoptionbrowser.h"
+#include "settings/cfg.h"
 #include "listfiles.h"
-#include "cfg.h"
 #include "main.h"
-#include "PromptWindows.h"
 #include "fatmounter.h"
+#include "filelist.h"
+#include "sys.h"
 
 
 /*** Extern variables ***/

source/settings/cfg.c

@@ -6,9 +6,11 @@
 #include <ctype.h>
 #include <ogcsys.h>
 #include <mxml.h>
-#include "cfg.h"
+
 #include "language/language.h"
-#include "xml.h" /* XML - Lustar*/
+#include "xml/xml.h" /* XML - Lustar*/
+#include "cfg.h"
+
 
 
 struct SSettings Settings;
@@ -1604,7 +1606,7 @@ void CFG_Load(void)
 	cfg_load_game_num();
 
 	if (Settings.titlesOverride==1)CFG_LoadXml();
-	
+
 	Global_Default(); //global default depends on theme information
 	CFG_LoadGlobal();
 

source/settings/cfg.h

@@ -2,13 +2,14 @@
 #define _CFG_H_
 
 #include <gctypes.h>
-#include "disc.h"
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
+#include "usbloader/disc.h"
+
 #define CFG_HOME_REBOOT 0
 #define CFG_HOME_EXIT   1
 

source/sys.cpp

@@ -2,17 +2,17 @@
 #include <ogcsys.h>
 #include <unistd.h>
 
-#include "sys.h"
-#include "wpad.h"
-#include "wdvd.h"
-#include "usbstorage.h"
-#include "disc.h"
-#include "wbfs.h"
+#include "usbloader/wdvd.h"
+#include "usbloader/usbstorage.h"
+#include "usbloader/disc.h"
+#include "usbloader/wbfs.h"
+#include "mload/mload.h"
 #include "video.h"
 #include "audio.h"
 #include "menu.h"
 #include "fatmounter.h"
-#include "mload.h"
+#include "sys.h"
+#include "wpad.h"
 
 /* Constants */
 #define CERTS_LEN	0x280

source/usbloader/apploader.c

@@ -1,13 +1,13 @@
 #include <stdio.h>
 #include <ogcsys.h>
 #include <string.h>
-
+
+#include "patches/patchcode.h"
+#include "patches/kenobiwii.h" /*FISHEARS*/
 #include "apploader.h"
 #include "wdvd.h"
 #include "wpad.h"
-#include "patchcode.h"
 #include "disc.h"
-#include "kenobiwii.h" /*FISHEARS*/
 
 /*KENOBI! - FISHEARS*/
 extern const unsigned char kenobiwii[];

source/usbloader/disc.c

@@ -5,12 +5,11 @@
 #include <ogc/lwp_watchdog.h>
 #include <wiiuse/wpad.h>
 
-
+#include "patches/fst.h"
 #include "apploader.h"
 #include "disc.h"
 #include "video.h"
 #include "wdvd.h"
-#include "fst.h"
 
 /* Constants */
 #define PTABLE_OFFSET	0x40000
@@ -289,7 +288,7 @@ s32 Disc_BootPartition(u64 offset, u8 videoselected, u8 cheat, u8 vipatch, u8 pa
     WPAD_Disconnect(0);
     WPAD_Shutdown();
 
-    WDVD_Close();
+    WDVD_Close();
 
 	/* Shutdown IOS subsystems */
  	SYS_ResetSystem(SYS_SHUTDOWN, 0, 0);

source/usbloader/getentries.cpp

@@ -1,7 +1,7 @@
 #include <string.h>
 
-#include "wbfs.h"
-#include "cfg.h"
+#include "settings/cfg.h"
+#include "usbloader/wbfs.h"
 #include "main.h"
 
 
@@ -58,7 +58,7 @@ s32 __Menu_EntryCmpCount(const void *a, const void *b)
  * Get Gamelist
  ***************************************************************************/
 
-s32 __Menu_GetEntries(void)
+int __Menu_GetEntries(void)
 {
 	struct discHdr *buffer = NULL;
 	struct discHdr *buffer2 = NULL;

source/usbloader/getentries.h

@@ -8,6 +8,6 @@
 #ifndef _GETENTRIES_H_
 #define _GETENTRIES_H_
 
-s32 __Menu_GetEntries(void);
+int __Menu_GetEntries(void);
 
 #endif

source/video.cpp

@@ -17,7 +17,7 @@
 #include "input.h"
 #include "libwiigui/gui.h"
 
-#include "cfg.h"
+#include "settings/cfg.h"
 
 #define DEFAULT_FIFO_SIZE 256 * 1024
 static unsigned int *xfb[2] = { NULL, NULL }; // Double buffered

source/xml/xml.c

@@ -5,8 +5,8 @@ Load game information from XML - Lustar
 */
 
 #include <mxml.h>
-#include "cfg.h"
-#include "xml.h"
+#include "settings/cfg.h"
+#include "xml/xml.h"
 #include "unzip/unzip.h"