@@ -1178,8 +1178,13 @@ static void loadCdModules(void)
1178
1178
int ret , id ;
1179
1179
1180
1180
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
1181
1185
id = SifExecModuleBuffer (cdvd_irx , size_cdvd_irx , 0 , NULL , & ret );
1182
1186
DPRINTF (" [CDVD]: id=%d, ret=%d\n" , id , ret );
1187
+ #endif
1183
1188
sceCdInit (SCECdINoD ); // SCECdINoD init without check for a disc. Reduces risk of a lockup if the drive is in a erroneous state.
1184
1189
CDVD_Init ();
1185
1190
have_cdvd = 1 ;
@@ -1279,12 +1284,10 @@ static void getExternalFilePath(const char *argPath, char *filePath)
1279
1284
mountDVRPParty (party );
1280
1285
1281
1286
#endif
1282
- #ifndef SUPPORT_SYSTEM_2X6
1283
1287
} else if (!strncmp (argPath , "cdfs" , 4 )) {
1284
1288
strcpy (filePath , argPath );
1285
1289
CDVD_FlushCache ();
1286
1290
CDVD_DiskReady (0 );
1287
- #endif
1288
1291
} else {
1289
1292
genFixPath (argPath , filePath );
1290
1293
}
@@ -2353,13 +2356,11 @@ static void Execute(char *pathin)
2353
2356
}
2354
2357
Show_build_info ();
2355
2358
return ;
2356
- #ifndef SUPPORT_SYSTEM_2X6
2357
2359
} else if (!strncmp (path , "cdfs" , 4 )) {
2358
2360
CDVD_FlushCache ();
2359
2361
CDVD_DiskReady (0 );
2360
2362
party [0 ] = 0 ;
2361
2363
goto CheckELF_path ;
2362
- #endif
2363
2364
} else if (!strncmp (path , "rom" , 3 )) {
2364
2365
party [0 ] = 0 ;
2365
2366
CheckELF_path :
@@ -2421,9 +2422,7 @@ int i, d;
2421
2422
DPRINTF (" [UDPTTY]: id=%d, ret=%d\n" , i , d );
2422
2423
#endif
2423
2424
loadBasicModules ();
2424
- #ifndef SUPPORT_SYSTEM_2X6
2425
2425
loadCdModules ();
2426
- #endif
2427
2426
DPRINTF ("Initializing fileXio RPC\n" );
2428
2427
fileXioInit ();
2429
2428
//Increase the FILEIO R/W buffer size to reduce overhead.
0 commit comments