Merge pull request #858 from pcm720/atad-probe-fix

ATAD: fix device probing for slave device

Author: rickgaiser

iop/dev9/atad/src/ps2atad.c

@@ -1221,24 +1221,24 @@ static int ata_init_devices(ata_devinfo_t *devinfo)
     int i, res;
     u32 total_sectors_nonlba48, total_sectors_lba48;
 
-    if ((res = sceAtaSoftReset()) != 0)
-        return res;
+    /* Probe devices */
+    for (i = 0; i < 2; i++) {
+        if ((res = sceAtaSoftReset()) != 0)
+            return res;
+
+        ata_device_select(i);
+        if (ata_hwport->r_control & 0xff)
+            ata_device_probe(&devinfo[i]);
+        else
+            devinfo[i].exists = 0;
+    }
 
-    ata_device_probe(&devinfo[0]);
     if (!devinfo[0].exists) {
         M_PRINTF("Error: Unable to detect HDD 0.\n");
         devinfo[1].exists = 0;
         return ATA_RES_ERR_NODEV; // Returns 0 in v1.04.
     }
 
-    /* If there is a device 1, grab it's info too.  */
-    if ((res = ata_device_select(1)) != 0)
-        return res;
-    if (ata_hwport->r_control & 0xff)
-        ata_device_probe(&devinfo[1]);
-    else
-        devinfo[1].exists = 0;
-
 #ifdef ATA_USE_DEV9
     ata_pio_mode(0); // PIO mode is set here, in late ATAD versions.
 #endif