Changeset 111 for trunk/src/os2ahci/libc.c

Timestamp:

Jun 27, 2011, 6:40:13 PM (14 years ago)

Author:

Markus Thielen

Message:

added support for os2trace (buggy; messages get swallowed); reverted last change that ignored unknown command line arguments

File:

• trunk/src/os2ahci/libc.c (modified) (9 diffs)

trunk/src/os2ahci/libc.c

@@ -58 +58 @@
                                                 ULONG parm2);
 static int              mdelay_cal_end         (void);
+static int              trace_enabled          (void);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -98 +99 @@
 static ULONG heap_phys_addr;
 
+/* global info segment */
+volatile PGINFOSEG gis;
+
+
 /* ----------------------------- start of code ----------------------------- */
 
@@ -105 +110 @@
 void init_libc(void)
 {
+  PSEL p;
+
   DevHelp_CreateSpinLock(&mem_lock);
   DevHelp_CreateSpinLock(&com_lock);
 
   DevHelp_VirtToPhys(heap_buf, &heap_phys_addr);
+
+  /* get global info segment */
+  if (DevHelp_GetDOSVar(DHGETDOSV_SYSINFOSEG, 0, (PPVOID) &p) == 0) {
+    gis = (PGINFOSEG) ((u32) *p << 16);
+  }
+
 }
 
@@ -263 +276 @@
   static char buf[1024];
   char *s;
+  int len;
 
   spin_lock(com_lock);
 
-  vsprintf(buf, fmt, va);
+  len = vsprintf(buf, fmt, va);
+
+   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 serial port */
@@ -329 +350 @@
   vsprintf(buf, fmt, va);
 
-  if (debug) {
+  if (debug && com_base != 0) {
     /* print the same message to COM1 as well */
     printf("%s", buf);
@@ -346 +367 @@
  * Print hex buffer to COM port.
  */
-void phex(const void _far *p, int len, const char *fmt, ...)
+void phex(const void _far *p, int len, u16 trace_minor_code, const char *fmt, ...)
 {
   va_list va;
@@ -353 +374 @@
 
   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;
   }
@@ -705 +738 @@
 void msleep(u32 millies)
 {
-  volatile PGINFOSEG gis;
   ULONG start;
   ULONG end;
-  PSEL p;
-
-  if (DevHelp_GetDOSVar(DHGETDOSV_SYSINFOSEG, 0, (PPVOID) &p)) {
+
+  if (gis == NULL) {
     /* no global info segment; use mdelay() */
     mdelay(millies);
     return;
   }
-  gis = (PGINFOSEG) ((u32) *p << 16);
+
   start = gis->msecs;
   end = start + millies;
@@ -834 +865 @@
   return(mdelay_cal_status == MD_CALIBRATION_END);
 }
+
+/******************************************************************************
+ * 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);
+}
+