Changeset 66 for trunk/src/os2ahci/ahci.c

Timestamp:

Dec 23, 2010, 11:06:03 PM (15 years ago)

Author:

chris

Message:

• Added code to dprintf TF_DATA register in restart_ctxhook
• Cleaned up aws_free() calls; in a nutshell, aws_free() will always be called when IORBs complete (successfully or with an error) and this is now verified; redundant invocations of aws_free() have been removed.
• atapi_req_sense_pp() now sets the iorb_workspace(iorb)->complete = 1

File:

• trunk/src/os2ahci/ahci.c (modified) (4 diffs)

trunk/src/os2ahci/ahci.c

@@ -235 +235 @@
   if (ai->pci->vendor == PCI_VENDOR_ID_JMICRON &&
       ai->pci->device == 0x2361 && ai->port_map != 1) {
-    dprintf("JMB361 has only one port, port_map 0x%x -> 0x%x\n", ai->port_map, 1);
+    dprintf("JMB361 has only one port, port_map 0x%lx -> 0x%lx\n", ai->port_map, 1);
     ai->port_map = 1;
   }
@@ -1029 +1029 @@
 
   if (add_workspace(iorb)->complete | (iorb->Status | IORB_ERROR)) {
-    aws_free(add_workspace(iorb));
     iorb_done(iorb);
   }
@@ -1230 +1229 @@
 
       if (aws->complete) {
-        /* this IORB is complete */
-        aws_free(aws);
-
-        /* move IORB to our temporary done queue */
+        /* this IORB is complete; move IORB to our temporary done queue */
         iorb_queue_del(&ai->ports[p].iorb_queue, iorb);
         iorb_queue_add(&done_queue, iorb);
@@ -1250 +1246 @@
     next = iorb->pNxtIORB;
     iorb->Status = IORB_DONE;
+    aws_free(iorb_workspace(iorb));
     if (iorb->RequestControl & IORB_ASYNC_POST) {
       iorb->NotifyAddress(iorb);