Changeset 209 for trunk/src/os2ahci/ata.c

Timestamp:

Mar 6, 2021, 7:44:15 PM (4 years ago)

Author:

David Azarewicz

Message:

Debugging support changes.

File:

• trunk/src/os2ahci/ata.c (modified) (12 diffs)

trunk/src/os2ahci/ata.c

@@ -263 +263 @@
       if ((sg_addr & 1) || (chunk & 1))
       {
-        DPRINTF(0,"warning: ata_cmd() called with unaligned S/G element(s)\n");
+        DPRINTF(0, DBG_PREFIX": warning: ata_cmd() called with unaligned S/G element(s)\n");
         return(ATA_CMD_UNALIGNED_ADDR);
       }
@@ -277 +277 @@
   cmd_hdr->options |= n << 16;
 
-  #ifdef DEBUG
-  if ((D32g_DbgLevel >= 5) /*|| (atapi_cmd != NULL)*/)
-  {
-    DPRINTF(0,"ATA command for %d.%d.%d, slot %d:\n", ad_no(ai), p, d, slot);
-    dHexDump(0,cmd_hdr, offsetof(AHCI_CMD_HDR, reserved), "cmd_hdr: ");
-    dHexDump(0,&ata_cmd, sizeof(ata_cmd), "ata_cmd: ");
-    if (atapi_cmd != NULL)
-    {
-      dHexDump(0,atapi_cmd, atapi_cmd_len, "atapi_cmd: ");
-    }
-    if (n > 0)
-    {
-      dHexDump(0,cmd_tbl->sg_list, sizeof(*cmd_tbl->sg_list) * n, "sg_list: ");
-    }
+  #if DEBUG & DBG_DETAILED
+  dprintf(0,"ATA command for %d.%d.%d, slot %d:\n", ad_no(ai), p, d, slot);
+  dHexDump(0,cmd_hdr, offsetof(AHCI_CMD_HDR, reserved), "cmd_hdr: ");
+  dHexDump(0,&ata_cmd, sizeof(ata_cmd), "ata_cmd: ");
+  if (atapi_cmd != NULL)
+  {
+    dHexDump(0,atapi_cmd, atapi_cmd_len, "atapi_cmd: ");
+  }
+  if (n > 0)
+  {
+    dHexDump(0,cmd_tbl->sg_list, sizeof(*cmd_tbl->sg_list) * n, "sg_list: ");
   }
   #endif
@@ -447 +444 @@
   if (rc) return 0;
 
-  DHEXDUMP(5,pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
+  DHEXDUMP(DBG_DETAILED, pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
 
   if ((pDLA->DLA_Signature1 == DLA_TABLE_SIGNATURE1) && (pDLA->DLA_Signature2 == DLA_TABLE_SIGNATURE2))
   {
-    DPRINTF(3,__func__": DLA found at sector %d\n", sector-1);
+    DPRINTF(DBG_ATTACH, DBG_PREFIX": DLA found at sector %d\n", sector-1);
     geometry->TotalCylinders = pDLA->Cylinders;
     geometry->NumHeads = pDLA->Heads_Per_Cylinder;
@@ -482 +479 @@
   int p = iorb_unit_port(pIorb);
   int d = iorb_unit_device(pIorb);
-  DPRINTF(3,__func__" (%d.%d.%d)\n", ad_no(ai), p, d);
+  dprintf(DBG_DETAILED, DBG_PREFIX": (%d.%d.%d)\n", ad_no(ai), p, d);
   #endif
 
@@ -607 +604 @@
   }
 
-  DPRINTF(2,"Physical geometry: %d cylinders, %d heads, %d sectors per track (%dMB) (%s)\n",
+  DPRINTF(DBG_ATTACH, DBG_PREFIX": Physical geometry: %d cylinders, %d heads, %d sectors per track (%dMB) (%s)\n",
       geometry->TotalCylinders, geometry->NumHeads, geometry->SectorsPerTrack,
       (ULONG)(ullTotalSectors / 2048), Method);
@@ -616 +613 @@
   else ullTotalSectors = geometry->TotalSectors;
 
-  ad_infos[a].ports[p].devs[0].dev_info.Cylinders = geometry->TotalCylinders;
-  ad_infos[a].ports[p].devs[0].dev_info.HeadsPerCylinder = geometry->NumHeads;
-  ad_infos[a].ports[p].devs[0].dev_info.SectorsPerTrack = geometry->SectorsPerTrack;
-  ad_infos[a].ports[p].devs[0].dev_info.TotalSectors = ullTotalSectors;
-  ad_infos[a].ports[p].devs[0].dev_info.Method = Method;
+  ad_infos[a].ports[p].devs[0].dev_info.ulCylinders = geometry->TotalCylinders;
+  ad_infos[a].ports[p].devs[0].dev_info.usHeadsPerCylinder = geometry->NumHeads;
+  ad_infos[a].ports[p].devs[0].dev_info.usSectorsPerTrack = geometry->SectorsPerTrack;
+  ad_infos[a].ports[p].devs[0].dev_info.ullTotalSectors = ullTotalSectors;
+  ad_infos[a].ports[p].devs[0].dev_info.pMethod = Method;
 
   //DAZ DPRINTF(2,"Reported geometry: %d cylinders, %d heads, %d sectors per track (%dMB) (%s)\n",
-  DPRINTF(0,"Reported geometry: %d cylinders, %d heads, %d sectors per track (%dMB) (%s)\n",
+  DPRINTF(DBG_ATTACH, DBG_PREFIX": Reported geometry: %d cylinders, %d heads, %d sectors per track (%dMB) (%s)\n",
       geometry->TotalCylinders, geometry->NumHeads, geometry->SectorsPerTrack,
       (ULONG)(ullTotalSectors / 2048), Method);
@@ -799 +796 @@
   }
 
-  DPRINTF(7,"ata_read_unaligned(%d.%d.%d, %lld)\n", ad_no(ai), p, d, ullLba);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": ata_read_unaligned(%d.%d.%d, %lld)\n", ad_no(ai), p, d, ullLba);
   ai->ports[p].unaligned_read_count++;
 
@@ -848 +845 @@
 
   io->BlocksXferred += add_workspace(pIorb)->blocks;
-  DPRINTF(7,__func__": blocks transferred = %d\n", io->BlocksXferred);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": blocks transferred = %d\n", io->BlocksXferred);
 
   if (io->BlocksXferred >= io->BlockCount)
@@ -1059 +1056 @@
   }
 
-  DPRINTF(7,"ata_write_unaligned(%d.%d.%d, %lld)\n", ad_no(ai), p, d, ullLba);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": ata_write_unaligned(%d.%d.%d, %lld)\n", ad_no(ai), p, d, ullLba);
 
   /* allocate transfer buffer */
@@ -1106 +1103 @@
 
   io->BlocksXferred += add_workspace(pIorb)->blocks;
-  DPRINTF(7,"ata_write_pp(): blocks transferred = %d\n", io->BlocksXferred);
+  DPRINTF(DBG_DETAILED, DBG_PREFIX": ata_write_pp(): blocks transferred = %d\n", io->BlocksXferred);
 
   if (io->BlocksXferred >= io->BlockCount)
@@ -1176 +1173 @@
   {
     /* this is not a D2H FIS - give up silently */
-    DPRINTF(3,"ata_execute_ata_pp(): D2H FIS type incorrect: %d\n", fis[0]);
+    DPRINTF(DBG_DETAILED, DBG_PREFIX": ata_execute_ata_pp(): D2H FIS type incorrect: %d\n", fis[0]);
     add_workspace(pIorb)->complete = 1;
     return;
@@ -1197 +1194 @@
                 | ((u16) fis[13] << 8);
 
-  DHEXDUMP(5,cmd, sizeof(*cmd), "ahci_execute_ata_pp(): cmd after completion:\n");
+  DHEXDUMP(DBG_DETAILED, cmd, sizeof(*cmd), "ahci_execute_ata_pp(): cmd after completion:\n");
 
   /* signal completion to interrupt handler */