fix compilation

Author: israpps

Makefile

@@ -18,6 +18,7 @@ SIO_DEBUG ?= 0
 DEBUG ?= 0
 COH ?= 0
 LCDVD ?= LEGACY#or LATEST
+
 # ----------------------------- #
 .SILENT:
 
@@ -53,7 +54,7 @@ ifeq ($(SMB),1)
 endif
 
 ifeq ($(COH), 1)
-  CDVDFSV = 0
+  LCDVD=NONE
   SIO2MAN = 0
   MCMAN = 0
   EE_OBJS += ioprp.o
@@ -77,9 +78,13 @@ ifeq ($(LCDVD),LEGACY)
   CDVD_SOURCE = iop/cdvd.irx
   EE_INCS += -Iiop/oldlibs/libcdvd/ee
   EE_LIBS += -lcdvdfs
-else
+  EE_OBJS += cdvd_irx.o
+else ifeq ($(LCDVD), LATEST)
   EE_CFLAGS += -DLIBCDVD_LATEST
   CDVD_SOURCE = iop/__precompiled/cdfs.irx
+  EE_OBJS += cdvd_irx.o
+else ifeq ($(LCDVD), NONE)
+  EE_CFLAGS += -DNO_CDVD_CDFS
 endif
 
 ifeq ($(XFROM),1)
@@ -135,11 +140,6 @@ else
   EE_CFLAGS += -DUSE_ROM_MCMAN
 endif
 
-ifeq ($(CDVDFSV),1)
-  EE_OBJS += cdvd_irx.o
-else
-  EE_CFLAGS += -DUSE_ROM_CDVDFSV
-endif
 
 ifeq ($(LIBPAD),2)
   EE_LIBS += -lpadx
@@ -226,7 +226,8 @@ info:
 	$(info   DS34		include PS3/PS4 controller support)
 	$(info   MX4SIO		support for SDCard connected to memory card slot 2)
 	$(info   MMCE		support for direct SDCard access on SD2PSX or memcardpro2)
-	$(info ----------)
+	$(info   COH		support for Arcade PS2 models (system2x6 and Python1))
+	$(info ------------------------)
 	$(info   IOPTRAP		load exception handler module to IOP)
 	$(info   UDPTTY		transfer stdout to UDP broadcast)
 	$(info   PPC_UART	transfer stdout to DECKARD UART)

include/launchelf.h

@@ -38,7 +38,9 @@
 #include <debug.h>
 #include <gsKit.h>
 #include <dmaKit.h>
+#ifndef NO_CDVD_CDFS
 #include <cdvd_rpc.h>
+#endif
 #include <libcdvd.h>
 #include <libjpg.h>
 #include <libkbd.h>

src/main.c

@@ -68,9 +68,10 @@ IMPORT_BIN2C(dvrdrv_irx);
 IMPORT_BIN2C(dvrfile_irx);
 #endif
 
-#ifndef USE_ROM_CDVDFSV
+#ifndef NO_CDVD_CDFS
 IMPORT_BIN2C(cdvd_irx);
 #endif
+
 #ifdef MMCE
 IMPORT_BIN2C(mmceman_irx);
 #endif
@@ -1230,11 +1231,13 @@ static void loadCdModules(void)
     	DPRINTF(" [rom0:CDVDFSV]: ID=%d, ret=%d\n", id, ret);
 #endif
 		sceCdInit(SCECdINoD);  // SCECdINoD init without check for a disc. Reduces risk of a lockup if the drive is in a erroneous state.
+#ifndef NO_CDVD_CDFS
 		id = SifExecModuleBuffer(cdvd_irx, size_cdvd_irx, 0, NULL, &ret);
 		LCDVD_INIT();
 		DPRINTF(" [CDVD]: id=%d, ret=%d\n", id, ret);
-
+#endif
 		have_cdvd = 1;
+		
 	}
 }
 //------------------------------
@@ -1331,11 +1334,12 @@ static void getExternalFilePath(const char *argPath, char *filePath)
 		mountDVRPParty(party);
 
 #endif
-#ifndef SUPPORT_SYSTEM_2X6
+#ifndef NO_CDVD_CDFS
 	} else if (!strncmp(argPath, "cdfs", 4)) {
 		strcpy(filePath, argPath);
 		LCDVD_FLUSHCACHE();
 		LCDVD_DISKREADY(0);
+#endif
 	} else {
 		genFixPath(argPath, filePath);
 	}