Merge pull request #690 from uyjulian/apa_pfs_opt_custom

fjtrujy · web-flow · commit a9097f6e2b6a · 2024-12-04T21:05:22.000+01:00
Allow apa-opt.h and pfs-opt.h filename to be configurable
diff --git a/iop/hdd/apa/src/hdd.c b/iop/hdd/apa/src/hdd.c
@@ -29,7 +29,6 @@
 #include <iomanX.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include <libapa.h>
 #include "hdd.h"
 #include "hdd_fio.h"
diff --git a/iop/hdd/apa/src/hdd_fio.c b/iop/hdd/apa/src/hdd_fio.c
@@ -26,7 +26,6 @@
 #include <thsemap.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include <libapa.h>
 #include "hdd.h"
 #include "hdd_fio.h"
diff --git a/iop/hdd/fsck/src/bitmap_fsck.c b/iop/hdd/fsck/src/bitmap_fsck.c
@@ -14,7 +14,6 @@
 #include <iomanX.h>
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 #include "bitmap_fsck.h"
 
diff --git a/iop/hdd/fsck/src/fsck.c b/iop/hdd/fsck/src/fsck.c
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <sysclib.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 #include "bitmap_fsck.h"
 #include "misc_fsck.h"
diff --git a/iop/hdd/fsck/src/misc_fsck.c b/iop/hdd/fsck/src/misc_fsck.c
@@ -11,7 +11,6 @@
 #include <thbase.h>
 #include <thevent.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 #include "misc_fsck.h"
 
diff --git a/iop/hdd/fssk/src/fssk.c b/iop/hdd/fssk/src/fssk.c
@@ -19,7 +19,6 @@
 #include <irx.h>
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 #include "fssk-ioctl.h"
 #include "fssk.h"
diff --git a/iop/hdd/fssk/src/misc_fssk.c b/iop/hdd/fssk/src/misc_fssk.c
@@ -11,7 +11,6 @@
 #include <thbase.h>
 #include <thevent.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 #include "misc_fssk.h"
 
diff --git a/iop/hdd/hdck/src/hdck.c b/iop/hdd/hdck/src/hdck.c
@@ -17,7 +17,6 @@
 #include <irx.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 
 #include "misc_hdck.h"
diff --git a/iop/hdd/hdck/src/misc_hdck.c b/iop/hdd/hdck/src/misc_hdck.c
@@ -10,7 +10,6 @@
 
 #include <atad.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 #include "misc_hdck.h"
 
diff --git a/iop/hdd/hdsk/src/hdl.c b/iop/hdd/hdsk/src/hdl.c
@@ -21,7 +21,6 @@
 #include <irx.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 #include "hdsk.h"
 
diff --git a/iop/hdd/hdsk/src/hdsk.c b/iop/hdd/hdsk/src/hdsk.c
@@ -20,7 +20,6 @@
 #include <irx.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 #include "hdsk-devctl.h"
 #include "hdsk.h"
diff --git a/iop/hdd/hdsk/src/misc_hdsk.c b/iop/hdd/hdsk/src/misc_hdsk.c
@@ -12,7 +12,6 @@
 #include <thbase.h>
 #include <thevent.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 #include "misc_hdsk.h"
 
diff --git a/iop/hdd/hdsk/src/sim.c b/iop/hdd/hdsk/src/sim.c
@@ -12,7 +12,6 @@
 #include <sysclib.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 #include "hdsk-devctl.h"
 #include "hdsk.h"
diff --git a/iop/hdd/libapa/include/libapa.h b/iop/hdd/libapa/include/libapa.h
@@ -14,6 +14,12 @@
 #include <types.h>
 #include <hdd-ioctl.h>
 
+#ifndef APA_OPT_H
+#define APA_OPT_H "apa-opt.h"
+#endif
+
+#include APA_OPT_H
+
 // Sectors for this and that ;)
 #define APA_SECTOR_MBR 0
 #ifdef APA_SUPPORT_GPT
diff --git a/iop/hdd/libapa/src/apa.c b/iop/hdd/libapa/src/apa.c
@@ -23,7 +23,6 @@
 #endif
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 #include "hdd_blkio.h"
 
diff --git a/iop/hdd/libapa/src/cache.c b/iop/hdd/libapa/src/cache.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 
 //  Globals
diff --git a/iop/hdd/libapa/src/free.c b/iop/hdd/libapa/src/free.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 
 static void apaCalculateFreeSpace(u32 *free, u32 sectors)
diff --git a/iop/hdd/libapa/src/journal.c b/iop/hdd/libapa/src/journal.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 #include "hdd_blkio.h"
 
diff --git a/iop/hdd/libapa/src/misc.c b/iop/hdd/libapa/src/misc.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 
 void *apaAllocMem(int size)
diff --git a/iop/hdd/libapa/src/password.c b/iop/hdd/libapa/src/password.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <hdd-ioctl.h>
 
-#include "apa-opt.h"
 #include "libapa.h"
 
 int apaPassCmp(const char *pw1, const char *pw2)
diff --git a/iop/hdd/libpfs/include/libpfs.h b/iop/hdd/libpfs/include/libpfs.h
@@ -14,6 +14,12 @@
 
 #include <types.h>
 
+#ifndef PFS_OPT_H
+#define PFS_OPT_H "pfs-opt.h"
+#endif
+
+#include PFS_OPT_H
+
 // General constants
 #define PFS_BLOCKSIZE 		0x2000
 #define PFS_SUPER_MAGIC		0x50465300	// "PFS\0" aka Playstation Filesystem
diff --git a/iop/hdd/libpfs/src/bitmap.c b/iop/hdd/libpfs/src/bitmap.c
@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <limits.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 extern u32 pfsMetaSize;
diff --git a/iop/hdd/libpfs/src/block.c b/iop/hdd/libpfs/src/block.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #endif
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 // Returns the next block descriptor inode
diff --git a/iop/hdd/libpfs/src/blockWrite.c b/iop/hdd/libpfs/src/blockWrite.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #endif
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 // Attempt to expand the block segment 'blockpos' by 'count' blocks
diff --git a/iop/hdd/libpfs/src/cache.c b/iop/hdd/libpfs/src/cache.c
@@ -19,7 +19,6 @@
 #endif
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 extern u32 pfsBlockSize;
diff --git a/iop/hdd/libpfs/src/dir.c b/iop/hdd/libpfs/src/dir.c
@@ -19,7 +19,6 @@
 #endif
 #include <iomanX.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 extern u32 pfsMetaSize;
diff --git a/iop/hdd/libpfs/src/inode.c b/iop/hdd/libpfs/src/inode.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #endif
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 extern u32 pfsMetaSize;
diff --git a/iop/hdd/libpfs/src/journal.c b/iop/hdd/libpfs/src/journal.c
@@ -18,7 +18,6 @@
 #endif
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 extern u32 pfsBlockSize;
diff --git a/iop/hdd/libpfs/src/misc.c b/iop/hdd/libpfs/src/misc.c
@@ -27,7 +27,6 @@
 #include <ctype.h>
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/iop/hdd/libpfs/src/super.c b/iop/hdd/libpfs/src/super.c
@@ -19,7 +19,6 @@
 #endif
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 u32 pfsBlockSize = 1;// block size scale in sectors (512). Note that 0 = 1x
diff --git a/iop/hdd/libpfs/src/superWrite.c b/iop/hdd/libpfs/src/superWrite.c
@@ -19,7 +19,6 @@
 #endif
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 
 extern u32 pfsBlockSize;
diff --git a/iop/hdd/pfs/src/pfs.c b/iop/hdd/pfs/src/pfs.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <thsemap.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 #include "pfs.h"
 #include "pfs_fio.h"
diff --git a/iop/hdd/pfs/src/pfs_fio.c b/iop/hdd/pfs/src/pfs_fio.c
@@ -21,7 +21,6 @@
 #include <thsemap.h>
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 #include "pfs.h"
 #include "pfs_fio.h"
diff --git a/iop/hdd/pfs/src/pfs_fioctl.c b/iop/hdd/pfs/src/pfs_fioctl.c
@@ -21,7 +21,6 @@
 #include <thsemap.h>
 #include <hdd-ioctl.h>
 
-#include "pfs-opt.h"
 #include "libpfs.h"
 #include "pfs.h"
 #include "pfs_fio.h"
