Changeset 112 for trunk/src/os2ahci/libc.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/libc.c (modified) (6 diffs)

trunk/src/os2ahci/libc.c

@@ -58 +58 @@
                                                 ULONG parm2);
 static int              mdelay_cal_end         (void);
-static int              trace_enabled          (void);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -67 +66 @@
 static char  hex_digits[] = "0123456789abcdef";
 static ULONG mem_lock;
-static ULONG com_lock;
+ULONG com_lock;
 
 /* message table for DosHelp_Save_Message() which prints the first string */
@@ -283 +282 @@
 
    if (com_base == 0) {
-    /* write debug message to trace buffer, not COM port */
-    trace(debug, len, buf);
-    spin_unlock(com_lock);
-    return;
-  }
+     /* write debug message to trace buffer, not COM port */
+     trace_write(buf, len);
+     spin_unlock(com_lock);
+     return;
+   }
 
   /* write debug message to serial port */
@@ -367 +366 @@
  * Print hex buffer to COM port.
  */
-void phex(const void _far *p, int len, u16 trace_minor_code, const char *fmt, ...)
+void phex(const void _far *p, int len, const char *fmt, ...)
 {
   va_list va;
@@ -374 +373 @@
 
   if (!debug) {
-    return;
-  }
-
-  if (!com_base) {
-    /* dump to kernel trace buffer, not serial port;
-     * just dump the buffer, it is formatted by TRACEFMT 
-     *
-     * NOTE: writing the header to the trace buffer causes
-     *       the trace facility to hick up and swallow the
-     *       binary data that follows...
-     */
-    trace(trace_minor_code, len, buf);
     return;
   }
@@ -866 +853 @@
 }
 
-/******************************************************************************
- * is_trace_enabled - checks if kernel tracing is enabled
- */
-int is_trace_enabled(void)
-{
-  int ret = 1; /* if global info seg is not present/known, 
-                * we enable tracing for now */
-
-  /* check global info segment's trace enabled bitmap if our
-   * major trace code is enabled 
-   */
-  if (gis) {
-    u8 trace_bitmap = gis->amecRAS[AHCI_TRACE_MAJOR / 8];
-    if (trace_bitmap & (0x80 >> (AHCI_TRACE_MAJOR % 8))) { 
-      ret = 1;
-    } else {
-      ret = 0;
-    }
-  }
-
-  return ret;
-}
-
-/******************************************************************************
- * trace - write a buffer to the kernel trace buffer
- */
-void trace(u16 minor_code, u16 cb_buf, const char _far *buf)
-{
-  if (!is_trace_enabled()) {
-    return;
-  }
-
-  DevHelp_RAS(AHCI_TRACE_MAJOR, minor_code, cb_buf, (PBYTE) buf);
-}
-