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

Timestamp:

Apr 10, 2013, 6:47:05 PM (12 years ago)

Author:

David Azarewicz

Message:

Begin adding user info output.
Added LVM support.

File:

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

trunk/src/os2ahci/trace.c

@@ -28 +28 @@
 
 /* -------------------------- macros and constants ------------------------- */
-
-#define AHCI_TRACE_BUF_SIZE  0x8000U /* 32k */
 
 /* ------------------------ typedefs and structures ------------------------ */
@@ -53 +51 @@
  *       a GDT selector for the trace ring buffer
  */
-void trace_init(void)
+void trace_init(u16 usBufSize)
 {
   SEL sel = 0;
+
+  if (ahci_trace_buf.phys_addr) return;
 
   /* initialize ring buffer logic */
   ahci_trace_buf.writep = 0;
   ahci_trace_buf.readp = 0;
-  ahci_trace_buf.mask = AHCI_TRACE_BUF_SIZE - 1;
+  ahci_trace_buf.mask = usBufSize - 1;
 
   if (ahci_trace_buf.phys_addr == 0) {
     /* allocate buffer */
-    if (DevHelp_AllocPhys((ULONG) AHCI_TRACE_BUF_SIZE, MEMTYPE_ABOVE_1M,
+    if (DevHelp_AllocPhys((ULONG) usBufSize, MEMTYPE_ABOVE_1M,
                          &(ahci_trace_buf.phys_addr))) {
       /* failed above 1MB, try below */
-      if (DevHelp_AllocPhys((ULONG) AHCI_TRACE_BUF_SIZE, MEMTYPE_BELOW_1M,
+      if (DevHelp_AllocPhys((ULONG) usBufSize, MEMTYPE_BELOW_1M,
                             &(ahci_trace_buf.phys_addr))) {
         /* failed, too. Give up */
         ahci_trace_buf.phys_addr = 0;
         cprintf("%s warning: failed to allocate %dk trace buffer\n",
-                drv_name, AHCI_TRACE_BUF_SIZE / 1024);
+                drv_name, usBufSize / 1024);
         return;
       }
@@ -80 +80 @@
     if (DevHelp_AllocGDTSelector(&sel, 1) ||
         DevHelp_PhysToGDTSelector(ahci_trace_buf.phys_addr,
-                                  AHCI_TRACE_BUF_SIZE, sel)) {
+                                  usBufSize, sel)) {
       /* failed; free GDT selector and physical memory we allocated before */
       if (sel) {
@@ -95 +95 @@
 
   }
-
-
 }
 
@@ -182 +180 @@
   return cb_read;
 }
-
-#ifdef NOT_USED
-/******************************************************************************
- * return number of bytes we can read from the trace buffer
- */
-u16 trace_bytes_avail(void)
-{
-
-  if (ahci_trace_buf.writep == ahci_trace_buf.readp ) return 0; /* buffer is empty */
-
-  if (ahci_trace_buf.readp <= ahci_trace_buf.writep) {
-    /* read pointer is smaller than write pointer; no wrap in between */
-    if (ahci_trace_buf.writep == ahci_trace_buf.readp) {
-      /* full buffer available */
-      return AHCI_TRACE_BUF_SIZE;
-    }
-    return ahci_trace_buf.writep - ahci_trace_buf.readp;
-  }
-
-  /* read pointer is larger than write pointer; buffer wrapped */
-  return AHCI_TRACE_BUF_SIZE - ahci_trace_buf.readp + ahci_trace_buf.writep;
-}
-#endif
 
 /******************************************************************************
@@ -251 +226 @@
   return(STDON);
 }
+
+/******************************************************************************
+ * Create adapter/port/device list for user output.
+ */
+void build_user_info(void)
+{
+  int a;
+  int p;
+  int d;
+
+  for (a = 0; a < ad_info_cnt; a++) {
+    AD_INFO *ai = ad_infos + a;
+
+    printf_nts("Adapter %d: %d:%d:%d irq=%d addr=0x%lx\n", a,
+      ai->bus, ai->dev_func>>3, ai->dev_func&7,
+      ai->irq, ai->mmio_phys);
+
+    for (p = 0; p <= ai->port_max; p++) {
+      P_INFO *pi = &ai->ports[p];
+
+      printf_nts("  Port %d:\n", p);
+
+      for (d = 0; d <= pi->dev_max; d++) {
+        if (!pi->devs[d].present) continue;
+        printf_nts("    Drive %d: atapi=%d, removable=%d\n", d, pi->devs[d].atapi, pi->devs[d].removable);
+      }
+    }
+  }
+}
+