Skip to content

Commit b4f7bea

Browse files
committed
try to fix cdfs access
1 parent f4a8934 commit b4f7bea

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/main.c

+5-6
Original file line numberDiff line numberDiff line change
@@ -1178,8 +1178,13 @@ static void loadCdModules(void)
11781178
int ret, id;
11791179

11801180
if (!have_cdvd) {
1181+
#ifdef SUPPORT_SYSTEM_2X6
1182+
id = SifLoadStartModule("rom0:CDVDFSV", 0, NULL, &ret);
1183+
DPRINTF(" [rom0:CDVDFSV]: ID=%d, ret=%d\n", id, ret);
1184+
#else
11811185
id = SifExecModuleBuffer(cdvd_irx, size_cdvd_irx, 0, NULL, &ret);
11821186
DPRINTF(" [CDVD]: id=%d, ret=%d\n", id, ret);
1187+
#endif
11831188
sceCdInit(SCECdINoD); // SCECdINoD init without check for a disc. Reduces risk of a lockup if the drive is in a erroneous state.
11841189
CDVD_Init();
11851190
have_cdvd = 1;
@@ -1279,12 +1284,10 @@ static void getExternalFilePath(const char *argPath, char *filePath)
12791284
mountDVRPParty(party);
12801285

12811286
#endif
1282-
#ifndef SUPPORT_SYSTEM_2X6
12831287
} else if (!strncmp(argPath, "cdfs", 4)) {
12841288
strcpy(filePath, argPath);
12851289
CDVD_FlushCache();
12861290
CDVD_DiskReady(0);
1287-
#endif
12881291
} else {
12891292
genFixPath(argPath, filePath);
12901293
}
@@ -2353,13 +2356,11 @@ static void Execute(char *pathin)
23532356
}
23542357
Show_build_info();
23552358
return;
2356-
#ifndef SUPPORT_SYSTEM_2X6
23572359
} else if (!strncmp(path, "cdfs", 4)) {
23582360
CDVD_FlushCache();
23592361
CDVD_DiskReady(0);
23602362
party[0] = 0;
23612363
goto CheckELF_path;
2362-
#endif
23632364
} else if (!strncmp(path, "rom", 3)) {
23642365
party[0] = 0;
23652366
CheckELF_path:
@@ -2421,9 +2422,7 @@ int i, d;
24212422
DPRINTF(" [UDPTTY]: id=%d, ret=%d\n", i, d);
24222423
#endif
24232424
loadBasicModules();
2424-
#ifndef SUPPORT_SYSTEM_2X6
24252425
loadCdModules();
2426-
#endif
24272426
DPRINTF("Initializing fileXio RPC\n");
24282427
fileXioInit();
24292428
//Increase the FILEIO R/W buffer size to reduce overhead.

0 commit comments

Comments
 (0)