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

Timestamp:

Sep 1, 2011, 1:32:43 PM (14 years ago)

Author:

Markus Thielen

Message:

• added support for /q switch (#7)
• added cv#printf macros to support verbosity setting from command line

File:

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

trunk/src/os2ahci/pci.c

@@ -417 +417 @@
   memset(&parm, 0x00, sizeof(parm));
   if (oemhlp_call(OH_BIOS_INFO, &parm, &data) != OH_SUCCESS) {
-    cprintf("couldn't get PCI BIOS information\n");
+    cprintf("%s: couldn't get PCI BIOS information\n", drv_name);
     return;
   }
@@ -614 +614 @@
 
   /* found a supported AHCI device */
-  if (verbosity > 0) {
-    cprintf("found AHCI device: %s %s (%04x:%04x)\n"
+  cvvprintf("found AHCI device: %s %s (%04x:%04x)\n"
             " class:0x%06lx bus:%d devfunc:0x%02x\n",
             vendor_from_id(vendor), device_from_id(device),
             vendor, device,
             class, bus, dev_func);
-  }
 
   /* make sure we got room in the adapter information array */
   if (ad_info_cnt >= MAX_AD - 1) {
-    cprintf("error: too many AHCI devices\n");
+    cprintf("%s: too many AHCI devices\n", drv_name);
     return;
   }
@@ -665 +663 @@
   ret = RMAllocResource(rm_drvh, &ad_info->rm_irq, &resource);
   if (ret != RMRC_SUCCESS) {
-    cprintf("error: couldn't register IRQ %d (rc = %s)\n", irq, rmerr(ret));
+    cprintf("%s: couldn't register IRQ %d (rc = %s)\n", drv_name, irq, rmerr(ret));
     return;
   }
@@ -689 +687 @@
     if (i == AHCI_PCI_BAR) {
       if (resource.ResourceType != RS_TYPE_MEM) {
-        cprintf("error: BAR #5 must be an MMIO region\n");
+        cprintf("%s: BAR #5 must be an MMIO region\n", drv_name);
         goto add_pci_fail;
       }
@@ -700 +698 @@
     ret = RMAllocResource(rm_drvh, ad_info->rm_bars + i, &resource);
     if (ret != RMRC_SUCCESS) {
-      cprintf("error: couldn't register [MM]IO region (rc = %s)\n", rmerr(ret));
+      cprintf("%s: couldn't register [MM]IO region (rc = %s)\n", 
+              drv_name, rmerr(ret));
       goto add_pci_fail;
     }
@@ -707 +706 @@
 
   if (ad_info->mmio_phys == 0) {
-    cprintf("error: couldn't determine MMIO base address\n");
+    cprintf("%s: couldn't determine MMIO base address\n", drv_name);
     goto add_pci_fail;
   }
@@ -724 +723 @@
   if (DevHelp_AllocPhys((long) AHCI_PORT_PRIV_DMA_SZ * AHCI_MAX_PORTS,
                         MEMTYPE_ABOVE_1M, &ad_info->dma_buf_phys) != 0) {
-    cprintf("error: couldn't allocate DMA scratch buffers for AHCI ports\n");
+    cprintf("%s: couldn't allocate DMA scratch buffers for AHCI ports\n", drv_name);
     ad_info->dma_buf_phys = 0;
     goto add_pci_fail;
@@ -731 +730 @@
   /* allocate GDT selectors for memory-mapped I/O and DMA scratch buffers */
   if (DevHelp_AllocGDTSelector(gdt, PORT_DMA_BUF_SEGS + 1) != 0) {
-    cprintf("error: couldn't allocate GDT selectors\n");
+    cprintf("%s: couldn't allocate GDT selectors\n", drv_name);
     memset(gdt, 0x00, sizeof(gdt));
     goto add_pci_fail;
@@ -739 +738 @@
   if (DevHelp_PhysToGDTSelector(ad_info->mmio_phys,
                                 (USHORT) ad_info->mmio_size, gdt[0]) != 0) {
-    cprintf("error: couldn't map MMIO address to GDT selector\n");
+    cprintf("%s: couldn't map MMIO address to GDT selector\n", drv_name);
     goto add_pci_fail;
   }
@@ -749 +748 @@
 
     if (DevHelp_PhysToGDTSelector(addr, len, gdt[i+1]) != 0) {
-      cprintf("error: couldn't map DMA scratch buffer to GDT selector\n");
+      cprintf("%s: couldn't map DMA scratch buffer to GDT selector\n", drv_name);
       goto add_pci_fail;
     }
@@ -780 +779 @@
   ret = RMCreateAdapter(rm_drvh, &ad_info->rm_adh, &adapter, NULL, rc_list);
   if (ret != RMRC_SUCCESS) {
-    cprintf("error: couldn't register adapter (rc = %s)\n", rmerr(ret));
+    cprintf("%s: couldn't register adapter (rc = %s)\n", drv_name, rmerr(ret));
     goto add_pci_fail;
   }
@@ -827 +826 @@
   parm.read_config.size     = size;
   if ((rc = oemhlp_call(OH_READ_CONFIG, &parm, &data) != OH_SUCCESS)) {
-    cprintf("error: couldn't read config space (bus = %d, dev_func = 0x%02x, indx = 0x%02x, rc = %d)\n",
-            bus, dev_func, indx,  rc);
+    cprintf("%s: couldn't read config space (bus = %d, dev_func = 0x%02x, indx = 0x%02x, rc = %d)\n",
+            drv_name, bus, dev_func, indx,  rc);
     return(rc);
   }
@@ -854 +853 @@
 
   if ((rc = oemhlp_call(OH_WRITE_CONFIG, &parm, &data) != OH_SUCCESS)) {
-    cprintf("error: couldn't write config space (bus = %d, dev_func = 0x%02x, indx = 0x%02x, rc = %d)\n",
-            bus, dev_func, indx, rc);
+    cprintf("%s: couldn't write config space (bus = %d, dev_func = 0x%02x, indx = 0x%02x, rc = %d)\n",
+            drv_name, bus, dev_func, indx, rc);
     return(rc);
   }
@@ -877 +876 @@
         oemhlp.ProtIDCEntry == NULL ||
         oemhlp.ProtIDC_DS == 0) {
-      cprintf("couldn't attach to OEMHLP$\n");
+      cprintf("%s: couldn't attach to OEMHLP$\n", drv_name);
       return(OH_NOT_SUPPORTED);
     }
@@ -973 +972 @@
       pci_write_conf(bus, dev_func, PCI_BAR(i), sizeof(u32), bar_addr)  != OH_SUCCESS) {
 
-    cprintf("error: couldn't determine [MM]IO size\n");
+    cprintf("%s: couldn't determine [MM]IO size\n", drv_name);
     if (bar_addr != 0) {
       pci_write_conf(bus, dev_func, PCI_BAR(i), sizeof(u32), bar_addr);