- output to the vgabios info port can be disabled now. It is still enabled by

  default and always possible in debug mode. (based on a patch from Alex Beregszaszi)

2 files changed, 12 insertions, 1 deletions

diff --git a/vbe.c b/vbe.c
index f80402f..a9e7f31 100644
--- a/vbe.c
+++ b/vbe.c
@@ -86,10 +86,11 @@ _no_vbebios_info_string:
 .byte	0x0a,0x0d
 .byte 0x00
 
+#if defined(USE_BX_INFO) || defined(DEBUG)
 msg_vbe_init:
 .ascii      "VBE Bios $Id$"
 .byte	0x0a,0x0d, 0x00
-
+#endif
 
 #ifndef DYN_LIST
 // FIXME: for each new mode add a statement here
@@ -474,11 +475,13 @@ vbe_init:
   mov  ax, # VBE_DISPI_ID3
   call dispi_set_id
 no_vbe_interface:
+#if defined(USE_BX_INFO) || defined(DEBUG)
   mov  bx, #msg_vbe_init
   push bx
   call _printf
   inc  sp
   inc  sp
+#endif
   ret
 
 ; VBE Display Info - Display information on screen about the VBE
diff --git a/vgabios.c b/vgabios.c
index 2c9cf37..cbff92c 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -54,6 +54,8 @@
 #include "vbe.h"
 #endif
 
+#define USE_BX_INFO
+
 /* Declares */
 static Bit8u          read_byte();
 static Bit16u         read_word();
@@ -389,16 +391,20 @@ init_vga_card:
   mov al, #0x02
   outb dx,al
 
+#if defined(USE_BX_INFO) || defined(DEBUG)
   mov  bx, #msg_vga_init
   push bx
   call _printf
+#endif
   inc  sp
   inc  sp
   ret
 
+#if defined(USE_BX_INFO) || defined(DEBUG)
 msg_vga_init:
 .ascii "VGABios $Id$"
 .byte 0x0d,0x0a,0x00
+#endif
 ASM_END
 
 // --------------------------------------------------------------------------------------------
@@ -3516,6 +3522,7 @@ void unknown()
 #endif
 
 // --------------------------------------------------------------------------------------------
+#if defined(USE_BX_INFO) || defined(DEBUG) || defined(CIRRUS_DEBUG)
 void printf(s)
   Bit8u *s;
 {
@@ -3567,6 +3574,7 @@ void printf(s)
     s ++;
     }
 }
+#endif
 
 #ifdef VBE
 #include "vbe.c"