mcman: add virtual memory card variant

Author: uyjulian

iop/memorycard/mcman/Makefile

@@ -10,14 +10,25 @@
 
 IOP_INCS += -I$(PS2SDKSRC)/iop/system/sio2man/include
 
-IOP_OBJS = main.o mcdev.o mcsio2.o ps2mc_fio.o ps1mc_fio.o imports.o exports.o
+IOP_OBJS = \
+    main.o \
+    mcdev.o \
+    mciomanx_backing.o \
+    mcsio2.o \
+    ps2mc_fio.o \
+    ps1mc_fio.o \
+    imports.o \
+    exports.o
 
 # Build the newer version of the memory card module?
 MCMAN_BUILDING_XMCMAN ?= 1
 
 # Read from the dev9 external flash ROM instead of the memory card?
 MCMAN_BUILDING_XFROMMAN ?= 0
 
+# Read from a file on the filesystem insead of the memory card?
+MCMAN_BUILDING_VMCMAN ?= 0
+
 ifneq (x$(MCMAN_BUILDING_XMCMAN),x0)
 IOP_CFLAGS += -DBUILDING_XMCMAN
 endif
@@ -27,6 +38,12 @@ IOP_CFLAGS += -DBUILDING_XFROMMAN
 IOP_INCS += -I$(PS2SDKSRC)/iop/dev9/extflash/include
 endif
 
+ifneq (x$(MCMAN_BUILDING_VMCMAN),x0)
+IOP_CFLAGS += -DBUILDING_VMCMAN
+IOP_CFLAGS += -DIOMANX_OLD_NAME_COMPATIBILITY=0
+IOP_CFLAGS += -DIOMANX_OLD_NAME_ADDDELDRV=0
+endif
+
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/iop/Rules.bin.make
 include $(PS2SDKSRC)/iop/Rules.make

iop/memorycard/mcman/src/imports.lst

@@ -10,6 +10,7 @@ I_sio_printf
 sior_IMPORTS_end
 #endif
 
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 #ifndef BUILDING_XFROMMAN
 #ifdef BUILDING_XMCMAN
 #ifndef SIO2MAN_V2
@@ -33,6 +34,7 @@ I_sio2_transfer
 sio2man_IMPORTS_end
 #endif
 #endif
+#endif
 
 loadcore_IMPORTS_start
 I_RegisterLibraryEntries
@@ -65,7 +67,7 @@ I_SignalSema
 I_WaitSema
 thsemap_IMPORTS_end
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 timrman_IMPORTS_start
 I_AllocHardTimer
 I_ReferHardTimer
@@ -74,18 +76,30 @@ I_GetTimerCounter
 timrman_IMPORTS_end
 #endif
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 modload_IMPORTS_start
 I_SetCheckKelfPathCallback
 modload_IMPORTS_end
 #endif
 
+#if defined(BUILDING_VMCMAN)
+iomanX_IMPORTS_start
+I_iomanX_AddDrv
+I_iomanX_DelDrv
+I_iomanX_open
+I_iomanX_close
+I_iomanX_lseek
+I_iomanX_read
+I_iomanX_write
+iomanX_IMPORTS_end
+#else
 ioman_IMPORTS_start
 I_AddDrv
 I_DelDrv
 ioman_IMPORTS_end
+#endif
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 secrman_IMPORTS_start
 I_SecrSetMcCommandHandler
 I_SecrSetMcDevIDHandler

iop/memorycard/mcman/src/irx_imports.h

@@ -22,9 +22,13 @@
 #include <fls.h>
 #endif
 #include <intrman.h>
+#ifdef BUILDING_VMCMAN
+#include <iomanX.h>
+#else
 #include <ioman.h>
+#endif
 #include <loadcore.h>
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 #include <modload.h>
 #include <secrman.h>
 #ifdef BUILDING_XMCMAN
@@ -42,7 +46,7 @@
 #endif
 #include <stdio.h>
 #include <sysclib.h>
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 #include <timrman.h>
 #endif
 #include <thbase.h>

iop/memorycard/mcman/src/main.c

@@ -28,18 +28,17 @@ int mcman_wr_block = -1;
 int mcman_wr_flag3 = -10;
 int mcman_curdircluster = -1;
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 int timer_ID;
 #endif
 int PS1CardFlag = 1;
 
 union mcman_pagebuf mcman_pagebuf;
 union mcman_PS1PDApagebuf mcman_PS1PDApagebuf;
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 extern struct irx_export_table _exp_mcman;
-#endif
-#ifdef BUILDING_XFROMMAN
+#elif defined(BUILDING_XFROMMAN)
 extern struct irx_export_table _exp_xfromman;
 #endif
 
@@ -155,11 +154,10 @@ int MCMAN_ENTRYPOINT(int argc, char *argv[])
 	DPRINTF("_start...\n");
 
 	DPRINTF("registering exports...\n");
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 	if (RegisterLibraryEntries(&_exp_mcman) != 0)
 		return MODULE_NO_RESIDENT_END;
-#endif
-#ifdef BUILDING_XFROMMAN
+#elif defined(BUILDING_XFROMMAN)
 	if (RegisterLibraryEntries(&_exp_xfromman) != 0)
 		return MODULE_NO_RESIDENT_END;
 #endif
@@ -180,7 +178,7 @@ int MCMAN_ENTRYPOINT(int argc, char *argv[])
 	DPRINTF("initdev...\n");
 	mcman_initdev();
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 	timer_ID = ReferHardTimer(1, 32, 0, 0x6309);
 
 	if (timer_ID != -150)
@@ -421,7 +419,7 @@ int mcman_detectcard(int port, int slot)
 	DPRINTF("mcman_detectcard port%d slot%d\n", port, slot);
 	mcdi = (MCDevInfo *)&mcman_devinfos[port][slot];
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 	if ((mcdi->cardtype == sceMcTypeNoCard) || (mcdi->cardtype == sceMcTypePS2)) {
 		r = mcman_probePS2Card2(port, slot);
 		if (r < -9) {
@@ -471,8 +469,7 @@ int mcman_detectcard(int port, int slot)
 			return sceMcResSucceed;
 		}
 	}
-#endif
-#ifdef BUILDING_XFROMMAN
+#else
 	r = mcman_probePS2Card2(port, slot);
 	if (r >= -9) {
 		mcdi->cardtype = sceMcTypePS2;
@@ -498,7 +495,7 @@ int McDetectCard2(int port, int slot) // Export #21 XMCMAN only
 
 	mcdi = (MCDevInfo *)&mcman_devinfos[port][slot];
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 	if ((mcdi->cardtype == sceMcTypeNoCard) || (mcdi->cardtype == sceMcTypePS2)) {
 		r = mcman_probePS2Card(port, slot);
 		if (r < -9) {
@@ -548,8 +545,7 @@ int McDetectCard2(int port, int slot) // Export #21 XMCMAN only
 			return sceMcResSucceed;
 		}
 	}
-#endif
-#ifdef BUILDING_XFROMMAN
+#else
 	r = mcman_probePS2Card(port, slot);
 	if (r >= -9) {
 		mcdi->cardtype = sceMcTypePS2;
@@ -2480,7 +2476,7 @@ int mcman_setPS1devinfos(int port, int slot)
 	if (r < 0)
 		return -14;
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 	if (mcman_sio2outbufs_PS1PDA[1] != 0)
 		return -15;
 #endif

iop/memorycard/mcman/src/mcdev.c

@@ -95,10 +95,11 @@ static MC_IO_OPS_T mcman_mcops = {
 
 // driver descriptor
 static MC_IO_DEV_T mcman_mcdev = {
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 	"mc",
-#endif
-#ifdef BUILDING_XFROMMAN
+#elif defined(BUILDING_VMCMAN)
+	"vmc",
+#elif defined(BUILDING_XFROMMAN)
 	"xfrom",
 #endif
 	IOP_DT_FS
@@ -107,10 +108,11 @@ static MC_IO_DEV_T mcman_mcdev = {
 #endif
 	,
 	1,
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 	"Memory Card",
-#endif
-#ifdef BUILDING_XFROMMAN
+#elif defined(BUILDING_VMCMAN)
+	"Virtual Memory Card",
+#elif defined(BUILDING_XFROMMAN)
 	"External flash rom",
 #endif
 	&mcman_mcops,
@@ -213,12 +215,14 @@ int mcman_modloadcb(const char *filename, int *port, int *slot)
 //--------------------------------------------------------------
 void mcman_unit2card(u32 unit)
 {
-#ifndef BUILDING_XFROMMAN
- 	mcman_mc_port = unit & 1;
- 	mcman_mc_slot = (unit >> 1) & (MCMAN_MAXSLOT - 1);
-#endif
-#ifdef BUILDING_XFROMMAN
- 	(void)unit;
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
+	mcman_mc_port = unit & 1;
+	mcman_mc_slot = (unit >> 1) & (MCMAN_MAXSLOT - 1);
+#elif defined(BUILDING_VMCMAN)
+	mcman_mc_port = 0;
+	mcman_mc_slot = unit & (MCMAN_MAXSLOT - 1);
+#elif defined(BUILDING_XFROMMAN)
+	(void)unit;
 	mcman_mc_port = 0;
 	mcman_mc_slot = 0;
 #endif
@@ -252,7 +256,7 @@ int mcman_initdev(void)
 {
 	iop_sema_t smp;
 
-#ifndef BUILDING_XFROMMAN
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 	SetCheckKelfPathCallback(mcman_modloadcb);
 #endif
 
@@ -644,7 +648,11 @@ int mc_mount(MC_IO_FIL_T *f, const char *fsname, const char *devname, int flag,
 
 	WaitSema(mcman_io_sema);
 	mcman_unit2card(f->unit);
+#if defined(BUILDING_VMCMAN)
+	r = mcman_iomanx_backing_mount(mcman_mc_port, mcman_mc_slot, devname);
+#else
 	r = 0;
+#endif
 	SignalSema(mcman_io_sema);
 	return r;
 }
@@ -658,7 +666,11 @@ int mc_umount(MC_IO_FIL_T *f, const char *fsname)
 
 	WaitSema(mcman_io_sema);
 	mcman_unit2card(f->unit);
+#if defined(BUILDING_VMCMAN)
+	r = mcman_iomanx_backing_umount(mcman_mc_port, mcman_mc_slot);
+#else
 	r = 0;
+#endif
 	SignalSema(mcman_io_sema);
 	return r;
 }