Merge branch 'end-of-2022' into 2023-07-16

citronalco · Sep 27, 2023 · d77fd6f · d77fd6f
2 parents 7dfa725 + 8fee742
commit d77fd6f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
@@ -10,8 +10,12 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/ps2homebrew/ps2homebrew:main
+    container: redsonbr/ps2dev:latest
     steps:
+    - name: Install dependencies
+      run: |
+        apk add build-base git zip gawk python3 py3-pip bash py3-yaml
+
     - name: git checkout
       uses: actions/checkout@v3
 
@@ -53,8 +57,11 @@ jobs:
         igs: [IGS=0, IGS=1]
         t10k: [DTL_T10000=0, DTL_T10000=1]
     runs-on: ubuntu-latest
-    container: ghcr.io/ps2homebrew/ps2homebrew:main
+    container: ps2dev/ps2dev:latest
     steps:
+    - name: Install dependencies
+      run: apk add build-base git zip gawk python3 py3-pip bash py3-yaml
+
     - name: git checkout
       uses: actions/checkout@v3
 
@@ -82,8 +89,12 @@ jobs:
 
   build-lang:
     runs-on: ubuntu-latest
-    container: ghcr.io/ps2homebrew/ps2homebrew:main
+    container: redsonbr/ps2dev:latest
     steps:
+    - name: Install dependencies
+      run: |
+        apk add build-base git zip gawk python3 py3-pip bash py3-yaml
+
     - name: git checkout
       uses: actions/checkout@v3
 
@@ -111,8 +122,11 @@ jobs:
       matrix:
         debug: [debug, iopcore_debug, ingame_debug, deci2_debug, eesio_debug]
     runs-on: ubuntu-latest
-    container: ghcr.io/ps2homebrew/ps2homebrew:main
+    container: redsonbr/ps2dev:latest
     steps:
+    - name: Install dependencies
+      run: apk add build-base git zip gawk python3 py3-pip bash py3-yaml
+
     - name: git checkout
       uses: actions/checkout@v3
 

diff --git a/elfldr/elfldr.c b/elfldr/elfldr.c
@@ -19,6 +19,12 @@
 #define ELF_MAGIC   0x464c457f
 #define ELF_PT_LOAD 1
 
+// This function is defined as weak in ps2sdkc, so how
+// we are not using time zone, so we can safe some KB
+void _ps2sdk_timezone_update() {}
+
+DISABLE_PATCHED_FUNCTIONS();      // Disable the patched functionalities
+DISABLE_EXTRA_TIMERS_FUNCTIONS(); // Disable the extra functionalities for timers
 
 //------------------------------
 typedef struct

diff --git a/src/dialogs.c b/src/dialogs.c
@@ -905,7 +905,6 @@ struct UIItem diaAbout[] = {
     {UI_BREAK},
 
     {UI_SPACER},
-    {UI_LABEL, 0, 1, 1, -1, 0, 15, {.label = {"hominem.te.esse - ifcaro - izdubar - jimmikaelkael - KrahJohlito", -1}}},
     {UI_BREAK},
 
     {UI_SPACER},

diff --git a/src/gui.c b/src/gui.c
@@ -527,12 +527,12 @@ void guiShowConfig()
         diaGetInt(diaConfig, CFG_HDDMODE, &gHDDStartMode);
         diaGetInt(diaConfig, CFG_ETHMODE, &gETHStartMode);
         diaGetInt(diaConfig, CFG_APPMODE, &gAPPStartMode);
-        diaGetInt(diaConfig, CFG_BDMCACHE, &bdmCacheSize);
-        diaGetInt(diaConfig, CFG_HDDCACHE, &hddCacheSize);
-        diaGetInt(diaConfig, CFG_SMBCACHE, &smbCacheSize);
         //START of OPL_DB tweaks
         diaGetInt(diaConfig, CFG_ELMMODE, &gELMStartMode);
         //END of OPL_DB tweaks
+        diaGetInt(diaConfig, CFG_BDMCACHE, &bdmCacheSize);
+        diaGetInt(diaConfig, CFG_HDDCACHE, &hddCacheSize);
+        diaGetInt(diaConfig, CFG_SMBCACHE, &smbCacheSize);
 
         if (ret == BLOCKDEVICE_BUTTON)
             guiShowBlockDeviceConfig();

diff --git a/src/opl.c b/src/opl.c
@@ -1074,12 +1074,12 @@ static void _saveConfig()
         configSetInt(configOPL, CONFIG_OPL_HDD_MODE, gHDDStartMode);
         configSetInt(configOPL, CONFIG_OPL_ETH_MODE, gETHStartMode);
         configSetInt(configOPL, CONFIG_OPL_APP_MODE, gAPPStartMode);
-        configSetInt(configOPL, CONFIG_OPL_BDM_CACHE, bdmCacheSize);
-        configSetInt(configOPL, CONFIG_OPL_HDD_CACHE, hddCacheSize);
-        configSetInt(configOPL, CONFIG_OPL_SMB_CACHE, smbCacheSize);
         //START of OPL_DB tweaks
         configSetInt(configOPL, CONFIG_OPL_ELM_MODE, gELMStartMode);
         //END of OPL_DB tweaks
+        configSetInt(configOPL, CONFIG_OPL_BDM_CACHE, bdmCacheSize);
+        configSetInt(configOPL, CONFIG_OPL_HDD_CACHE, hddCacheSize);
+        configSetInt(configOPL, CONFIG_OPL_SMB_CACHE, smbCacheSize);
         configSetInt(configOPL, CONFIG_OPL_ENABLE_ILINK, gEnableILK);
         configSetInt(configOPL, CONFIG_OPL_ENABLE_MX4SIO, gEnableMX4SIO);
         configSetInt(configOPL, CONFIG_OPL_SFX, gEnableSFX);