Remove redudant dependencies on opl´s frontend.

Remove hack code inside of sound.c
ps2homebrew · Jan 1, 2025 · f3792c7 · f3792c7
1 parent 9334294
commit f3792c7
Show file tree

Hide file tree

Showing 37 changed files with 41 additions and 135 deletions.
diff --git a/include/appsupport.h b/include/appsupport.h
@@ -1,8 +1,6 @@
 #ifndef __APP_SUPPORT_H
 #define __APP_SUPPORT_H
 
-#include "include/iosupport.h"
-
 #define APP_MODE_UPDATE_DELAY 240
 
 #define APP_TITLE_MAX 128

diff --git a/include/bdmsupport.h b/include/bdmsupport.h
@@ -1,12 +1,8 @@
 #ifndef __BDM_SUPPORT_H
 #define __BDM_SUPPORT_H
 
-#include "include/iosupport.h"
-
 #define BDM_MODE_UPDATE_DELAY MENU_UPD_DELAY_GENREFRESH
 
-#include "include/mcemu.h"
-
 typedef struct
 {
     int active;       /* Activation flag */

diff --git a/include/cheatman.h b/include/cheatman.h
@@ -25,15 +25,6 @@
 #ifndef _CHEATMAN_H_
 #define _CHEATMAN_H_
 
-#include "opl.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <malloc.h>
-#include <ctype.h>
-#include <string.h>
-
 #define CHEAT_VERSION "0.5.3.7"
 
 #define MAX_HOOKS      5

diff --git a/include/dia.h b/include/dia.h
@@ -1,8 +1,6 @@
 #ifndef __DIA_H
 #define __DIA_H
 
-#include "include/opl.h"
-
 // UI dialog item definition
 typedef enum {
     // terminates the definition of dialog. Mandatory

diff --git a/include/ethsupport.h b/include/ethsupport.h
@@ -1,11 +1,8 @@
 #ifndef __ETH_SUPPORT_H
 #define __ETH_SUPPORT_H
 
-#include "include/iosupport.h"
-
 #define ETH_MODE_UPDATE_DELAY 300
 
-#include "include/mcemu.h"
 typedef struct
 {
     int active;       /* Activation flag */

diff --git a/include/gui.h b/include/gui.h
@@ -1,12 +1,6 @@
 #ifndef __GUI_H
 #define __GUI_H
 
-#include "include/iosupport.h"
-#include "include/opl.h"
-#include "include/texcache.h"
-#include "include/dialogs.h"
-#include "include/menu.h"
-
 typedef enum {
     // Informs gui that init is over and main gui can be rendered
     GUI_INIT_DONE = 1,

diff --git a/include/hdd.h b/include/hdd.h
@@ -1,6 +1,8 @@
 #ifndef __HDD_H
 #define __HDD_H
 
+#include <hdd-ioctl.h>
+
 typedef struct
 {
     u32 start;  // Sector address

diff --git a/include/hddsupport.h b/include/hddsupport.h
@@ -1,7 +1,6 @@
 #ifndef __HDD_SUPPORT_H
 #define __HDD_SUPPORT_H
 
-#include "include/iosupport.h"
 #include "include/hdd.h"
 
 #define HDD_MODE_UPDATE_DELAY MENU_UPD_DELAY_NOUPDATE
@@ -38,7 +37,6 @@ typedef struct
     u32 length;
 } apa_subs;
 
-#include "include/mcemu.h"
 typedef struct
 {
     int active;                 /* Activation flag */

diff --git a/include/menu.h b/include/menu.h
@@ -1,7 +1,6 @@
 #ifndef __MENUSYS_H
 #define __MENUSYS_H
 
-#include "include/config.h"
 #include "include/dia.h"
 
 typedef struct menu_hint_item

diff --git a/include/opl.h b/include/opl.h
@@ -1,49 +1,25 @@
 #ifndef __OPL_H
 #define __OPL_H
 
-#include <tamtypes.h>
 #include <kernel.h>
 #include <sifrpc.h>
-#include <hdd-ioctl.h>
-#include "opl-hdd-ioctl.h"
-#include <iopcontrol.h>
-#include <iopheap.h>
 #include <string.h>
-#include <loadfile.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <dirent.h>
 #include <errno.h>
 #include <limits.h>
-#include <sbv_patches.h>
-#include <libcdvd.h>
-#include <libpad.h>
-#include <libmc.h>
-#include <netman.h>
-#include <ps2ips.h>
-#include <debug.h>
 #include <gsKit.h>
-#include <dmaKit.h>
 #include <malloc.h>
 #include <math.h>
-#include <osd_config.h>
-#include <libpwroff.h>
-#include <usbhdfsd-common.h>
-#include <smod.h>
-#include <smem.h>
-#include <debug.h>
-#include <ps2smb.h>
-#include "config.h"
 
+#include "include/iosupport.h"
+#include "include/mcemu.h"
 #include "include/hddsupport.h"
 #include "include/supportbase.h"
 #include "include/bdmsupport.h"
-
-// Last Played Auto Start
-#include <time.h>
-
 // Master password for disabling the parental lock.
 #define OPL_PARENTAL_LOCK_MASTER_PASS "989765"
 

diff --git a/include/system.h b/include/system.h
@@ -1,8 +1,6 @@
 #ifndef __SYSTEM_H
 #define __SYSTEM_H
 
-#include "include/mcemu.h"
-
 #define SYS_LOAD_MC_MODULES   0x01
 #define SYS_LOAD_USB_MODULES  0x02
 #define SYS_LOAD_ISOFS_MODULE 0x04

diff --git a/include/texcache.h b/include/texcache.h
@@ -1,8 +1,6 @@
 #ifndef __TEX_CACHE_H
 #define __TEX_CACHE_H
 
-#include "include/iosupport.h"
-
 /// A single cache entry...
 typedef struct
 {

diff --git a/src/OSDHistory.c b/src/OSDHistory.c
@@ -7,17 +7,10 @@
 
     However, OPL does not need any of that, so it can be made simpler.    */
 
-#include <errno.h>
-#include <kernel.h>
+
 #include <libcdvd.h>
-#include <limits.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/fcntl.h>
-#include <sys/unistd.h>
 #include <libmc.h>
-#include <libmc-common.h>
+#include "include/opl.h"
 
 #include "include/util.h"
 #include "include/OSDHistory.h"

diff --git a/src/appsupport.c b/src/appsupport.c
@@ -7,10 +7,6 @@
 #include "include/ioman.h"
 #include "include/util.h"
 
-#include "include/bdmsupport.h"
-#include "include/ethsupport.h"
-#include "include/hddsupport.h"
-
 #include <elf-loader.h>
 
 static int appForceUpdate = 1;

diff --git a/src/atlas.c b/src/atlas.c
@@ -4,8 +4,6 @@
   Review OpenUsbLd README & LICENSE files for further details.
 */
 
-#include <stdio.h>
-#include <malloc.h>
 #include "include/opl.h"
 #include "include/atlas.h"
 #include "include/renderman.h"

diff --git a/src/bdmsupport.c b/src/bdmsupport.c
@@ -1,8 +1,6 @@
 #include "include/opl.h"
 #include "include/lang.h"
 #include "include/gui.h"
-#include "include/supportbase.h"
-#include "include/bdmsupport.h"
 #include "include/util.h"
 #include "include/themes.h"
 #include "include/textures.h"
@@ -14,6 +12,7 @@
 #include "modules/iopcore/common/cdvd_config.h"
 
 #include <usbhdfsd-common.h>
+#include "opl-hdd-ioctl.h"
 
 #include <ps2sdkapi.h>
 #define NEWLIB_PORT_AWARE

diff --git a/src/cheatman.c b/src/cheatman.c
@@ -22,9 +22,10 @@
  * $Id$
  */
 
-#include <unistd.h>
+#include "include/opl.h"
 #include "include/cheatman.h"
 #include "include/ioman.h"
+#include <ctype.h>
 
 static int gEnableCheat; // Enables PS2RD Cheat Engine - 0 for Off, 1 for On
 static int gCheatMode;   // Cheat Mode - 0 Enable all cheats, 1 Cheats selected by user

diff --git a/src/config.c b/src/config.c
@@ -8,7 +8,6 @@
 #include "include/util.h"
 #include "include/ioman.h"
 #include "include/sound.h"
-#include <string.h>
 
 // FIXME: We should not need this function.
 //        Use newlib's 'stat' to get GMT time.

diff --git a/src/dia.c b/src/dia.c
@@ -5,7 +5,7 @@
 */
 
 #include "include/opl.h"
-#include "include/dia.h"
+#include "include/dialogs.h"
 #include "include/gui.h"
 #include "include/lang.h"
 #include "include/pad.h"

diff --git a/src/dialogs.c b/src/dialogs.c
@@ -1,12 +1,9 @@
-#include "include/dialogs.h"
 #include "include/opl.h"
-#include "include/dia.h"
+#include "include/dialogs.h"
 #include "include/lang.h"
 #include "include/gui.h"
 #include "include/guigame.h"
 
-#include <stdio.h>
-
 // Network Config Menu
 struct UIItem diaNetConfig[] = {
     {UI_LABEL, 0, 1, 1, -1, 0, 0, {.label = {NULL, _STR_NETCONFIG}}},

diff --git a/src/ethsupport.c b/src/ethsupport.c
@@ -1,8 +1,7 @@
 #include "include/opl.h"
+#include "include/mcemu.h"
 #include "include/lang.h"
 #include "include/gui.h"
-#include "include/supportbase.h"
-#include "include/ethsupport.h"
 #include "include/util.h"
 #include "include/renderman.h"
 #include "include/themes.h"
@@ -12,9 +11,13 @@
 #include "include/extern_irx.h"
 #include "include/cheatman.h"
 #include "modules/iopcore/common/cdvd_config.h"
+#include "include/ethsupport.h"
 
 #define NEWLIB_PORT_AWARE
 #include <fileXio_rpc.h> // fileXioDevctl(ethBase, SMB_***)
+#include <netman.h>
+#include <ps2ips.h>
+#include <ps2smb.h>
 
 #include "include/nbns.h"
 #include "httpclient.h"

diff --git a/src/gui.c b/src/gui.c
@@ -5,9 +5,9 @@
  */
 
 #include "include/opl.h"
+#include "include/dialogs.h"
 #include "include/gui.h"
 #include "include/renderman.h"
-#include "include/menu.h"
 #include "include/fntsys.h"
 #include "include/ioman.h"
 #include "include/lang.h"
@@ -23,8 +23,6 @@
 #include "include/sound.h"
 #include "include/guigame.h"
 
-#include <limits.h>
-#include <stdlib.h>
 #include <libvux.h>
 
 // Last Played Auto Start

diff --git a/src/guigame.c b/src/guigame.c
@@ -4,12 +4,11 @@
 */
 
 #include "include/opl.h"
+#include "include/dialogs.h"
 #include "include/gui.h"
 #include "include/ioman.h"
 #include "include/lang.h"
 #include "include/pad.h"
-#include "include/config.h"
-#include "include/ethsupport.h"
 #include "include/compatupd.h"
 #include "include/cheatman.h"
 #include "include/system.h"

diff --git a/src/hdd.c b/src/hdd.c
@@ -1,10 +1,12 @@
+
 #include "include/opl.h"
 #include "include/hdd.h"
 #include "include/ioman.h"
 #include "include/hddsupport.h"
 
 #define NEWLIB_PORT_AWARE
 #include <fileXio_rpc.h>
+#include "opl-hdd-ioctl.h"
 
 typedef struct // size = 1024
 {

diff --git a/src/hddsupport.c b/src/hddsupport.c
@@ -1,9 +1,7 @@
-#include "sys/fcntl.h"
 #include "include/opl.h"
 #include "include/lang.h"
 #include "include/gui.h"
 #include "include/supportbase.h"
-#include "include/hddsupport.h"
 #include "include/util.h"
 #include "include/themes.h"
 #include "include/textures.h"
@@ -18,6 +16,8 @@
 #include <io_common.h>   // FIO_MT_RDWR
 
 #include <hdd-ioctl.h>
+#include <libcdvd-common.h>
+#include "opl-hdd-ioctl.h"
 
 #define OPL_HDD_MODE_PS2LOGO_OFFSET 0x17F8
 

diff --git a/src/ioman.c b/src/ioman.c
@@ -1,10 +1,5 @@
 #include "include/opl.h"
 #include "include/ioman.h"
-#include <kernel.h>
-#include <string.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <unistd.h>
 #ifdef __EESIO_DEBUG
 #include <sio.h>
 #endif

diff --git a/src/menu.c b/src/menu.c
@@ -5,8 +5,7 @@
 */
 
 #include "include/opl.h"
-#include "include/menu.h"
-#include "include/iosupport.h"
+#include "include/dia.h"
 #include "include/renderman.h"
 #include "include/fntsys.h"
 #include "include/lang.h"