Changeset 174 for trunk/src/os2ahci/os2ahci.c

Timestamp:

Nov 10, 2013, 4:56:20 PM (12 years ago)

Author:

David Azarewicz

Message:

Fix for hardware that reports incorrect status.
Now report both real and fake devices when SCSI emulation is enabled.

File:

• trunk/src/os2ahci/os2ahci.c (modified) (4 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -1072 +1072 @@
           if (ad_info->ports[p].devs[d].present) {
             if (ad_info->ports[p].devs[d].atapi && emulate_scsi[dta][p]) {
-              /* only report this unit as SCSI unit */
+              /* report this unit as SCSI unit */
               scsi_units++;
-              continue;
+              //continue;
             }
             if (add_unit_info(iorb_conf, dta, dta, p, d, 0)) {
@@ -1101 +1101 @@
         for (p = 0; p <= ad_info->port_max; p++) {
           for (d = 0; d <= ad_info->ports[p].dev_max; d++) {
-            if (ad_info->ports[p].devs[d].present &&
-                ad_info->ports[p].devs[d].atapi &&
-                emulate_scsi[a][p]) {
+            if (ad_info->ports[p].devs[d].present && ad_info->ports[p].devs[d].atapi && emulate_scsi[a][p]) {
               if (add_unit_info(iorb_conf, dta, a, p, d, scsi_id++)) {
                 goto iocm_device_table_done;
@@ -1446 +1444 @@
  * separate function which is invoked via a context hook.
  */
-void _cdecl _far timeout_callback(ULONG timer_handle, ULONG p1,
-                                  ULONG p2)
+void _cdecl _far timeout_callback(ULONG timer_handle, ULONG p1, ULONG p2)
 {
   IORBH _far *iorb = (IORBH _far *) p1;
@@ -1502 +1499 @@
  * problems during the early boot phase.
  */
-void _cdecl _far reset_watchdog(ULONG timer_handle, ULONG p1,
-                                ULONG p2)
+void _cdecl _far reset_watchdog(ULONG timer_handle, ULONG p1, ULONG p2)
 {
   /* reset watchdog timer */