Changeset 118 for trunk

Timestamp:

Jul 11, 2011, 11:08:37 AM (14 years ago)

Author:

Markus Thielen

Message:

include time stamps in debug log

File:

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

trunk/src/os2ahci/libc.c

@@ -58 +58 @@
                                                 ULONG parm2);
 static int              mdelay_cal_end         (void);
+static void             printf_nts             (const char *fmt, ...);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -276 +277 @@
  *        messages should never exceed 1024 bytes.
  */
-void vprintf(const char *fmt, va_list va)
+void vprintf(int ts, const char *fmt, va_list va)
 {
   static char buf[1024];
   char *s;
-  int len;
+  int len = 0;
 
   spin_lock(com_lock);
-
-  len = vsprintf(buf, fmt, va);
+  
+  if (ts) {
+    /* include timestamp */
+    if (gis) {
+      len = sprintf(buf, "[%ld] ", gis->msecs);
+    } else {
+      len = sprintf(buf, "[gis=0] ");
+    }
+  }
+
+  len += vsprintf(buf + len, fmt, va);
 
    if (com_base == 0) {
@@ -335 +345 @@
 
   va_start(va, fmt);
-  vprintf(fmt, va);
-}
+  vprintf(1, fmt, va);
+}
+
+/******************************************************************************
+ * Print messages to COM port with no time stamp
+ */
+static void printf_nts(const char *fmt, ...)
+{
+  va_list va;
+
+  va_start(va, fmt);
+  vprintf(0, fmt, va);
+}
+
 
 /******************************************************************************
@@ -383 +405 @@
   /* print header */
   va_start(va, fmt);
-  vprintf(fmt, va);
+  vprintf(1, fmt, va);
 
   /* print hex block */
   while (len > 0) {
-    printf("%Fp ", buf);
+    printf_nts("%Fp ", buf);
 
     /* print hex block */
     for (i = 0; i < 16; i++) {
       if (i < len) {
-        printf("%c%02x", ((i == 8) ? '-' : ' '), buf[i]);
+        printf_nts("%c%02x", ((i == 8) ? '-' : ' '), buf[i]);
       } else {
-        printf("   ");
+        printf_nts("   ");
       }
     }
 
     /* print ASCII block */
-    printf("   ");
+    printf_nts("   ");
     for (i = 0; i < ((len > 16) ? 16 : len); i++) {
-      printf("%c", (buf[i] >= 32 && buf[i] < 128) ? buf[i] : '.');
-    }
-    printf("\n");
+      printf_nts("%c", (buf[i] >= 32 && buf[i] < 128) ? buf[i] : '.');
+    }
+    printf_nts("\n");
 
     buf += 16;