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

Timestamp:

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

Author:

David Azarewicz

Message:

Suspend/resume changes

File:

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

trunk/src/os2ahci/apm.c

@@ -1 +1 @@
 /******************************************************************************
- * apm.c - Functions to interface with the APM driver.
+ * apm.c - Functions to interface with the legacy APM driver, and suspend / resume functions.
  *
  * Copyright (c) 2011 thi.guten Software Development
@@ -27 +27 @@
 #include "os2ahci.h"
 
+/* Legacy APM support is not needed on eCS systems with ACPI and is more
+ * reliable without it enabled.
+ */
+#ifdef LEGACY_APM
+
 #include <apmcalls.h>
-
-/* -------------------------- macros and constants ------------------------- */
-
-/* ------------------------ typedefs and structures ------------------------ */
-
-/* -------------------------- function prototypes -------------------------- */
-
-/* ------------------------ global/static variables ------------------------ */
-
 USHORT _far _cdecl apm_event    (APMEVENT _far *evt);
-
-/* ----------------------------- start of code ----------------------------- */
 
 /******************************************************************************
@@ -94 +88 @@
   return(0);
 }
+#endif /* LEGACY_APM */
 
 /******************************************************************************
@@ -143 +138 @@
   init_complete = 0;
 
-#if 0
-  /* restore BIOS configuration for each adapter and release the adapter */
-  for (a = 0; a < ad_info_cnt; a++) {
-    ahci_restore_bios_config(ad_infos + a);
-  }
-#endif
-
   /* TODO: put the device into the D3 state */
 
@@ -171 +159 @@
   for (a = 0; a < ad_info_cnt; a++) {
     AD_INFO *ai = ad_infos + a;
+
+    //ahci_reset_controller(ai);
 
     /* Complete initialization of this adapter; this will restart the ports
@@ -184 +174 @@
   /* unlock all adapters now that we have set the init_complete flag */
   for (a = 0; a < ad_info_cnt; a++) {
-    unlock_adapter(ad_infos + a);
+    AD_INFO *ai = ad_infos + a;
+    unlock_adapter(ai);
   }
 
   suspended = 0;
+
+  /* restart engine to resume IORB processing */
+  resume_sleep_flag = 5000;
+  DevHelp_ArmCtxHook(0, engine_ctxhook_h);
+
   dprintf("resume() finished\n");
 }