move init & some IOP ops to different source file

Author: israpps

.devcontainer/devcontainer.json

@@ -0,0 +1,27 @@
+{
+  "name": "PS2SDK (ghcr)",
+  "image": "ghcr.io/ps2homebrew/ps2homebrew:main",
+  "workspaceFolder": "/project",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/project,type=bind",
+
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "C_Cpp.intelliSenseEngine": "default",
+        "C_Cpp.default.configurationProvider": "ms-vscode.makefile-tools",
+        "C_Cpp.default.includePath": [
+          "/project",
+          "/usr/local/ps2dev/ps2sdk/common/include",
+          "/usr/local/ps2dev/ps2sdk/ee/include",
+          "/usr/local/ps2dev/ps2sdk/iop/include"
+        ]
+      },
+      "extensions": [
+        "ms-vscode.cpptools",
+        "ms-vscode.makefile-tools"
+      ]
+    }
+  },
+
+  "remoteUser": "root"
+}

Makefile

@@ -57,7 +57,7 @@ EE_SRC_DIR = src/
 EE_ASM_DIR = asm/
 
 EE_OBJS = main.o \
-          util.o elf.o timer.o ps2.o ps1.o dvdplayer.o \
+          init.o util.o elf.o timer.o ps2.o ps1.o dvdplayer.o \
           modelname.o libcdvd_add.o OSDHistory.o OSDInit.o OSDConfig.o \
           $(EMBEDDED_STUFF) \
 		      $(IOP_OBJS)

include/common.h

@@ -1,5 +1,9 @@
 #ifndef COMMONDEF
 #define COMMONDEF
+/// common definitions that should not be used outside of main.c
+
+#include "banner.h"
+
 enum
 {
     SOURCE_MC0 = 0,
@@ -142,6 +146,16 @@ char *DEFPATH[] = {
     "mc?:/APPS/ULE.ELF",
 };
 
+typedef struct
+{
+    int SKIPLOGO;
+    char *KEYPATHS[17][3];
+    int DELAY;
+    int OSDHISTORY_READ;
+    int TRAYEJECT;
+    int LOGO_DISP; //0: NO, 1: Only Console info, any other value: YES
+} CONFIG;
+
 #ifndef COMMIT_HASH
 #define COMMIT_HASH "UNKNOWn"
 #endif

include/init.h

@@ -0,0 +1,35 @@
+#ifndef INIT_H
+#define INIT_H
+
+#ifdef UDPTTY
+extern inline void udptty_start();
+#define UDPTTY_STARTUP() udptty_start()
+#else
+#define UDPTTY_STARTUP()
+#endif
+
+#ifdef FILEXIO
+extern inline void load_filexio();
+#define FILEXIO_STARTUP() load_filexio()
+#else
+#define FILEXIO_STARTUP()
+#endif
+
+extern inline void bdm_usb();
+#define BDM_USB_STARTUP() bdm_usb()
+#define SIO2_MC_PAD_STARTUP() iop_init_sio2_related()
+// general init stuff
+
+void init_osd_generic();
+void init_iop_patches();
+void CDVDBootCertify(u8 romver[16]);
+void InitPSX();
+
+// IOP Related stuff
+
+int LoadUSBIRX(void);
+void iop_init_sio2_related();
+#define BGR_BLUE  0xFF0000
+#define BGR_GREEN 0x00FF00
+#define BGR_RED   0x0000FF
+#endif

include/main.h

@@ -30,7 +30,6 @@
 #include "debugprintf.h"
 #include "pad.h"
 #include "util.h"
-#include "common.h"
 
 #include "libcdvd_add.h"
 #include "dvdplayer.h"
@@ -40,8 +39,13 @@
 #include "ps1.h"
 #include "ps2.h"
 #include "modelname.h"
-#include "banner.h"
+#include "init.h"
 
+#ifdef DEBUG
+#define DG(x...) x// DEBUG GUARD, a little macro to isolate code that should be included only if debug enabled
+#else
+#define DG(x...)// DEBUG GUARD, a little macro to isolate code that should be included only if debug enabled
+#endif
 #ifdef PSX
 #include <iopcontrol_special.h>
 #include "psx/plibcdvd_add.h"
@@ -86,13 +90,17 @@ static void InitPSX();
 /// @note only supported by DRAGON Mechacons. function will do nothing on older mechacon
 void PrintTemperature();
 #endif
+
 #ifdef HDD
 int LoadHDDIRX(void);             // Load HDD IRXes
-int LoadFIO(void);                // Load FileXio and it´s dependencies
 int MountParty(const char *path); ///processes strings in the format `hdd0:/$PARTITION:pfs:$PATH_TO_FILE/` to mount partition
 int mnt(const char *path);        ///mount partition specified on path
 #endif
 
+#ifdef FILEXIO
+int LoadIOX(void); // Load FileXio and it´s dependencies
+#endif
+
 #ifdef UDPTTY
 void loadUDPTTY();
 #endif
@@ -120,7 +128,9 @@ int LookForBDMDevice(void);
 
 #ifdef FILEXIO
 #include <fileXio_rpc.h>
-int LoadFIO(void); // Load FileXio and it´s dependencies
+int LoadIOX(void); // Load FileXio and it´s dependencies
 #endif
 
+#define GS_BGCOLOUR(x) *((volatile unsigned long int *)0x120000E0) = x
+
 #endif