CVS: The file 'linux/drivers/char/bluetooth/btdebug.c' has been modified.

[Mattias A. <mat...@us...>]

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btdebug.c       1.17            1.18=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

* added time diff since last debug printout



The diff of the modified file(s):

--- btdebug.c	2001/03/02 21:52:15	1.17
+++ btdebug.c	2001/03/30 10:28:20	1.18
@@ -66,24 +66,45 @@
 #ifdef __KERNEL__
=20
 static u8 buf[20];
+static struct timeval tv_old =3D {0,0};
=20=20
 u8* print_time(s32 use_stdout)
 {
-	s32 len;
+	s32 len, diff;
 	struct timeval tv;=20=20
 	do_gettimeofday(&tv);
+=09
+	diff =3D ((tv.tv_sec - tv_old.tv_sec)*1000000 + tv.tv_usec) -=20
+		tv_old.tv_usec;
+=09
 	if (use_stdout=3D=3D1) {
-		printk(buf, "[%d,%d] ", tv.tv_sec, tv.tv_usec);
-		return NULL;
+		printk("[%03d,%08d|%06d] ",=20
+		       (int)tv.tv_sec, (int)tv.tv_usec, diff);
 	}
 	else
 	{=20=20
-		len =3D sprintf(buf, "[%d,%d]", (int)tv.tv_sec, (int)tv.tv_usec);
+		len =3D sprintf(buf, "[%03d,%08d|%06d] ",=20
+			      (int)tv.tv_sec, tv.tv_usec, diff);
 		buf[len]=3D0;
 	}
+	tv_old =3D tv;
 	return buf;
 }
=20
+void=20
+print_data(const u8 *message, u8 *buf, s32 len)
+{=20
+	s32 t;
+	printk("\n%s (%d)", message, len);
+	for (t=3D0;t<len;t++)=20
+	{
+		if((t%16)=3D=3D0)
+			printk("\n   ");
+		printk("0x%02x ", buf[t]);
+	}
+	printk("\n");
+}
+
 #else
 /* No timestamps in usermode yet */
 char* print_time(int use_stdout)
@@ -92,19 +113,21 @@
 	return "No timestamps in usermode stack yet\n";
 }
=20
-#endif
 void=20
 print_data(const u8 *message, u8 *buf, s32 len)
 {=20
 	s32 t;
-	printk("\n%s (%d)", message, len);
+	printf("\n%s (%d)", message, len);
 	for (t=3D0;t<len;t++)=20
 	{
 		if((t%16)=3D=3D0)
 			printk("\n   ");
-		printk("0x%02x ", buf[t]);
+		printf("0x%02x ", buf[t]);
 	}
-	printk("\n");
+	printf("\n");
 }
+
+#endif
+
=20
 /****************** END OF FILE debug.c **********************************=
***/