Changeset 1364 in vbox for trunk

Timestamp:

Mar 9, 2007 11:56:07 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19355

Message:

Make the BIOS log prefix a single string instead of replicating it into
every format string. Also fixed printf, which failed horribly if the
argument of a %s contained % characters itself.

File:

• trunk/src/VBox/Devices/PC/BIOS/rombios.c (modified) (4 diffs)

trunk/src/VBox/Devices/PC/BIOS/rombios.c

@@ -964 +964 @@
 
 #ifdef VBOX
+static char bios_prefix_string[] = "BIOS: ";
 static char bios_cvs_version_string[] = "VirtualBox " VBOX_VERSION_STRING " built " __DATE__ " " __TIME__;
 #define BIOS_COPYRIGHT_STRING "InnoTek VirtualBox BIOS"
@@ -990 +991 @@
 #endif
 #ifdef VBOX
-#define BX_INFO(format, p...)   bios_printf(BIOS_PRINTF_INFO, "BIOS: " format, ##p)
+#define BX_INFO(format, p...)   do { put_str(BIOS_PRINTF_INFO, bios_prefix_string); bios_printf(BIOS_PRINTF_INFO, format, ##p); } while (0)
 #else /* !VBOX */
 #define BX_INFO(format, p...)   bios_printf(BIOS_PRINTF_INFO, format, ##p)
@@ -1577 +1578 @@
 }
 
+#ifdef VBOX
+void put_str(action, s)
+  Bit16u action;
+  char *s;
+{
+  if (!s)
+    s = "<NULL>";
+  else
+    while (*s != 0)
+      send(action, *s++);
+}
+#endif /* VBOX */
+
 //--------------------------------------------------------------------------
 // bios_printf()
@@ -1646 +1660 @@
           }
         else if (c == 's') {
+#ifndef VBOX
           bios_printf(action & (~BIOS_PRINTF_HALT), arg);
+#else /* VBOX */
+          put_str(action, arg);
+#endif /* VBOX */
           }
         else if (c == 'c') {