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

Timestamp:

May 31, 2013, 11:15:02 PM (12 years ago)

Author:

David Azarewicz

Message:

Suspend/resume changes

File:

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

trunk/src/os2ahci/os2ahci.c

@@ -135 +135 @@
 int             init_complete;     /* if != 0, initialization has completed */
 int             suspended;
+int             resume_sleep_flag;
 
 /* apapter/port-specific options saved when parsing the command line */
@@ -222 +223 @@
   init_drv_called = 1;
   suspended = 0;
+  resume_sleep_flag = 0;
 
   /* set device helper entry point */
@@ -513 +515 @@
  * Device driver exit handler. This handler is called when OS/2 shuts down and
  * flushes the write caches of all attached devices. Since this is effectively
- * the same we do when suspending, we'll call out to the corresponding APM
+ * the same we do when suspending, we'll call out to the corresponding suspend
  * function.
  *
@@ -619 +621 @@
  * all IORBs have been sent.
  *
- * NOTE: While initialization has not completed (or during APM suspend/resume
+ * NOTE: While initialization has not completed (or during suspend/resume
  *       operations), this function will loop indefinitely because we can't
  *       rely on interrupt handlers or context hooks and complex IORBs
@@ -742 +744 @@
    * IORB.
    */
-  while (suspended) DevHelp_ProcBlock((ULONG)&send_iorb, 1, WAIT_IS_INTERRUPTABLE);
   add_workspace(iorb)->processing = 1;
   spin_unlock(drv_lock);
@@ -817 +818 @@
       }
 
+      #ifdef LEGACY_APM
       /* register APM hook */
       apm_init();
+      #endif
 
       if (!TRACE_ACTIVE) build_user_info();