FORCED: Overwriting Tuna with local state

Author: NathanNeurotic

installer/Makefile

@@ -61,8 +61,8 @@ EE_GPVAL = -G8192
 
 # CFLAGS for EE compilation
 # -Os for size optimization, -mgpopt for GP optimization
-# Added -Wall for all warnings, -Wno-string-plus-int to suppress a common GCCism warning
-EE_CFLAGS += -Os -mgpopt $(EE_GPVAL) -Wall -Wno-string-plus-int
+# Removed -Wno-string-plus-int as it's not recognized by the ps2dev ee-gcc
+EE_CFLAGS += -Os -mgpopt $(EE_GPVAL) -Wall
 
 # Conditional compilation for exFAT support
 ifeq ($(EXFAT), 1)

installer/main.c

@@ -1,68 +1,61 @@
 #include <iopheap.h>
 #include <kernel.h>
-#include <libcdvd.h>    // For sceCd* functions if used (e.g. in system.c)
-#include <libmc.h>      // For mc* functions (e.g. in system.c)
-#include <fileXio_rpc.h>// For fileXioDevctl, etc. (used in system.c)
-#include <hdd-ioctl.h>  // For HDDCTL_DEV9_SHUTDOWN (used here)
-#include <loadfile.h>   // For LoadExecPS2, SifLoadModule (if used directly, often in iop.c)
-#include <malloc.h>     // For memalign (used in system.c)
-#include <sbv_patches.h>// For sbv_patch* (used in iop.c)
-#include <sifcmd.h>     // For SifInitRpc, SifExitRpc, etc.
+#include <libcdvd.h>
+#include <libmc.h>
+#include <fileXio_rpc.h>
+#include <hdd-ioctl.h>
+#include <loadfile.h>
+#include <malloc.h>
+#include <sbv_patches.h>
+#include <sifcmd.h>
 #include <sifrpc.h>
-#include <stdio.h>      // For sprintf, printf (if DEBUG_PRINTF uses sio_printf, this might not be strictly needed for that)
-#include <string.h>     // For strcpy, strcmp, etc.
-#include <wchar.h>      // If any wide char functions were used by UI/Font (not directly in main.c usually)
+#include <stdio.h> // For general C functions like sprintf, if not for sio_printf
+#include <string.h>
+#include <wchar.h>
 
-#include <libgs.h>      // For GS_BGCOLOUR and graphics init/deinit if used directly here
+#include <libgs.h> 
+#include <sio.h>       // <<< ADDED: For sio_init, even if DEBUG_TTY_FEEDBACK is off in main.h for DEBUG_PRINTF
 
 // FMCB Project Specific Includes
-#include "main.h"       // Contains MainMenuEvents enum, extern g_Port/g_Slot, FMCB_INSTALLER_VERSION etc.
-#include "iop.h"        // For IopInitStart, IopDeinit, IOP_MOD_SET_MAIN
-#include "pad.h"        // For PadInitPads, PadDeinitPads (if not handled in UI)
-#include "graphics.h"   // For graphics functions (RedrawLoadingScreen, etc.)
-#include "font.h"       // For font handling (if used directly here)
-
-// #include "libsecr.h"   // libsecr functions are usually wrapped in system.c
-// #include "mctools_rpc.h"// MCTools RPC functions are usually wrapped in system.c
-#include "system.h"     // For GetBootDeviceID, GetPs2Type, HDDCheckStatus, UpdateRegionalPaths, StartWorkerThread, StopWorkerThread, IsHDDBootingEnabled etc.
-// #include "ReqSpaceCalc.h"// If used directly here
-#include "UI.h"         // For InitializeUI, DeinitializeUI, DisplayErrorMessage, etc.
-#include "menu.h"       // For MainMenu() and menu_opentuna_install() declarations
+#include "main.h"      
+#include "iop.h"       
+#include "pad.h"       
+#include "graphics.h"  
+#include "font.h"      
+
+#include "system.h"    
+#include "UI.h"        
+#include "menu.h"      
 
 // --- Global Variable Definitions ---
-// These are declared extern in main.h and used by other modules like menu_opentuna.c
-int g_Port = 0;             // Default MC port (mc0)
-int g_Slot = 0;             // Default MC slot (slot 0) - PS2 only has one slot per port controller
-int IsHDDUnitConnected = 0; // Tracks HDD status
+int g_Port = 0;            
+int g_Slot = 0;            
+int IsHDDUnitConnected = 0; 
 
-// Semaphores (defined here as they are fundamental to main's operation)
+// Semaphores
 int VBlankStartSema;
 int InstallLockSema; 
 
 // --- Static Function Implementations ---
 
-// VBlank Handler (from original main.c)
 static int VBlankStartHandler(int cause)
 {
     ee_sema_t sema_status; 
     iReferSemaStatus(VBlankStartSema, &sema_status);
     if (sema_status.count < sema_status.max_count) {
         iSignalSema(VBlankStartSema);
     }
-    ExitHandler(); // From PS2SDK kernel.h
+    ExitHandler(); 
     return 0;
 }
 
-// Deinitialization services (from original main.c)
 static void DeinitServices(void)
 {
     DisableIntc(kINTC_VBLANK_START);
     RemoveIntcHandler(kINTC_VBLANK_START, 0); 
     DeleteSema(VBlankStartSema);
     DeleteSema(InstallLockSema);
-
-    IopDeinit(); // From iop.c
-    // PadDeinitPads(); // This is called within DeinitializeUI() in UI.c
+    IopDeinit(); 
 }
 
 // --- Main Application Entry Point ---
@@ -72,10 +65,12 @@ int main(int argc, char *argv[])
     int result_generic; 
     unsigned int FrameNum;
     ee_sema_t sema_config; 
-    int current_event = MENU_EVENT_NONE; // Variable to hold event from MainMenu or submenus
+    int current_event = MENU_EVENT_NONE; 
 
+    // sio_init is called unconditionally, so <sio.h> must be included.
+    // The DEBUG_PRINTF macro in main.h will handle whether sio_printf actually outputs.
     sio_init(38400, 0, 0, 0, 0); 
-    DEBUG_PRINTF("FMCB Installer v%s starting...\n", FMCB_INSTALLER_VERSION);
+    DEBUG_PRINTF("FMCB Installer v%s starting...\n", FMCB_INSTALLER_VERSION); // FMCB_INSTALLER_VERSION is now from Makefile
 
     for (result_generic = 0; result_generic < argc; result_generic++) { 
         DEBUG_PRINTF("argv[%d] = %s\n", result_generic, argv[result_generic]); 
@@ -92,12 +87,14 @@ int main(int argc, char *argv[])
 
     sema_config.init_count = 0;
     sema_config.max_count = 1;
-    sema_config.attr = EA_THPRI; 
+    sema_config.attr = 0; // <<< MODIFIED: Changed EA_THPRI to 0 for default attributes
     sema_config.option = 0;
     VBlankStartSema = CreateSema(&sema_config);
 
     sema_config.init_count = 1; 
     sema_config.max_count = 1;
+    // Attribute for InstallLockSema can also be 0, or EA_THPRI if needed and available
+    sema_config.attr = 0; // Ensuring consistency, was likely 0 in original too.
     InstallLockSema = CreateSema(&sema_config);
 
     AddIntcHandler(kINTC_VBLANK_START, VBlankStartHandler, 0);
@@ -133,22 +130,19 @@ int main(int argc, char *argv[])
         }
     }
 
-    // Main application loop
-    current_event = MENU_EVENT_RETURN_TO_MAIN; // Start by entering the main menu
+    current_event = MENU_EVENT_RETURN_TO_MAIN; 
 
     while(current_event != EVENT_EXIT) { 
         DEBUG_PRINTF("main.c: Top of event loop, current_event = %d\n", current_event);
         switch (current_event) {
             case MENU_EVENT_RETURN_TO_MAIN:
                 DEBUG_PRINTF("main.c: Calling MainMenu()...\n");
-                current_event = MainMenu(); // MainMenu now returns an int event
+                current_event = MainMenu(); 
                 DEBUG_PRINTF("main.c: MainMenu() returned event: %d\n", current_event);
                 break;
 
             case MENU_EVENT_GO_TO_OPENTUNA_INSTALL:
                 DEBUG_PRINTF("main.c: Calling menu_opentuna_install()...\n");
-                // Parameters for menu_opentuna_install are (int connecting_event, int current_selection)
-                // We pass the event that led here, and 0 for default selection in the OpenTuna menu.
                 current_event = menu_opentuna_install(MENU_EVENT_GO_TO_OPENTUNA_INSTALL, 0); 
                 DEBUG_PRINTF("main.c: menu_opentuna_install() returned event: %d\n", current_event);
                 break;
@@ -160,17 +154,15 @@ int main(int argc, char *argv[])
 
             case EVENT_EXIT: 
                 DEBUG_PRINTF("main.c: EVENT_EXIT received. Loop will terminate.\n");
-                // The while loop condition (current_event != EVENT_EXIT) will handle actual termination.
                 break;
 
             default:
                 DEBUG_PRINTF("main.c: Unhandled event %d received. Defaulting to MainMenu.\n", current_event);
                 current_event = MENU_EVENT_RETURN_TO_MAIN; 
                 break;
         }
-    } // End of while(current_event != EVENT_EXIT)
+    } 
 
-    // Shutdown sequence
     DEBUG_PRINTF("Exiting application (final event was %d)...\n", current_event);
     StopWorkerThread(); 
 

installer/main.h

@@ -1,13 +1,13 @@
 #ifndef __MAIN_H__
 #define __MAIN_H__
 
-// FMCB Installer version. Increment as needed.
-#define FMCB_INSTALLER_VERSION "1.001-MOD-OpenTuna" // Example version increment
+// FMCB Installer version will be defined by the Makefile via CFLAGS
+// #define FMCB_INSTALLER_VERSION "1.001-MOD-OpenTuna" // REMOVED THIS LINE
 
 /* Debugging TTY output - comment out to disable */
 // #define DEBUG_TTY_FEEDBACK 
 #ifdef DEBUG_TTY_FEEDBACK
-#include <sio.h>
+#include <sio.h> // For sio_printf
 #define DEBUG_PRINTF(args...) sio_printf(args)
 #else
 #define DEBUG_PRINTF(args...) (void)0