Fix cdvd support

ps2homebrew · Apr 27, 2018 · 23395b7 · 23395b7
1 parent 6255334
commit 23395b7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/drivers/ps2/browser.c b/src/drivers/ps2/browser.c
@@ -147,15 +147,15 @@ int RomBrowserInput(int files_too, int inside_menu)
 
 #ifdef CDSUPPORT
 int listcdvd(const char *path, entries *FileEntry) {
-    static struct TocEntry TocEntryList[2048];
+    static struct TocEntry TocEntryList[FILEENTRY_SIZE];
     char dir[1025];
     int i, n, t;
 
     strcpy(dir, &path[5]);
     // Directories first...
 
     CDVD_FlushCache();
-    n = CDVD_GetDir(dir, NULL, CDVD_GET_DIRS_ONLY, TocEntryList, 2048, dir);
+    n = CDVD_GetDir(dir, NULL, CDVD_GET_DIRS_ONLY, TocEntryList, FILEENTRY_SIZE, dir);
 
     strcpy(FileEntry[0].filename, "..");
     strcpy(FileEntry[0].displayname, "..");
@@ -173,15 +173,18 @@ int listcdvd(const char *path, entries *FileEntry) {
         strzncpy(FileEntry[t].displayname, FileEntry[t].filename, 63);
         t++;
 
-        if (t >= 2046) {
+        if (t >= FILEENTRY_SIZE - 2) {
             break;
         }
-     }
+    }
+
+    qsort(FileEntry, t, sizeof(entries), comp_entries_by_filename);
+    first_file_index = t;
 
     // Now files only
 
     CDVD_FlushCache();
-    n = CDVD_GetDir(dir, NULL, CDVD_GET_FILES_ONLY, TocEntryList, 2048, dir);
+    n = CDVD_GetDir(dir, NULL, CDVD_GET_FILES_ONLY, TocEntryList, FILEENTRY_SIZE, dir);
 
     for (i = 0; i < n; i++) {
         if (TocEntryList[i].fileProperties & 0x02 && (!strcmp(
@@ -194,11 +197,13 @@ int listcdvd(const char *path, entries *FileEntry) {
         strzncpy(FileEntry[t].displayname, FileEntry[t].filename, 63);
         t++;
 
-        if (t >= 2046) {
+        if (t >= FILEENTRY_SIZE - 2) {
             break;
         }
     }
 
+    qsort(FileEntry + first_file_index, t - first_file_index, sizeof(entries), comp_entries_by_filename);
+
     return t;
 }
 #endif
@@ -223,14 +228,15 @@ int listdir(char *path, entries *FileEntry, int files_too)
         FileEntry[1].dircheck = 1;
         FileEntry[2].dircheck = 1;
         FileEntry[3].dircheck = 1;
+        n = 4;
+#ifdef CDSUPPORT
         FileEntry[4].dircheck = 1;
         n = 5;
     }
-#ifdef CDSUPPORT
     else if (!strncmp(path, "cdfs", 4)) {
         n = listcdvd(path, FileEntry);
-    }
 #endif
+    }
     else { // It has a /
         dd = fioDopen(path);
         if (dd < 0) {
@@ -310,12 +316,14 @@ int listpfs(char *path, entries *FileEntry, int files_too)
         FileEntry[2].dircheck = 1;
         FileEntry[3].dircheck = 1;
         n = 4;
-    }
 #ifdef CDSUPPORT
+        FileEntry[4].dircheck = 1;
+        n = 5;
+    }
     else if (!strncmp(path, "cdfs", 4)) {
         n = listcdvd(path, FileEntry);
-    }
 #endif
+    }
     else {
         if ((dd = fileXioDopen(path)) < 0) {
             printf("Didn't open!\n");

diff --git a/src/drivers/ps2/init.c b/src/drivers/ps2/init.c
@@ -149,6 +149,8 @@ void InitPS2()
     mcInit(MC_TYPE_XMC);
 
 #ifdef CDSUPPORT
+    SifExecModuleBuffer(&cdvd_irx, size_cdvd_irx, 0, NULL, NULL);
+
     cdInit(CDVD_INIT_INIT);
 printf("Failed to load module: cdInit");
     CDVD_Init();