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

Timestamp:

May 31, 2013, 2:03:41 AM (12 years ago)

Author:

David Azarewicz

Message:

fixed trap dump kernel exit, some work on suspend/resume routines

File:

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

trunk/src/os2ahci/os2ahci.c

@@ -408 +408 @@
   }
 
-  printf_nts("BldLevel: %s\n", BldLevel);
-  printf_nts("CmdLine: %Fs\n", cmd_line);
+  ntprintf("BldLevel: %s\n", BldLevel);
+  ntprintf("CmdLine: %Fs\n", cmd_line);
 
   /* scan PCI bus for supported devices */
@@ -489 +489 @@
     break;
 
-  case OS2AHCI_IDC_CATEGORY:
-    switch (ioctl->Function) {
-
-    case OS2AHCI_IDC_BIOSMODE:
-      /* reconfigure adapters in BIOS/int13 mode; needed for generating
-       * trap dumps on some machines. This was intended to be called by ACPI.PSD,
-       * but that is never done. This is obslete. The kernel exit accomplishes
-       * this instead.
-       *
-       * To enter BIOS mode, we flush all write caches, turn off interrupts
-       * and restore the BIOS configuration. This is exactly what
-       * apm_suspend() does.
-       */
-      apm_suspend();
-      return(STDON);
-
-    case OS2AHCI_IDC_BEEP:
-      /* IOCTL for IDC testing - just beep */
-      DevHelp_Beep(2000, 100);
-      return(STDON);
-    }
-    break;
-
   case DSKSP_CAT_GENERIC:
     return(ioctl_gen_dsk(ioctl));
@@ -552 +529 @@
   }
 
-  apm_suspend();
+  suspend();
   return(STDON);
 }
@@ -564 +541 @@
   dprintf("sr_drv(%d) called\n", func);
 
-  if (func) apm_resume();
-  else apm_suspend();
+  if (func) resume();
+  else suspend();
 
   return(STDON);
@@ -765 +742 @@
    * IORB.
    */
+  while (suspended) DevHelp_ProcBlock((ULONG)&send_iorb, 1, WAIT_IS_INTERRUPTABLE);
   add_workspace(iorb)->processing = 1;
   spin_unlock(drv_lock);
@@ -1263 +1241 @@
 
     if (debug > min_debug) {
-      printf("IORB %Fp queued (cmd = %d/%d, queue = %Fp [%s], timeout = %ld)\n",
+      aprintf("IORB %Fp queued (cmd = %d/%d, queue = %Fp [%s], timeout = %ld)\n",
              iorb, iorb->CommandCode, iorb->CommandModifier, queue, queue_type,
              iorb->Timeout);