add stealth autoboot

fatfs/ff_utf8.c

@@ -86,6 +86,13 @@ FRESULT f_mount_char(FATFS* fs, const char* path, BYTE opt)
 	return f_mount(fs, tmpwchar.u16, opt);
 }
 
+FRESULT f_stat_char(const char* path, FILINFO* fno)
+{
+	if (!char_to_wchar(path))
+		return FR_INVALID_NAME;
+	return f_stat(tmpwchar.u16, fno);
+}
+
 #if !_FS_READONLY
 FRESULT f_mkdir_char(const char* path)
 {

fatfs/ff_utf8.h

@@ -19,6 +19,7 @@ const char *wchar_to_char(const WCHAR *wcs);
 
 FRESULT f_open_char(FIL* fp, const char* path, BYTE mode);
 FRESULT f_mount_char(FATFS* fs, const char* path, BYTE opt);
+FRESULT f_stat_char(const char* path, FILINFO* fno);
 
 #if !_FS_READONLY
 FRESULT f_mkdir_char(const char* path);

loader/include/global.h

@@ -142,10 +142,12 @@ typedef struct
 // FIXME: This return type isn't quite correct...
 const char* const GetRootDevice();
 void RAMInit(void);
-void Initialise(bool autoboot);
+void Initialise(void);
+void InitialiseBg(void);
 void unzip_data(const void *input, const unsigned int input_size, 
 	void **output, unsigned int *output_size);
 
+bool IsStealth(void);
 /**
  * Load the configuration file from the root device.
  * @return True if loaded successfully; false if not.

loader/source/global.c

@@ -175,9 +175,8 @@ static unsigned int font_ttf_size = 0;
  * This also loads the background image.
  * @param autoboot Set if autobooting. (This disables the fade-in.)
  */
-void Initialise(bool autoboot)
+void Initialise(void)
 {
-	int i;
 	AUDIO_Init(NULL);
 	DSP_Init();
 	AUDIO_StopDMA();
@@ -197,18 +196,20 @@ void Initialise(bool autoboot)
 	bg_xScale = 1.0f;
 	bg_xPos = 0;
 
-	if(autoboot == false)
+	gprintf("Initialize Finished\r\n");
+}
+
+void InitialiseBg(void)
+{
+	int i;
+	// Fade background image by incrementing opacity
+	for (i=0; i<255; i +=5)
 	{
-		// Fade background image by incrementing opacity
-		for (i=0; i<255; i +=5)
-		{
-			GRRLIB_DrawImg(bg_xPos, 0, background, 0, bg_xScale, 1,
-				RGBA(255, 255, 255, i));
-			GRRLIB_Render();
-		}
-		ClearScreen();
+		GRRLIB_DrawImg(bg_xPos, 0, background, 0, bg_xScale, 1,
+			RGBA(255, 255, 255, i));
+		GRRLIB_Render();
 	}
-	gprintf("Initialize Finished\r\n");
+	ClearScreen();
 }
 
 static void (*stub)() = (void*)0x80001800;
@@ -305,6 +306,12 @@ void LoaderShutdown()
 	while(1) usleep(20000);
 }
 
+bool IsStealth(void)
+{
+	FILINFO fno;
+	return f_stat_char("/enable_stealth_autoboot.txt", &fno) == FR_OK;
+}
+
 /**
  * Load the configuration file from the root device.
  * @return True if loaded successfully; false if not.

loader/source/main.c

@@ -532,7 +532,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	Initialise(argsboot);
+	Initialise();
 
 	//for BT.c
 	CONF_GetPadDevices((conf_pads*)0x932C0000);
@@ -543,10 +543,7 @@ int main(int argc, char **argv)
 
 	s32 fd;
 
-	// Preparing IOS58 Kernel...
-	if(argsboot == false)
-		ShowMessageScreen("Preparing IOS58 Kernel...");
-
+	//Preparing IOS58 Kernel...
 	//Disables MEMPROT for patches
 	write16(MEM_PROT, 0);
 
@@ -565,6 +562,7 @@ int main(int argc, char **argv)
 	// Load and patch IOS58.
 	if (LoadKernel() < 0)
 	{
+		InitialiseBg();
 		// NOTE: Attempting to initialize controllers here causes a crash.
 		// Hence, we can't wait for the user to press the HOME button, so
 		// we'll just wait for a timeout instead.
@@ -588,10 +586,7 @@ int main(int argc, char **argv)
 	memcpy( (void*)0x939F0348, ESBootPatch, sizeof(ESBootPatch) );
 	DCFlushRange( (void*)0x939F0348, sizeof(ESBootPatch) );
 
-	// Loading IOS58 Kernel...
-	if(argsboot == false)
-		ShowMessageScreen("Loading IOS58 Kernel...");
-
+	//Loading IOS58 Kernel...
 	//libogc still has that, lets close it
 	__ES_Close();
 	fd = IOS_Open( dev_es, 0 );
@@ -604,10 +599,7 @@ int main(int argc, char **argv)
 	//Disables MEMPROT for patches
 	write16(MEM_PROT, 0);
 
-	// Preparing Nintendont Kernel...
-	if(argsboot == false)
-		ShowMessageScreen("Preparing Nintendont Kernel...");
-
+	//Preparing Nintendont Kernel...
 	//inject nintendont thread
 	void *kernel_bin = NULL;
 	unsigned int kernel_bin_size = 0;
@@ -622,9 +614,6 @@ int main(int argc, char **argv)
 	DCFlushRange((void*)0x92FFFE00,kernelboot_bin_size);
 
 	//Loading Nintendont Kernel...
-	if(argsboot == false)
-		ShowMessageScreen("Loading Nintendont Kernel...");
-
 	//close in case this is wii vc
 	__ES_Close();
 	memset( STATUS, 0, 0x20 );
@@ -643,8 +632,6 @@ int main(int argc, char **argv)
 	fd = IOS_Open( dev_es, 0 );
 	IOS_IoctlvAsync(fd, 0x1F, 0, 0, &IOCTL_Buf, NULL, NULL);
 	//Waiting for Nintendont...
-	if(argsboot == false)
-		ShowMessageScreen("Waiting for Nintendont...");
 	while(1)
 	{
 		DCInvalidateRange( STATUS, 0x20 );
@@ -660,10 +647,6 @@ int main(int argc, char **argv)
 	gprintf("Nintendont at your service!\r\n%s\r\n", NIN_GIT_VERSION);
 	KernelLoaded = 1;
 
-	// Checking for storage devices...
-	if(argsboot == false)
-		ShowMessageScreen("Checking storage devices...");
-
 	// Initialize devices.
 	// TODO: Only mount the device Nintendont was launched from
 	// Mount the other device asynchronously.
@@ -686,9 +669,11 @@ int main(int argc, char **argv)
 	// aborting here.
 	if (!devices[DEV_SD] && !devices[DEV_USB])
 	{
-		ClearScreen();
 		gprintf("No FAT device found!\n");
-		PrintFormat(DEFAULT_SIZE, MAROON, MENU_POS_X, 232, "No FAT device found!");
+		InitialiseBg();
+		ShowMessageScreen("Checking storage devices...");
+		PrintFormat(DEFAULT_SIZE, MAROON, MENU_POS_X, MENU_POS_Y + 20*20,
+			"No FAT device found!");
 		ExitToLoader(1);
 	}
 	// Seems like some programs start without any args
@@ -699,12 +684,6 @@ int main(int argc, char **argv)
 	}
 	gprintf("launch_dir = %s\r\n", launch_dir);
 
-	// Initialize controllers.
-	// FIXME: Initialize before storage devices.
-	// Doing that right now causes usbstorage to fail...
-	FPAD_Init();
-	FPAD_Update();
-
 	// Read IPL Font before doing any patches 
 	void *fontbuffer = memalign(32, 0x50000);
 	__SYS_ReadROM((void*)fontbuffer,0x50000,0x1AFF00);
@@ -739,26 +718,38 @@ int main(int argc, char **argv)
 		if (!got_nick)
 			memcpy(slippi_settings->nickname, DEFAULT_NICKNAME, 32);
 
-		// Prevent autobooting if B is pressed
-		int i = 0;
-		while((ncfg->Config & NIN_CFG_AUTO_BOOT) && i < 1000000)
+		if (IsStealth() && ncfg->Config & NIN_CFG_AUTO_BOOT)
+			argsboot = true;
+
+		if (argsboot == false)
 		{
-			if (i == 0)
-			{
-				PrintBuildInfo();
-				PrintFormat(DEFAULT_SIZE, BLACK, 320 - 90, 
-					MENU_POS_Y + 20*10, "B: Cancel Autoboot");
-				GRRLIB_Render();
-				ClearScreen();
-			}
+			InitialiseBg();
 
+			// Initialize controllers.
+			FPAD_Init();
 			FPAD_Update();
-			if (FPAD_Cancel(0))
+
+			// Prevent autobooting if B is pressed
+			int i = 0;
+			while((ncfg->Config & NIN_CFG_AUTO_BOOT) && i < 1000000)
 			{
-				ncfg->Config &= ~NIN_CFG_AUTO_BOOT;
-				break;
-			}
-			i++;
+				if (i == 0)
+				{
+					PrintBuildInfo();
+					PrintFormat(DEFAULT_SIZE, BLACK, 320 - 90, 
+						MENU_POS_Y + 20*10, "B: Cancel Autoboot");
+					GRRLIB_Render();
+					ClearScreen();
+				}
+
+				FPAD_Update();
+				if (FPAD_Cancel(0))
+				{
+					ncfg->Config &= ~NIN_CFG_AUTO_BOOT;
+					break;
+				}
+				i++;
+			}	
 		}
 	}
 

loader/source/menu.c

@@ -1940,7 +1940,7 @@ void ReconfigVideo(GXRModeObj *vidmode)
  */
 void PrintLoadKernelError(LoadKernelError_t iosErr, int err)
 {
-	ClearScreen();
+	InitialiseBg();
 	PrintBuildInfo();
 	PrintFormat(DEFAULT_SIZE, MAROON, MENU_POS_X, MENU_POS_Y + 20*4, "Failed to load IOS58 from NAND:");