Author: Extrems

Makefile.menu2_gc

@@ -5,11 +5,11 @@ CXX		=powerpc-eabi-g++
 AS		=powerpc-eabi-as
 
 CFLAGS  = -g -Ofast -mogc -Wall $(INCLUDE) \
-	  -fno-exceptions -Wno-unused-parameter -pipe \
+	  -fno-exceptions -flto=jobserver -Wno-unused-parameter -pipe \
 	  -DUSE_GUI -DNGC -DGLN64_GX -DUSE_TLB_CACHE -DARAM_BLOCKCACHE -DARAM_TLBCACHE \
 	  -DUSE_RECOMP_CACHE -DPPC_DYNAREC -DFASTMEM -DRELEASE -DMENU_V2
 
-LDFLAGS	= -mogc -Wl,-Map,$(notdir $@).map -Wl,--cref
+LDFLAGS	=$(CFLAGS) -Wl,-Map,$(notdir $@).map -Wl,--cref
 
 INCLUDE = -I$(DEVKITPRO)/libogc/include
 LIBPATHS = -L$(DEVKITPRO)/libogc/lib/cube

Makefile.menu2_wii

@@ -5,11 +5,11 @@ CXX		=powerpc-eabi-g++
 AS		=powerpc-eabi-as
 
 CFLAGS  = -g -Ofast -mrvl -Wall $(INCLUDE) \
-	  -fno-exceptions -Wno-unused-parameter -pipe \
+	  -fno-exceptions -flto=jobserver -Wno-unused-parameter -pipe \
 	  -DUSE_GUI -DWII -DGLN64_GX -DUSE_EXPANSION \
 	  -DUSE_RECOMP_CACHE -DPPC_DYNAREC -DFASTMEM -DRELEASE -DMENU_V2
 
-LDFLAGS	= -mrvl -Wl,-Map,$(notdir $@).map -Wl,--cref
+LDFLAGS	=$(CFLAGS) -Wl,-Map,$(notdir $@).map -Wl,--cref
 
 INCLUDE = -I$(DEVKITPRO)/libogc/include
 LIBPATHS = -L$(DEVKITPRO)/libogc/lib/wii

fileBrowser/fileBrowser-libfat.c

@@ -63,6 +63,14 @@ static char sdNeedsUnmount  = 0;
 static char usbMounted = 0;
 static char usbNeedsUnmount = 0;
 
+fileBrowser_file topLevel_libfat_Auto =
+	{ "\0",
+	  0,
+	  0,
+	  0,
+	  FILE_BROWSER_ATTR_DIR
+	 };
+
 fileBrowser_file topLevel_libfat_Default =
 	{ "sd:/wii64/roms", // file name
 	  0, // sector

fileBrowser/fileBrowser-libfat.h

@@ -26,6 +26,7 @@
 #ifndef FILE_BROWSER_LIBFAT_H
 #define FILE_BROWSER_LIBFAT_H
 
+extern fileBrowser_file topLevel_libfat_Auto;
 extern fileBrowser_file topLevel_libfat_Default;  //GC SD Slots & Wii Front SD Slot
 extern fileBrowser_file topLevel_libfat_USB;      //Wii only, USB
 extern fileBrowser_file saveDir_libfat_Default;   //GC SD Slots & Wii Front SD Slot

libgui/InputManager.cpp

@@ -25,6 +25,7 @@
 
 
 void ShutdownWii();
+void ScanPADSandReset(u32 dummy);
 
 
 
@@ -43,7 +44,7 @@ Input::Input()
 	SYS_SetPowerCallback(ShutdownWii);
 
 #endif
-//	VIDEO_SetPostRetraceCallback (PAD_ScanPads);
+	VIDEO_SetPostRetraceCallback (ScanPADSandReset);
 }
 
 Input::~Input()
@@ -57,7 +58,6 @@ void Input::refreshInput()
 	PAD_Clamp(gcPad);
 #ifdef HW_RVL
 	if(wpadNeedScan){ WPAD_ScanPads(); wpadNeedScan = 0; }
-	WPAD_ScanPads();
 	wiiPad = WPAD_Data(0);
 #endif
 }

main/main_gc-menu2.cpp

@@ -115,8 +115,8 @@ extern timers Timers;
 char menuActive;
        char saveEnabled;
        char creditsScrolling;
-       char padNeedScan = 1;
-       char wpadNeedScan = 1;
+       char padNeedScan;
+       char wpadNeedScan;
        char shutdown = 0;
 	   char nativeSaveDevice;
 	   char saveStateDevice;
@@ -136,6 +136,7 @@ char smbUserName[CONFIG_STRING_SIZE];
 char smbPassWord[CONFIG_STRING_SIZE];
 char smbShareName[CONFIG_STRING_SIZE];
 char smbIpAddr[CONFIG_STRING_SIZE];
+char romPath[CONFIG_STRING_SIZE];
 
 static struct {
 	char* key;
@@ -172,7 +173,8 @@ static struct {
   { "smbusername", smbUserName, CONFIG_STRING_TYPE, CONFIG_STRING_TYPE },
   { "smbpassword", smbPassWord, CONFIG_STRING_TYPE, CONFIG_STRING_TYPE },
   { "smbsharename", smbShareName, CONFIG_STRING_TYPE, CONFIG_STRING_TYPE },
-  { "smbipaddr", smbIpAddr, CONFIG_STRING_TYPE, CONFIG_STRING_TYPE }
+  { "smbipaddr", smbIpAddr, CONFIG_STRING_TYPE, CONFIG_STRING_TYPE },
+  { "rompath", romPath, CONFIG_STRING_TYPE, CONFIG_STRING_TYPE }
 };
 void handleConfigPair(char* kv);
 void readConfig(FILE* f);
@@ -338,7 +340,6 @@ int main(int argc, char* argv[]){
 #endif
 
 	MenuContext *menu = new MenuContext(vmode);
-	VIDEO_SetPostRetraceCallback (ScanPADSandReset);
 
 	// Initialize the network if the user has specified something in their SMB settings
 	if(strlen(&smbShareName[0]) && strlen(&smbIpAddr[0])) {
@@ -411,7 +412,6 @@ int loadROM(fileBrowser_file* rom){
 	format_mempacks();
 	reset_flashram();
 	init_eeprom();
-	hasLoadedROM = TRUE;
 #ifndef HW_RVL
 	ARAM_manager_init();
 #endif
@@ -428,6 +428,7 @@ int loadROM(fileBrowser_file* rom){
 	}
 
 	// Init everything for this ROM
+	hasLoadedROM = TRUE;
 	init_memory();
 
 	gfx_set_fb(xfb[0], xfb[1]);

menu/FileBrowserFrame.cpp

@@ -144,7 +144,6 @@ static fileBrowser_file* dir_entries;
 static int				num_entries;
 static int				current_page;
 static int				max_page;
-static char				feedback_string[36];
 
 void fileBrowserFrame_OpenDirectory(fileBrowser_file* dir);
 void fileBrowserFrame_Error(fileBrowser_file* dir, int error_code);
@@ -332,6 +331,7 @@ void fileBrowserFrame_OpenDirectory(fileBrowser_file* dir)
 
 void fileBrowserFrame_Error(fileBrowser_file* dir, int error_code)
 {
+	char feedback_string[256];
 	//disable all buttons
 	for (int i = 0; i < NUM_FRAME_BUTTONS; i++)
 		FRAME_BUTTONS[i].button->setActive(false);
@@ -366,8 +366,8 @@ void fileBrowserFrame_Error(fileBrowser_file* dir, int error_code)
 	FRAME_BUTTONS[2].button->setNextFocus(menu::Focus::DIRECTION_DOWN, NULL);
 	pMenuContext->getFrame(MenuContext::FRAME_FILEBROWSER)->setDefaultFocus(FRAME_BUTTONS[2].button);
 	menu::Focus::getInstance().clearPrimaryFocus();*/
+	pMenuContext->setActiveFrame(MenuContext::FRAME_LOADROM);
 	menu::MessageBox::getInstance().setMessage(feedback_string);
-	pMenuContext->setActiveFrame(MenuContext::FRAME_MAIN);
 }
 
 void fileBrowserFrame_FillPage()
@@ -419,6 +419,7 @@ void Func_SetPlayGame();
 
 void fileBrowserFrame_LoadFile(int i)
 {
+	char feedback_string[256];
 	if(dir_entries[i].attr & FILE_BROWSER_ATTR_DIR){
 		// Here we are 'recursing' into a subdirectory
 		// We have to do a little dance here to avoid a dangling pointer
@@ -469,6 +470,8 @@ void fileBrowserFrame_LoadFile(int i)
 			autoSaveLoaded = NATIVESAVEDEVICE_NONE;
 
 			menu::MessageBox::getInstance().setMessage(RomInfo);
+			pMenuContext->setActiveFrame(MenuContext::FRAME_MAIN);
+			Func_SetPlayGame();
 		}
 		else		// If not.
 		{
@@ -500,8 +503,15 @@ void fileBrowserFrame_LoadFile(int i)
 			FRAME_BUTTONS[i+2].buttonString = FRAME_STRINGS[2];
 		pMenuContext->getFrame(MenuContext::FRAME_FILEBROWSER)->setDefaultFocus(FRAME_BUTTONS[2].button);
 		menu::Focus::getInstance().clearPrimaryFocus();*/
+	}
+}
 
-		pMenuContext->setActiveFrame(MenuContext::FRAME_MAIN);
-		if(hasLoadedROM) Func_SetPlayGame();
+void fileBrowserFrame_AutoLoadFile(char* path)
+{
+	for (int i = 0; i < num_entries; i++) {
+		if (!strcasecmp(dir_entries[i].name, path)) {
+			fileBrowserFrame_LoadFile(i);
+			return;
+		}
 	}
 }

menu/LoadRomFrame.cpp

@@ -114,7 +114,31 @@ LoadRomFrame::~LoadRomFrame()
 }
 
 extern MenuContext *pMenuContext;
+extern char romPath[];
 extern void fileBrowserFrame_OpenDirectory(fileBrowser_file* dir);
+extern void fileBrowserFrame_AutoLoadFile(char* path);
+
+void Func_LoadFromAuto()
+{
+	if (!strlen(&romPath[0])) return;
+	strcpy(topLevel_libfat_Auto.name, &romPath[0]);
+	char *sep = strrchr(topLevel_libfat_Auto.name, '/');
+	if (sep)
+		*sep = '\0';
+
+	// Change all the romFile pointers
+	romFile_topLevel = &topLevel_libfat_Auto;
+	romFile_readDir  = fileBrowser_libfat_readDir;
+	romFile_readFile = fileBrowser_libfatROM_readFile;
+	romFile_seekFile = fileBrowser_libfat_seekFile;
+	romFile_init     = fileBrowser_libfat_init;
+	romFile_deinit   = fileBrowser_libfatROM_deinit;
+	// Make sure the romFile system is ready before we browse the filesystem
+	romFile_init( romFile_topLevel );
+
+	fileBrowserFrame_OpenDirectory(romFile_topLevel);
+	fileBrowserFrame_AutoLoadFile(romPath);
+}
 
 void Func_LoadFromSD()
 {

menu/MenuContext.cpp

@@ -23,6 +23,7 @@
 #include "../libgui/CursorManager.h"
 
 MenuContext *pMenuContext;
+void Func_LoadFromAuto();
 
 MenuContext::MenuContext(GXRModeObj *vmode)
 		: currentActiveFrame(0),
@@ -59,6 +60,7 @@ MenuContext::MenuContext(GXRModeObj *vmode)
 
 	menu::Focus::getInstance().setFocusActive(true);
 	setActiveFrame(FRAME_MAIN);
+	Func_LoadFromAuto();
 }
 
 MenuContext::~MenuContext()

r4300/r4300.c

@@ -1928,6 +1928,6 @@ void cpu_deinit(void){
 		}
 	}
    // tehpola: modified condition from !dynacore && interpcore
-   if (dynacore) free(PC);
+   if (dynacore) { free(PC); PC = NULL; }
 }