feat(favourites): VCD favourites -- Favourites tab gets its own L3 ISO/VCD view

PS1/.VCD games can now be favourited and launched from the Favourites tab. The
tab gains its own L3 toggle (like every device page) that swaps between disc
favourites and PS1 favourites; favouriting a game while a device is in its VCD
view records a VCD favourite that resolves, renders, and launches as POPSTARTER
independent of the source device's current view.

Format: favourites.bin OFAV bumped v1->v2 with a per-record isVcd byte. v1 files
still load (every record isVcd=0) and the uOPL/wOPL import (no OFAV magic) sets
isVcd=0, so no user loses favourites on upgrade; the first write upgrades in place.

Resolution is by NAME (stored text == .VCD basename), not by a submenu id -- the
source device may be in ISO view (its games array holds discs, not VCDs) yet the
favourite must still surface. favResolve binds a VCD fav only to a loaded device
that provides the new itemLaunchVcd callback; favGetImage/favGetConfig drive the
VCD art (vcdLoadArt) + PS1 config (sbPopulateConfig) off the owner's itemGetPrefix;
favLaunchItem dispatches to itemLaunchVcd. bdm/eth/mmce implement it by refactoring
their existing in-view VCD launch branch into a launch-by-name helper (no behaviour
change to the in-view path; reuses the exact, freeze-tested device code). FAV joins
vcdModeSupported; favUpdateItemList filters by vcdViewActive(FAV_MODE); the menusys
render reorder puts the VCD view ahead of the FAV branch so VCD favourites render
with the PS1 theme family.

The APA HDD (HDD_MODE) is deferred: its __.POPS partition model isn't
name-resolvable here, so it has no itemLaunchVcd and R3 on an HDD VCD item is an
honest no-op rather than storing a permanently-hidden record. The common internal
exFAT HDD is a BDM massN: device and is fully covered.

Adversarially verified (16-agent workflow: GO, 0 blocker / 0 major); the 4
confirmed minors/nits are fixed here -- source-page star re-mark, the HDD dead-end
guard, favGetImage isRelative parity, and an unconditional FAV dirty-flag consume.

REMAINING: HW validation (BDM/MMCE/SMB VCD favourite capture + launch); APA-HDD
VCD favourites as a follow-up.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: NathanNeurotic

include/favsupport.h

@@ -7,7 +7,7 @@
 #define FAV_TEXT_MAX          256        // cap on a stored favourite's text length (incl. NUL)
 #define FAV_MAX_ITEMS         512        // cap on records read from favourites.bin
 #define FAV_MAGIC             0x4641464F // 'OFAV' (little-endian on the EE)
-#define FAV_VERSION           1
+#define FAV_VERSION           2          // v2 adds a per-record isVcd byte; v1 is still read (isVcd=0)
 
 // Defined in favsupport.c; consumed by opl.c/gui.c (config load/save/default).
 extern int gFAVStartMode;
@@ -24,9 +24,11 @@ int favGetItemSourceMode(int id);
 
 // R3-toggle helpers (called from opl.c). add/remove rewrite favourites.bin and return 1 on a
 // successful write, 0 on failure (so the caller won't set a lying star). add returns 1 if the
-// item is already present. removeFavouriteByIdAndText matches mode (BDM-lenient) + id + text.
-int addFavouriteItem(int mode, int id, int icon_id, int text_id, const char *text);
-int removeFavouriteByIdAndText(int mode, int id, const char *text);
+// item is already present. removeFavouriteByIdAndText matches mode (BDM-lenient) + id + text + isVcd.
+// isVcd = 1 when the favourited item was a PS1/.VCD entry (device was in its L3 VCD view); such
+// favourites resolve + launch as POPSTARTER rather than as a disc image. See favsupport.c.
+int addFavouriteItem(int mode, int id, int icon_id, int text_id, const char *text, int isVcd);
+int removeFavouriteByIdAndText(int mode, int id, const char *text, int isVcd);
 
 // Remove the favourite at FAV-list index favIndex (R3 pressed on the Favourites tab).
 void favRemoveByIndex(int favIndex);

include/iosupport.h

@@ -154,6 +154,13 @@ typedef struct _item_list_t
     int (*itemCheckVMC)(item_list_t *itemList, char *name, int createSize);
 
     int (*itemIconId)(item_list_t *itemList);
+
+    /// Launch a PS1/.VCD entry BY NAME via POPSTARTER, independent of the device's current ISO/VCD
+    /// view. NULL for devices without a VCD view (and for the APA HDD, whose __.POPS partition model
+    /// is not name-resolvable here). Used by the Favourites tab to launch a VCD favourite while its
+    /// source device page may be in ISO view -- the id-based itemLaunch's VCD branch is gated on the
+    /// device being live in VCD view, which the Favourites tab cannot guarantee.
+    void (*itemLaunchVcd)(item_list_t *itemList, const char *vcdName, config_set_t *configSet);
 } item_list_t;
 
 #endif

src/bdmsupport.c

@@ -625,6 +625,26 @@ static void bdmRenameGame(item_list_t *itemList, int id, char *newName)
     pDeviceData->ForceRefresh = 1;
 }
 
+// Launch a PS1/.VCD entry BY NAME via POPSTARTER (the view-independent entry point used by both the
+// in-view menu launch below and the Favourites tab). Every BDM device is a massN: mount at runtime,
+// so the ELF + selector both use the live prefix; UNMOUNT_EXCEPTION keeps it mounted across the reset.
+static void bdmLaunchVcd(item_list_t *itemList, const char *vcdName, config_set_t *configSet)
+{
+    bdm_device_data_t *pDeviceData = (bdm_device_data_t *)itemList->priv;
+    char vcdPrefix[64], vcdElf[256], vcdSelector[320];
+
+    if (pDeviceData == NULL || vcdName == NULL || vcdName[0] == '\0' || !strcmp(vcdName, "POPSTARTER"))
+        return;
+    snprintf(vcdPrefix, sizeof(vcdPrefix), "%s", pDeviceData->bdmPrefix);
+    if (!vcdResolvePopstarter(vcdPrefix, vcdElf, sizeof(vcdElf))) {
+        guiMsgBox(_l(_STR_POPSTARTER_NOT_FOUND), 0, NULL);
+        return;
+    }
+    vcdBuildSelector(vcdPrefix, VCD_PREFIX_MASS, vcdName, vcdSelector, sizeof(vcdSelector));
+    deinit(UNMOUNT_EXCEPTION, itemList->mode); // keep the VCD device mounted across the IOP reset
+    sysLaunchPopstarter(vcdElf, vcdSelector, "");
+}
+
 void bdmLaunchGame(item_list_t *itemList, int id, config_set_t *configSet)
 {
     int i, fd, iop_fd, index, compatmask = 0;
@@ -648,33 +668,12 @@ void bdmLaunchGame(item_list_t *itemList, int id, config_set_t *configSet)
         game = gAutoLaunchBDMGame;
     }
 
-    // VCD view: this device is showing PS1 VCDs -> hand off to POPSTARTER instead of the disc /
-    // Neutrino path below (which is entirely disc-specific). Menu-launch only; build the selector
-    // + resolve the ELF on stack BEFORE deinit() frees the game list.
+    // VCD view: this device is showing PS1 VCDs -> hand off to POPSTARTER (by name) instead of the
+    // disc / Neutrino path below (which is entirely disc-specific). The BDM_TYPE_ATA internal exFAT HDD
+    // still launches off the live massN: prefix, NOT ata0:/ (OPL never mounts an ata0: filesystem -- a
+    // re-point there made LoadELFFromFile fail into an already-deinit'd OPL = black-screen freeze).
     if (gAutoLaunchBDMGame == NULL && game != NULL && vcdViewActive(itemList->mode)) {
-        char vcdName[VCD_NAME_MAX];
-        char vcdPrefix[64];
-        char vcdElf[256];
-        char vcdSelector[320];
-        snprintf(vcdName, sizeof(vcdName), "%s", game->name);
-        snprintf(vcdPrefix, sizeof(vcdPrefix), "%s", pDeviceData->bdmPrefix);
-        if (vcdName[0] == '\0' || !strcmp(vcdName, "POPSTARTER"))
-            return;
-        if (!vcdResolvePopstarter(vcdPrefix, vcdElf, sizeof(vcdElf))) {
-            guiMsgBox(_l(_STR_POPSTARTER_NOT_FOUND), 0, NULL);
-            return;
-        }
-        // Every BDM device -- USB, MX4SIO, and the internal exFAT HDD (BDM_TYPE_ATA) -- is a massN: mount
-        // at OPL runtime, so the ELF and selector BOTH use that one live prefix. OPL opens vcdElf HERE,
-        // BEFORE the IOP reset, from the live massN: mount (kept alive by UNMOUNT_EXCEPTION); OPL never
-        // mounts an ata0: filesystem (it only builds mass%d: paths), so the earlier BDM_TYPE_ATA re-point
-        // to "ata0:/POPS/POPSTARTER.ELF" made LoadELFFromFile fail and return into an already-deinit'd OPL
-        // with no re-init path = black-screen freeze. POPSTARTER only needs the VCD NAME from the selector
-        // to know what to boot; the equipped BDMA modules steer it to the exFAT device after the reset, so
-        // the selector's device prefix is irrelevant -- keep the live massN: one, same as USB/MX4SIO.
-        vcdBuildSelector(vcdPrefix, VCD_PREFIX_MASS, vcdName, vcdSelector, sizeof(vcdSelector));
-        deinit(UNMOUNT_EXCEPTION, itemList->mode); // keep the VCD device mounted across the IOP reset
-        sysLaunchPopstarter(vcdElf, vcdSelector, "");
+        bdmLaunchVcd(itemList, game->name, configSet);
         return;
     }
 
@@ -1109,7 +1108,7 @@ static char *bdmGetPrefix(item_list_t *itemList)
 static item_list_t bdmGameList = {
     BDM_MODE, 2, 0, 0, MENU_MIN_INACTIVE_FRAMES, BDM_MODE_UPDATE_DELAY, NULL, NULL, &bdmGetTextId, &bdmGetPrefix, &bdmInit, &bdmNeedsUpdate,
     &bdmUpdateGameList, &bdmGetGameCount, &bdmGetGame, &bdmGetGameName, &bdmGetGameNameLength, &bdmGetGameStartup, &bdmDeleteGame, &bdmRenameGame,
-    &bdmLaunchGame, &bdmGetConfig, &bdmGetImage, &bdmCleanUp, &bdmShutdown, &bdmCheckVMC, &bdmGetIconId};
+    &bdmLaunchGame, &bdmGetConfig, &bdmGetImage, &bdmCleanUp, &bdmShutdown, &bdmCheckVMC, &bdmGetIconId, &bdmLaunchVcd};
 
 void bdmInitSemaphore()
 {

src/ethsupport.c

@@ -606,6 +606,29 @@ static void ethRenameGame(item_list_t *itemList, int id, char *newName)
     ethULSizePrev = -2;
 }
 
+// Launch a PS1/.VCD entry BY NAME via POPSTARTER over SMB (view-independent entry point: the in-view
+// menu launch below and the Favourites tab both use it). ethPrefix is static and smb: paths use '\'
+// (auto-detected by vcdSep); UNMOUNT_EXCEPTION keeps the share mounted across the IOP reset.
+static void ethLaunchVcd(item_list_t *itemList, const char *vcdName, config_set_t *configSet)
+{
+    char vcdElf[256], vcdSelector[320];
+
+    if (!gPCShareName[0] || vcdName == NULL || vcdName[0] == '\0' || !strcmp(vcdName, "POPSTARTER"))
+        return;
+    if (!vcdResolvePopstarter(ethPrefix, vcdElf, sizeof(vcdElf))) {
+        guiMsgBox(_l(_STR_POPSTARTER_NOT_FOUND), 0, NULL);
+        return;
+    }
+    // POPSTARTER needs its SMB network IRX on the card to read a VCD over the network.
+    if (!vcdSmbModulesPresent()) {
+        guiMsgBox(_l(_STR_POPSTARTER_SMB_MISSING), 0, NULL);
+        return;
+    }
+    vcdBuildSelector(ethPrefix, VCD_PREFIX_SMB, vcdName, vcdSelector, sizeof(vcdSelector));
+    deinit(UNMOUNT_EXCEPTION, itemList->mode); // keep the SMB mount alive across the IOP reset
+    sysLaunchPopstarter(vcdElf, vcdSelector, "");
+}
+
 static void ethLaunchGame(item_list_t *itemList, int id, config_set_t *configSet)
 {
     int i, compatmask;
@@ -617,28 +640,9 @@ static void ethLaunchGame(item_list_t *itemList, int id, config_set_t *configSet
     u32 layer1_start, layer1_offset;
     unsigned short int layer1_part;
 
-    // VCD view (SMB): hand off to POPSTARTER with the SB. prefix (smb: paths use '\', auto-detected
-    // by vcdSep). Only once a share is selected; build the selector + resolve the ELF on stack
-    // BEFORE deinit() frees ethGames. ethPrefix is static.
+    // VCD view (SMB): hand off to POPSTARTER by name, only once a share is selected.
     if (gPCShareName[0] && game != NULL && vcdViewActive(itemList->mode)) {
-        char vcdName[VCD_NAME_MAX];
-        char vcdElf[256];
-        char vcdSelector[320];
-        snprintf(vcdName, sizeof(vcdName), "%s", game->name);
-        if (vcdName[0] == '\0' || !strcmp(vcdName, "POPSTARTER"))
-            return;
-        if (!vcdResolvePopstarter(ethPrefix, vcdElf, sizeof(vcdElf))) {
-            guiMsgBox(_l(_STR_POPSTARTER_NOT_FOUND), 0, NULL);
-            return;
-        }
-        // POPSTARTER needs its SMB network IRX on the card to read a VCD over the network.
-        if (!vcdSmbModulesPresent()) {
-            guiMsgBox(_l(_STR_POPSTARTER_SMB_MISSING), 0, NULL);
-            return;
-        }
-        vcdBuildSelector(ethPrefix, VCD_PREFIX_SMB, vcdName, vcdSelector, sizeof(vcdSelector));
-        deinit(UNMOUNT_EXCEPTION, itemList->mode); // keep the SMB mount alive across the IOP reset
-        sysLaunchPopstarter(vcdElf, vcdSelector, "");
+        ethLaunchVcd(itemList, game->name, configSet);
         return;
     }
 
@@ -861,7 +865,7 @@ static char *ethGetPrefix(item_list_t *itemList)
 static item_list_t ethGameList = {
     ETH_MODE, 1, 0, 0, MENU_MIN_INACTIVE_FRAMES, ETH_MODE_UPDATE_DELAY, NULL, NULL, &ethGetTextId, &ethGetPrefix, &ethInit, &ethNeedsUpdate,
     &ethUpdateGameList, &ethGetGameCount, &ethGetGame, &ethGetGameName, &ethGetGameNameLength, &ethGetGameStartup, &ethDeleteGame, &ethRenameGame,
-    &ethLaunchGame, &ethGetConfig, &ethGetImage, &ethCleanUp, &ethShutdown, &ethCheckVMC, &ethGetIconId};
+    &ethLaunchGame, &ethGetConfig, &ethGetImage, &ethCleanUp, &ethShutdown, &ethCheckVMC, &ethGetIconId, &ethLaunchVcd};
 
 static int ethReadNetConfig(void)
 {