Merge pull request #13 from NathanNeurotic/bdminit

Upstream

Author: NathanNeurotic

include/bdmsupport.h

@@ -54,6 +54,9 @@ void bdmInitSemaphore();
 void bdmEnumerateDevices();
 
 void bdmResolveLBA_UDMA(bdm_device_data_t *pDeviceData);
+int bdmWaitForDevice(int deviceId, u32 timeoutMs);
+int bdmHDDIsPresent();
 int bdmResolveDeviceRoot(char *target, int targetLength, const char *driverName, int massDeviceIndex, int massSlot);
 
+int bdmFindPartition(char *target, const char *name, int write);
 #endif

include/hddsupport.h

@@ -48,6 +48,15 @@ typedef struct
     vmc_spec_t specs;           /* Card specifications */
 } hdd_vmc_infos_t;
 
+typedef enum {
+    HDD_LOADMODULES_STATUS_ERROR = -2,
+    HDD_LOADMODULES_STATUS_UNK = -1,
+    HDD_LOADMODULES_STATUS_NOERROR,
+    HDD_LOADMODULES_STATUS_ALREADYLOADED,
+    HDD_LOADMODULES_STATUS_BUSYLOADING,
+    HDD_LOADMODULES_STATUS_COUNT,
+} hdd_loadmodules_status;
+
 int hddCheck(void);
 u32 hddGetTotalSectors(void);
 int hddIs48bit(void);
@@ -61,7 +70,7 @@ int hddDeleteHDLGame(hdl_game_info_t *ginfo);
 
 void hddInit(item_list_t *itemList);
 item_list_t *hddGetObject(int initOnly);
-void hddLoadModules(void);
+int hddLoadModules(void);
 void hddLoadSupportModules(void);
 void hddLaunchGame(item_list_t *itemList, int id, config_set_t *configSet);
 

pc/opl2iso/src/opl2iso.c

@@ -266,10 +266,10 @@ int exportGame(const char *gameid)
                 return EXIT_FAILURE;
             }
         }
+        fclose(fsrc);
     }
 
     fclose(fdest);
-    fclose(fsrc);
 
     printf("* All parts processed...\n");
 

src/bdmsupport.c

@@ -18,6 +18,7 @@
 #include <ps2sdkapi.h>
 #define NEWLIB_PORT_AWARE
 #include <fileXio_rpc.h> // fileXioIoctl, fileXioDevctl
+#include <delaythread.h>
 
 static int iUSBModLoaded = 0;
 static int iLinkModLoaded = 0;
@@ -1038,3 +1039,70 @@ int bdmUpdateDeviceData(item_list_t *itemList)
         fileXioDclose(dir);
     return 0;
 }
+
+int bdmWaitForDevice(int deviceId, u32 timeoutMs)
+{
+    const int RETRY_DELAY = 100;
+    char path[16];
+
+    u32 start = GetTimerSystemTime();
+    sprintf(path, "mass%d:/", deviceId);
+
+    while (1) {
+        int dir = fileXioDopen(path);
+
+        if (dir >= 0) {
+            fileXioDclose(dir);
+            return 1; // ready
+        }
+
+        u32 now = GetTimerSystemTime();
+        u32 elapsed_ms = (now - start) / (kBUSCLK / 1000);
+
+        if (elapsed_ms > timeoutMs) {
+            return 0; // timeout
+        }
+
+        DelayThread(RETRY_DELAY * 1000);
+    }
+}
+
+int bdmHDDIsPresent()
+{
+    // 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;
+}
+
+
+int bdmFindPartition(char *target, const char *name, int write)
+{
+    int i, fd;
+    char path[256];
+
+    for (i = 0; i < MAX_BDM_DEVICES; i++) {
+        if (gBDMPrefix[0] != '\0')
+            sprintf(path, "mass0:/", i, gBDMPrefix, name);
+        else
+            sprintf(path, "mass0:", i, name);
+        if (write)
+            fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0666);
+        else
+            fd = open(path, O_RDONLY);
+
+        if (fd >= 0) {
+            if (gBDMPrefix[0] != '\0')
+                sprintf(target, "mass0:/", i, gBDMPrefix);
+            else
+                sprintf(target, "mass0:", i);
+            close(fd);
+            return 1;
+        }
+    }
+
+    if (gBDMPrefix[0] != '\0')
+        sprintf(target, "mass0:/", gBDMPrefix);
+    else
+        sprintf(target, "mass0:");
+    return 0;
+}

src/hddsupport.c

@@ -30,6 +30,7 @@ extern u8 IOBuffer[2048];
 static unsigned char hddForceUpdate = 0;
 static unsigned char hddHDProKitDetected = 0;
 static unsigned char hddModulesLoadCount = 0;
+static unsigned char hddModulesLoaded = 0;
 static unsigned char hddSupportModulesLoaded = 0;
 
 static char *hddPrefix = "pfs0:";
@@ -174,12 +175,16 @@ static int hddCreateOPLPartition(const char *name)
     return result;
 }
 
-void hddLoadModules(void)
+int hddLoadModules(void)
 {
-    int ret;
+    int retLoadModule;
+    int retStatus = HDD_LOADMODULES_STATUS_UNK;
 
     LOG("HDDSUPPORT LoadModules %d\n", hddModulesLoadCount);
 
+    if (hddModulesLoaded)
+        retStatus = HDD_LOADMODULES_STATUS_ALREADYLOADED;
+
     if (hddModulesLoadCount == 0) {
         // Increment the load count as soon as possible to prevent thread scheduling from allowing another thread to
         // call into here and try to double load modules.
@@ -193,27 +198,34 @@ void hddLoadModules(void)
         hddHDProKitDetected = hddCheckHDProKit();
         if (hddHDProKitDetected) {
             LOG("[ATAD_HDPRO]:\n");
-            ret = sysLoadModuleBuffer(&hdpro_atad_irx, size_hdpro_atad_irx, 0, NULL);
+            retLoadModule = sysLoadModuleBuffer(&hdpro_atad_irx, size_hdpro_atad_irx, 0, NULL);
             LOG("[XHDD]:\n");
             sysLoadModuleBuffer(&xhdd_irx, size_xhdd_irx, 6, "-hdpro");
         } else {
             LOG("[BDM]:\n");
             sysLoadModuleBuffer(&bdm_irx, size_bdm_irx, 0, NULL);
             LOG("[ATAD]:\n");
-            ret = sysLoadModuleBuffer(&ps2atad_irx, size_ps2atad_irx, 0, NULL);
+            retLoadModule = sysLoadModuleBuffer(&ps2atad_irx, size_ps2atad_irx, 0, NULL);
             LOG("[XHDD]:\n");
             sysLoadModuleBuffer(&xhdd_irx, size_xhdd_irx, 0, NULL);
         }
 
-        if (ret < 0) {
+        if (retLoadModule < 0) {
             LOG("HDD: No HardDisk Drive detected.\n");
             setErrorMessageWithCode(_STR_HDD_NOT_CONNECTED_ERROR, ERROR_HDD_IF_NOT_DETECTED);
-            return;
+            retStatus = HDD_LOADMODULES_STATUS_ERROR;
+        } else {
+            retStatus = HDD_LOADMODULES_STATUS_NOERROR;
+            hddModulesLoaded = 1;
         }
-    } else
+    } else {
         hddModulesLoadCount++;
+        if (!hddModulesLoaded)
+            retStatus = HDD_LOADMODULES_STATUS_BUSYLOADING;
+    }
 
     LOG("HDDSUPPORT LoadModules done\n");
+    return retStatus;
 }
 
 // Returns 1 for MBR/GPT, 0 for APA, and -1 if an error occured