Changeset 63 for trunk/src/os2ahci/ctxhook.c

Timestamp:

Dec 18, 2010, 3:10:02 PM (15 years ago)

Author:

markus

Message:

added feature byte to ATAPI commands; fixed request sense CDB

File:

• trunk/src/os2ahci/ctxhook.c (modified) (1 diff)

trunk/src/os2ahci/ctxhook.c

@@ -120 +120 @@
         ccs = (int) ((readl(port_mmio + PORT_CMD) >> 8) & 0x0f);
 
-        for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
+       for (iorb = ai->ports[p].iorb_queue.root; iorb != NULL; iorb = next) {
           ADD_WORKSPACE _far *aws = add_workspace(iorb);
           next = iorb->pNxtIORB;
 
           if (aws->queued_hw) {
-            if (ai->ports[p].ncq_cmds != 0) {
+            if (ai->ports[p].ncq_cmds & (1UL << aws->cmd_slot)) {
               /* NCQ commands active; force non-NCQ mode and trigger port reset */
+              ai->ports[p].ncq_cmds &= ~(1UL << aws->cmd_slot);
               aws->no_ncq = 1;
               need_reset = 1;
             } else if (aws->cmd_slot == ccs) {
               /* this is the non-NCQ comand that failed */
+              ai->ports[p].reg_cmds &= ~(1UL << aws->cmd_slot);
               problem_iorb = iorb;
             }
             iorb_requeue(iorb);
-
-            /* remove requeued command from the issued command bitmaps */
-            ai->ports[p].ncq_cmds &= ~(1UL << p);
-            ai->ports[p].reg_cmds &= ~(1UL << p);
           }
         }