Changeset 182 for trunk/src/os2ahci/pci.c

Timestamp:

Dec 13, 2016, 10:30:24 PM (9 years ago)

Author:

David Azarewicz

Message:

Rearranged CAPS configuration.

File:

• trunk/src/os2ahci/pci.c (modified) (2 diffs)

trunk/src/os2ahci/pci.c

@@ -602 +602 @@
   if (!ad_info->mmio) goto add_pci_fail;
 
-  /* fill in DMA scratch buffer addresses in adapter info */
-  for (i = 0; i < AHCI_MAX_PORTS; i++)
-  {
-    ad_info->dma_buf[i] = MemAlloc(AHCI_PORT_PRIV_DMA_SZ);
-    ad_info->dma_buf_phys[i] = MemPhysAdr(ad_info->dma_buf[i]);
-  }
-
   /* register adapter with resource manager */
   memset(&adj, 0x00, sizeof(adj));
@@ -634 +627 @@
   }
 
+  if (ahci_config_caps(ad_info)) goto add_pci_fail;
+
+  #ifndef DAZ_NEW_CODE
+  /* fill in DMA scratch buffer addresses in adapter info */
+  for (i = 0; i < ad_info->hw_ports; i++)
+  {
+    ad_info->dma_buf[i] = MemAlloc(AHCI_PORT_PRIV_DMA_SZ);
+    ad_info->dma_buf_phys[i] = MemPhysAdr(ad_info->dma_buf[i]);
+  }
+  #endif
+
   /* Successfully added the adapter and reserved its resources; the adapter
    * is still under BIOS control so we're not going to do anything else at
    * this point.
    */
+
   ad_info_cnt++;
   return;