Changeset 112 for trunk/src/os2ahci/os2ahci.c

Timestamp:

Jul 6, 2011, 10:02:47 AM (14 years ago)

Author:

Markus Thielen

Message:

• removed RAS calls (tracing to OS/2 kernel trace buffer was unreliable)
• added private trace ring buffer implementation
• support read from OS2AHCI$ character device
• contents of trace ring buffer are accesible via OS2AHCI$ character device
• updated WATCOM makefile; WATCOM build still produces a non-working driver
• code cleanup (unused variables etc.)

File:

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

trunk/src/os2ahci/os2ahci.c

@@ -140 +140 @@
     break;
 
+  case CMDINPUT:
+    rc = char_dev_input((RP_RWV _far *) req);
+    break;
+    
   default:
     rc = STDON | STATUS_ERR_UNKCMD;
@@ -313 +317 @@
   }
 
+  /* initialize trace buffer if applicable */
+  if (TRACE_ACTIVE) {
+    /* debug is on, but COM port is off -> use our trace buffer */
+    trace_init();
+  }
+
   /* scan PCI bus for supported devices */
   scan_pci_bus();
@@ -383 +393 @@
 
     }
+  }
+  return(STDON | STATUS_ERR_UNKCMD);
+}
+
+/******************************************************************************
+ * Read from character device. If tracing is on (internal ring buffer trace),
+ * we return data from the trace buffer; if not, we might return a device
+ * dump similar to IBM1S506.ADD/DANIS506.ADD (TODO).
+ */
+USHORT char_dev_input(RP_RWV _far *rwrb)
+{
+  if (TRACE_ACTIVE) {
+    return(trace_char_dev(rwrb));
   }
   return(STDON | STATUS_ERR_UNKCMD);