Changeset 171 for trunk/src/os2ahci/trace.c

Timestamp:

Sep 7, 2013, 5:52:45 PM (12 years ago)

Author:

David Azarewicz

Message:

Enhanced debug output
Fixed a long time PCI ID bug.

File:

• trunk/src/os2ahci/trace.c (modified) (3 diffs)

trunk/src/os2ahci/trace.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Portions copyright (c) 2013 David Azarewicz
+ * Copyright (c) 2013 David Azarewicz
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -210 +210 @@
  * Create adapter/port/device list for user output.
  */
-void build_user_info(void)
+void build_user_info(int check)
 {
   int a;
@@ -216 +216 @@
   int d;
 
+  if ( check && (ahci_trace_buf.readp != ahci_trace_buf.writep)) return;
+
   for (a = 0; a < ad_info_cnt; a++) {
     AD_INFO *ai = ad_infos + a;
 
-    ntprintf("Adapter %d: PCI=%d:%d:%d ID=%04x:%04x irq=%d addr=0x%lx version=%lx\n", a,
+    ntprintf("Adapter %d: PCI=%d:%d:%d ID=%04x:%04x %s %s irq=%d addr=0x%lx version=%lx\n", a,
       ai->bus, ai->dev_func>>3, ai->dev_func&7,
-      ai->pci->vendor, ai->pci->device,
+      ai->pci_vendor, ai->pci_device, vendor_from_id(ai->pci_vendor), ai->pci->chipname,
       ai->irq, ai->mmio_phys,
       ai->bios_config[HOST_VERSION / sizeof(u32)]);