Changeset 165 for trunk/src/os2ahci/ioctl.c

Timestamp:

Jul 31, 2013, 8:08:59 PM (12 years ago)

Author:

David Azarewicz

Message:

code cleanup - debug messages
fixed defect in smart ioctl

File:

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

trunk/src/os2ahci/ioctl.c

@@ -207 +207 @@
   ic->iorb.iorbh.UnitHandle       = iorb_unit(a, p, d);
   ic->iorb.iorbh.CommandCode      = IOCC_ADAPTER_PASSTHRU;
-  ic->iorb.iorbh.CommandModifier  = (req->flags & PT_ATAPI) ? IOCM_EXECUTE_CDB
-                                                            : IOCM_EXECUTE_ATA;
+  ic->iorb.iorbh.CommandModifier  = (req->flags & PT_ATAPI) ? IOCM_EXECUTE_CDB : IOCM_EXECUTE_ATA;
   ic->iorb.iorbh.RequestControl   = IORB_ASYNC_POST;
   ic->iorb.iorbh.Timeout          = req->timeout;
@@ -234 +233 @@
   add_entry(&ic->iorb.iorbh);
 
-  /* Wait for IORB completion. On SMP kernels, ProcBlock will release
-   * all spinlocks currently held, in addition to re-enabling interrupts,
-   * so we can use spinlocks to protect the time between checking the
-   * IORB_DONE flag and calling ProcBlock.
-   *
-   * However, if OS2AHCI_SMP is not defined, we're emulating spinlocks
-   * via disabling interrupts and there's a sanity check in the emulation
-   * code to catch recursive spinlocks, thus we need to reset the emulated
-   * spinlock status before calling ProcBlock. Otherwise, the driver will
-   * will get caught in the sanity checks when processing the next IORB or
-   * interrupt while we're waiting.
-   */
+  /* Wait for IORB completion. */
   spin_lock(drv_lock);
   while (!(ic->iorb.iorbh.Status & IORB_DONE)) {
-
-#   ifndef OS2AHCI_SMP
-      drv_lock = 0;
-#   endif
-
     DevHelp_ProcBlock((ULONG) (void _far *) &ic->iorb.iorbh, 30000, 1);
-    spin_lock(drv_lock);
   }
   spin_unlock(drv_lock);
@@ -355 +337 @@
   USHORT d;
   UCHAR unit;
-  
+
   /* verify addressability of parm buffer (DSKSP_CommandParameters) */
   if (DevHelp_VerifyAccess((SEL) ((ULONG) cp >> 16),
@@ -499 +481 @@
 
   case DSKSP_SMART_ONOFF:
-    ret = do_smart(unit, (BYTE) ((parm) ? ATA_SMART_ENABLE
-                                        : ATA_SMART_DISABLE),
-                   0, 0, NULL);
+    ret = do_smart(unit, (BYTE) ((parm) ? ATA_SMART_ENABLE : ATA_SMART_DISABLE), 0, 0, NULL);
     break;
 
   case DSKSP_SMART_AUTOSAVE_ONOFF:
-    ret = do_smart(unit, ATA_SMART_AUTOSAVE,
-                   (BYTE) ((parm) ? (BYTE) 0xf1 : 0), 0, NULL);
+    ret = do_smart(unit, ATA_SMART_AUTOSAVE, (BYTE) ((parm) ? (BYTE) 0xf1 : 0), 0, NULL);
     break;
 
@@ -547 +526 @@
  * Perform SMART request. The code has been more or less copied from DANIS506.
  */
-static USHORT do_smart(BYTE unit, BYTE sub_func, BYTE cnt, BYTE lba_l,
-                       void _far *buf)
+static USHORT do_smart(BYTE unit, BYTE sub_func, BYTE cnt, BYTE lba_l, void _far *buf)
 {
   OS2AHCI_PASSTHROUGH pt;
@@ -584 +562 @@
   }
 
-  if (((ret = gen_ioctl(&ioctl)) & STERR) == 0 &&
-      sub_func == ATA_SMART_STATUS) {
+  if (((ret = gen_ioctl(&ioctl)) & STERR) == 0 && sub_func == ATA_SMART_STATUS) {
 
     /* ATA_SMART_STATUS doesn't transfer anything but instead relies on the