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

Timestamp:

Jul 17, 2017, 4:31:51 AM (8 years ago)

Author:

David Azarewicz

Message:

Added MSI support.

File:

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

trunk/src/os2ahci/pci.c

@@ -513 +513 @@
   rc_list->NumResource = 0;
 
-  /* Register IRQ with resource manager */
-  ret = RmAddIrq(rm_drvh, &ad_info->rm_irq, irq, pin);
-  if (ret)
-  {
-    if (ret == RMRC_RES_ALREADY_CLAIMED)
-    {
-      ciiprintf("Device already claimed.");
-    }
-    else
-    {
-      iprintf("%s: couldn't register IRQ %d (rc = %s)", drv_name, irq, rmerr(ret));
-    }
-    return;
-  }
-  rc_list->hResource[rc_list->NumResource++] = ad_info->rm_irq;
-
   /* Allocate all I/O and MMIO addresses offered by this device. In theory,
    * we need only BAR #5, the AHCI MMIO BAR, but in order to prevent any
@@ -600 +584 @@
   ad_info->bus_dev_func = BusDevFunc;
   ad_info->irq = irq;
+  ad_info->irq_pin = pin;
 
   ad_info->mmio = MapPhysToLin(ad_info->mmio_phys, ad_info->mmio_size);
@@ -612 +597 @@
 
   memset(&adapter, 0x00, sizeof(adapter));
-  sprintf(tmp, "AHCI_%d Controller", ad_info_cnt);
+  snprintf(tmp, sizeof(tmp), "AHCI_%d Controller", ad_info_cnt);
   adapter.AdaptDescriptName = tmp;
   adapter.AdaptFlags        = 0;
@@ -650 +635 @@
   return;
 
-
 add_pci_fail:
   /* something went wrong; try to clean up as far as possible */
@@ -657 +641 @@
     if (ad_info->rm_bars[i] != 0) RMDeallocResource(rm_drvh, ad_info->rm_bars[i]);
   }
-  if (ad_info->rm_irq != 0) RMDeallocResource(rm_drvh, ad_info->rm_irq);
 }