Resolve merge conflicts with upstream master

Author: NathanNeurotic

.github/ISSUE_TEMPLATE/issue-report.yml

@@ -59,6 +59,11 @@ body:
       label: "In which device(s) have you experienced this issue?"
       multiple: true
       options:
+        - USB
+        - SMB
+        - HDD
+        - iLink
+        - MX4SIO
         - SD2PSX (DIY)
         - MemCardPRO2 (8BitMods)
         - PSxMemCard Gen1 (Bitfunx)

include/bdmsupport.h

@@ -55,7 +55,7 @@ void bdmEnumerateDevices();
 
 void bdmResolveLBA_UDMA(bdm_device_data_t *pDeviceData);
 int bdmWaitForDevice(int deviceId, u32 timeoutMs);
-int bdmHDDIsPresent();
+int bdmHDDIsPresent(u32 timeoutMs);
 int bdmResolveDeviceRoot(char *target, int targetLength, const char *driverName, int massDeviceIndex, int massSlot);
 
 int bdmFindPartition(char *target, const char *name, int write);

include/hddsupport.h

@@ -73,5 +73,6 @@ item_list_t *hddGetObject(int initOnly);
 int hddLoadModules(void);
 void hddLoadSupportModules(void);
 void hddLaunchGame(item_list_t *itemList, int id, config_set_t *configSet);
+int hddIsPresent();
 
 #endif

src/bdmsupport.c

@@ -1040,7 +1040,7 @@ int bdmUpdateDeviceData(item_list_t *itemList)
     return 0;
 }
 
-int bdmWaitForDevice(int deviceId, u32 timeoutMs)
+static int bdmWaitForDevice(int deviceId, u32 timeoutMs)
 {
     const int RETRY_DELAY = 100;
     char path[16];
@@ -1067,11 +1067,89 @@ int bdmWaitForDevice(int deviceId, u32 timeoutMs)
     }
 }
 
-int bdmHDDIsPresent()
+static int bdmDeviceIsPresent(int deviceId)
 {
-    // the only thing that currently uses ata_device_identify is ATA_DEVCTL_GET_HIGHEST_UDMA_MODE, so this is the best method to check for presence via xhdd (for now anyways)
-    // ideally, we'd only have ata_device_identify
-    return fileXioDevctl("xhdd0:", ATA_DEVCTL_GET_HIGHEST_UDMA_MODE, NULL, 0, NULL, 0) >= 0;
+    char path[16];
+    sprintf(path, "mass%d:/", deviceId);
+    int dir = fileXioDopen(path);
+
+    if (dir >= 0) {
+        fileXioDclose(dir);
+        return 1; // ready
+    }
+
+    return 0;
+}
+
+static int bdmDeviceIsATA(int deviceId)
+{
+    char path[16];
+    bdm_device_data_t data;
+
+    sprintf(path, "mass%d:/", deviceId);
+    int dir = fileXioDopen(path);
+    if (dir < 0)
+        return 0;
+
+    fileXioIoctl2(dir, USBMASS_IOCTL_GET_DRIVERNAME, NULL, 0, &data.bdmDriver, sizeof(data.bdmDriver) - 1);
+    fileXioDclose(dir);
+
+    return (!strcmp(data.bdmDriver, "ata") && strlen(data.bdmDriver) == 3);
+}
+
+static int bdmGetATADeviceId()
+{
+    for (int i = 0; i < MAX_BDM_DEVICES; i++) {
+        if (bdmDeviceIsATA(i)) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+int bdmHDDIsPresent(u32 timeoutMs)
+{
+    int hdd_id = -1;
+    int timedout = 0;
+
+    if (!hddIsPresent())
+        return 0;
+
+    // 1. scan via normal methods first...
+    hdd_id = bdmGetATADeviceId();
+    if (hdd_id >= 0)
+        return 1;
+
+    // 2. try to scan as fast as possible if the previous scan fails...
+    hdd_id = 0;
+
+    for (int i = 0; i < MAX_BDM_DEVICES; i++) {
+        // find the first inaccessible device - this one should be the HDD once it's mounted (we don't have access to device data at this point yet!)
+        if (!bdmDeviceIsPresent(i)) {
+            hdd_id = i;
+            break;
+        }
+    }
+
+    if (bdmWaitForDevice(hdd_id, timeoutMs)) {
+        // double-check to see if this indeed is the HDD, and if it is, we can exit early without stalling any further
+        if (bdmDeviceIsATA(hdd_id)) {
+            return 1;
+        } else
+            LOG("bdmHDDIsPresent: device at id %d is not an ATA HDD...\n", hdd_id);
+    } else {
+        timedout = 1;
+        LOG("bdmHDDIsPresent: waiting for hdd at id %d timed out...\n", hdd_id);
+    }
+
+    // 3. last resort - time out (if needed) and scan again...
+    if (!timedout) {
+        // if we haven't timed out already, then we need to wait for the devices to wake up... wait for the timeout...
+        LOG("bdmHDDIsPresent: waiting for timeout before scanning again...\n", hdd_id);
+        DelayThread(timeoutMs * 1000);
+    }
+
+    return bdmGetATADeviceId() >= 0;
 }
 
 

src/hddsupport.c

@@ -818,6 +818,13 @@ static int hddUpdateGameListCache(hdl_games_list_t *cache, hdl_games_list_t *gam
     return result;
 }
 
+int hddIsPresent()
+{
+    // the only thing that currently uses ata_device_identify is ATA_DEVCTL_GET_HIGHEST_UDMA_MODE, so this is the best method to check for presence via xhdd (for now anyways)
+    // ideally, we'd only have ata_device_identify
+    return fileXioDevctl("xhdd0:", ATA_DEVCTL_GET_HIGHEST_UDMA_MODE, NULL, 0, NULL, 0) >= 0;
+}
+
 static char *hddGetPrefix(item_list_t *itemList)
 {
     return gHDDPrefix;

src/opl.c

@@ -800,12 +800,8 @@ static int checkLoadConfigBDM(int types)
     bdm_result = bdmFindPartition(path, "conf_opl.cfg", 0);
     // if not on USB, check BDM HDD
     if (bdm_result == 0) {
-        if (hddLoadModules() >= 0 && bdmHDDIsPresent()) {
-            // we can safely assume mass0 in this instance because this should be the only device if the previous checks failed...
-            // wait for up to 5 seconds for the HDD to spin up and become accessible...
-            if (!bdmWaitForDevice(0, 5000))
-                LOG("checkLoadConfigBDM: HDD check timeout!");
-
+        // wait for up to 5 seconds for the HDD to spin up and become accessible...
+        if (hddLoadModules() >= 0 && bdmHDDIsPresent(5000)) {
             bdm_result = bdmFindPartition(path, "conf_opl.cfg", 0);
             if (bdm_result)
                 is_hdd = 1;
@@ -1037,12 +1033,8 @@ static int trySaveConfigBDM(int types)
     bdm_result = bdmFindPartition(path, "conf_opl.cfg", 1);
     // if not on USB, check BDM HDD
     if (bdm_result == 0) {
-        if (hddLoadModules() >= 0 && bdmHDDIsPresent()) {
-            // we can safely assume mass0 in this instance because this should be the only device if the previous checks failed...
-            // wait for up to 5 seconds for the HDD to spin up and become accessible...
-            if (!bdmWaitForDevice(0, 5000))
-                LOG("trySaveConfigBDM: HDD check timeout!");
-
+        // wait for up to 5 seconds for the HDD to spin up and become accessible...
+        if (hddLoadModules() >= 0 && bdmHDDIsPresent(5000)) {
             bdm_result = bdmFindPartition(path, "conf_opl.cfg", 1);
         }
     }