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

Timestamp:

Nov 29, 2016, 5:30:22 AM (9 years ago)

Author:

David Azarewicz

Message:

Major reorganization

File:

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

trunk/src/os2ahci/apm.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Portions copyright (c) 2013-2015 David Azarewicz
+ * Portions copyright (c) 2013-2016 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -34 +34 @@
 
 #include <apmcalls.h>
-USHORT _far _cdecl apm_event    (APMEVENT _far *evt);
+USHORT _cdecl apm_event    (APMEVENT *evt);
 
 /******************************************************************************
@@ -45 +45 @@
   /* connect to APM driver */
   if ((rc = APMAttach()) != 0) {
-    dprintf("couldn't connect to APM driver (rc = %d)\n", rc);
+    DPRINTF(2,"couldn't connect to APM driver (rc = %d)\n", rc);
     return;
   }
@@ -53 +53 @@
                                    APM_NOTIFYNORMRESUME |
                                    APM_NOTIFYCRITRESUME, 0)) != 0) {
-    dprintf("couldn't register for power event notificatins (rc = %d)\n", rc);
+    DPRINTF(2,"couldn't register for power event notificatins (rc = %d)\n", rc);
     return;
   }
@@ -61 +61 @@
  * APM event handler
  */
-USHORT _far _cdecl apm_event(APMEVENT _far *evt)
+USHORT _cdecl apm_event(APMEVENT *evt)
 {
   USHORT msg = (USHORT) evt->ulParm1;
 
-  dprintf("received APM event: 0x%lx/0x%lx\n");
+  DPRINTF(2,"received APM event: 0x%x/0x%x\n");
 
   switch (msg) {
@@ -83 +83 @@
 
   default:
-    dprintf("unknown APM event; ignoring...\n");
+    DPRINTF(2,"unknown APM event; ignoring...\n");
     break;
   }
@@ -103 +103 @@
 
   if (suspended) return;
-  dprintf("suspend()\n");
+  DPRINTF(2,"suspend()\n");
 
   /* restart all ports with interrupts disabled */
@@ -112 +112 @@
     for (p = 0; p <= ai->port_max; p++) {
       /* wait until all active commands have completed on this port */
-      timer_init(&Timer, 250);
+      TimerInit(&Timer, 250);
       while (ahci_port_busy(ai, p)) {
-        if (timer_check_and_block(&Timer)) break;
+        if (TimerCheckAndBlock(&Timer)) break;
       }
 
@@ -142 +142 @@
 
   suspended = 1;
-  dprintf("suspend() finished\n");
+  DPRINTF(2,"suspend() finished\n");
 }
 
@@ -154 +154 @@
 
   if (!suspended) return;
-  dprintf("resume()\n");
+  DPRINTF(2,"resume()\n");
 
   for (a = 0; a < ad_info_cnt; a++) {
@@ -188 +188 @@
    */
   resume_sleep_flag = 5000;
-  DevHelp_ArmCtxHook(0, engine_ctxhook_h);
-
-  dprintf("resume() finished\n");
+  KernArmHook(engine_ctxhook_h, 0, 0);
+
+  DPRINTF(2,"resume() finished\n");
 }
 
@@ -207 +207 @@
   //int d;
 
-  dprintf("shutdown_driver() enter\n");
-
-  for (a = 0; a < ad_info_cnt; a++) {
+  DPRINTF(1,"shutdown_driver() enter\n");
+
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     AD_INFO *ai = ad_infos + a;
 
@@ -217 +218 @@
     for (i=0; i<50000 && ai->busy; i++) udelay(1000);
 
-    for (p = 0; p <= ai->port_max; p++) {
-      u8 _far *port_mmio = port_base(ai, p);
+    for (p = 0; p <= ai->port_max; p++)
+    {
+      u8 *port_mmio = port_base(ai, p);
 
       /* Wait up to 50ms for port to go not busy. Again stop it
@@ -246 +248 @@
 
       /* flush cache on all attached devices */
-      for (d = 0; d <= ai->ports[p].dev_max; d++) {
-        if (ai->ports[p].devs[d].present) {
+      for (d = 0; d <= ai->ports[p].dev_max; d++)
+      {
+        if (ai->ports[p].devs[d].present)
+        {
           ahci_flush_cache(ai, p, d);
         }
@@ -258 +262 @@
 
   /* restore BIOS configuration for each adapter */
-  for (a = 0; a < ad_info_cnt; a++) {
+  for (a = 0; a < ad_info_cnt; a++)
+  {
     ahci_restore_bios_config(ad_infos + a);
   }
 
-  dprintf("shutdown_driver() finished\n");
-}
-
+  DPRINTF(1,"shutdown_driver() finished\n");
+}
+