Merge pull request #447 from uyjulian/mcman_improvements

mcman improvements

Author: fjtrujy

iop/memorycard/Makefile

@@ -11,6 +11,7 @@ SUBDIRS = \
 	mcman-old \
 	mcserv \
 	mcserv-old \
+	vmcman \
 	xfromman
 
 include $(PS2SDKSRC)/Defs.make

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/include/mcman.h

@@ -29,21 +29,21 @@ typedef struct _sceMcTblGetDir {	// size = 64
 	u16 Reserve1;			// 22
 	u32 Reserve2;			// 24
 	u32 PdaAplNo;			// 28
-	unsigned char EntryName[32];	// 32
+	char EntryName[32];	// 32
 } sceMcTblGetDir;
 
 int  McDetectCard(int port, int slot);
-int  McOpen(int port, int slot, char *filename, int flags);
+int  McOpen(int port, int slot, const char *filename, int flags);
 int  McClose(int fd);
 int  McRead(int fd, void *buf, int length);
 int  McWrite(int fd, void *buf, int length);
 int  McSeek(int fd, int offset, int origin);
 int  McFormat(int port, int slot);
-int  McGetDir(int port, int slot, char *dirname, int flags, int maxent, sceMcTblGetDir *info);
-int  McDelete(int port, int slot, char *filename, int flags);
+int  McGetDir(int port, int slot, const char *dirname, int flags, int maxent, sceMcTblGetDir *info);
+int  McDelete(int port, int slot, const char *filename, int flags);
 int  McFlush(int fd);
-int  McChDir(int port, int slot, char *newdir, char *currentdir);
-int  McSetFileInfo(int port, int slot, char *filename, sceMcTblGetDir *info, int flags);
+int  McChDir(int port, int slot, const char *newdir, char *currentdir);
+int  McSetFileInfo(int port, int slot, const char *filename, sceMcTblGetDir *info, int flags);
 int  McEraseBlock(int port, int block, void **pagebuf, void *eccbuf);	//MCMAN v1.1 does not have a slot argument
 int  McReadPage(int port, int slot, int page, void *buf);
 int  McWritePage(int port, int slot, int page, void *pagebuf, void *eccbuf);
@@ -60,10 +60,12 @@ void McSetPS1CardFlag(int flag);
 int  McEraseBlock2(int port, int slot, int block, void **pagebuf, void *eccbuf);
 int  McDetectCard2(int port, int slot);
 int  McGetFormat(int port, int slot);
-int  McGetEntSpace(int port, int slot, char *dirname);
+int  McGetEntSpace(int port, int slot, const char *dirname);
 int  McReplaceBadBlock(void);
 int  McCloseAll(void);
+#ifdef _IOP
 struct irx_id *McGetModuleInfo(void);
+#endif
 int  McGetCardSpec(int port, int slot, s16 *pagesize, u16 *blocksize, int *cardsize, u8 *flags);
 int  McGetFATentry(int port, int slot, int fat_index, int *fat_entry);
 int  McCheckBlock(int port, int slot, int block);

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,23 +67,39 @@ I_SignalSema
 I_WaitSema
 thsemap_IMPORTS_end
 
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 timrman_IMPORTS_start
 I_AllocHardTimer
 I_ReferHardTimer
 I_SetTimerMode
 I_GetTimerCounter
 timrman_IMPORTS_end
+#endif
 
+#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,11 +22,15 @@
 #include <fls.h>
 #endif
 #include <intrman.h>
+#ifdef BUILDING_VMCMAN
+#include <iomanX.h>
+#else
 #include <ioman.h>
+#endif
 #include <loadcore.h>
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 #include <modload.h>
 #include <secrman.h>
-#ifndef BUILDING_XFROMMAN
 #ifdef BUILDING_XMCMAN
 #ifndef SIO2MAN_V2
 #include <xsio2man.h>
@@ -42,7 +46,9 @@
 #endif
 #include <stdio.h>
 #include <sysclib.h>
+#if !defined(BUILDING_XFROMMAN) && !defined(BUILDING_VMCMAN)
 #include <timrman.h>
+#endif
 #include <thbase.h>
 #include <thsemap.h>