- fixed return value for the default case in the VBE section (non-debug mode)

- removed unused macros HALT and PANIC_PORT

6 files changed, 4 insertions, 21 deletions

diff --git a/vgabios/VGABIOS-lgpl-latest.bin b/vgabios/VGABIOS-lgpl-latest.bin
index ac7ffdd7..487e7185 100644
--- a/vgabios/VGABIOS-lgpl-latest.bin
+++ b/vgabios/VGABIOS-lgpl-latest.bin
diff --git a/vgabios/VGABIOS-lgpl-latest.cirrus.bin b/vgabios/VGABIOS-lgpl-latest.cirrus.bin
index ed817a88..af5c06ed 100644
--- a/vgabios/VGABIOS-lgpl-latest.cirrus.bin
+++ b/vgabios/VGABIOS-lgpl-latest.cirrus.bin
diff --git a/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin b/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin
index 678b0c32..c7f5c563 100644
--- a/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin
+++ b/vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin
diff --git a/vgabios/VGABIOS-lgpl-latest.debug.bin b/vgabios/VGABIOS-lgpl-latest.debug.bin
index d9415f5a..94afee23 100644
--- a/vgabios/VGABIOS-lgpl-latest.debug.bin
+++ b/vgabios/VGABIOS-lgpl-latest.debug.bin
diff --git a/vgabios/vbe.c b/vgabios/vbe.c
index ac917546..a99ab129 100644
--- a/vgabios/vbe.c
+++ b/vgabios/vbe.c
@@ -71,7 +71,7 @@ _vbebios_product_name:
 .byte        0x00
 
 _vbebios_product_revision:
-.ascii       "$Id: vbe.c,v 1.45 2004/07/22 18:37:29 vruppert Exp $"
+.ascii       "$Id: vbe.c,v 1.46 2005/05/20 16:06:52 vruppert Exp $"
 .byte        0x00
 
 _vbebios_info_string:
@@ -87,7 +87,7 @@ _no_vbebios_info_string:
 .byte 0x00
 
 msg_vbe_init:
-.ascii      "VBE Bios $Id: vbe.c,v 1.45 2004/07/22 18:37:29 vruppert Exp $"
+.ascii      "VBE Bios $Id: vbe.c,v 1.46 2005/05/20 16:06:52 vruppert Exp $"
 .byte	0x0a,0x0d, 0x00
 
 
@@ -117,23 +117,6 @@ _vbebios_mode_list:
 .word VBE_VESA_MODE_END_OF_LIST
 #endif
 
-ASM_END
-
-// from rombios.c
-#define PANIC_PORT 0x501
-
-ASM_START
-MACRO HALT
-  ;; the HALT macro is called with the line number of the HALT call.
-  ;; The line number is then sent to the PANIC_PORT, causing Bochs to
-  ;; print a BX_PANIC message.  This will normally halt the simulation
-  ;; with a message such as "BIOS panic at rombios.c, line 4091".
-  ;; However, users can choose to make panics non-fatal and continue.
-  mov dx,#PANIC_PORT
-  mov ax,#?1
-  out dx,ax 
-MEND
-
 ; DISPI ioport functions
 
 dispi_get_id:
diff --git a/vgabios/vgabios.c b/vgabios/vgabios.c
index 3df199d1..1d0b7e82 100644
--- a/vgabios/vgabios.c
+++ b/vgabios/vgabios.c
@@ -397,7 +397,7 @@ init_vga_card:
   ret
 
 msg_vga_init:
-.ascii "VGABios $Id: vgabios.c,v 1.59 2004/07/18 20:22:43 vruppert Exp $"
+.ascii "VGABios $Id: vgabios.c,v 1.60 2005/05/20 16:06:52 vruppert Exp $"
 .byte 0x0d,0x0a,0x00
 ASM_END
 
@@ -734,8 +734,8 @@ static void int10_func(DI, SI, BP, SP, BX, DX, CX, AX, DS, ES, FLAGS)
           // function failed
           AX=0x100;
           break;
-#ifdef DEBUG
          default:
+#ifdef DEBUG
           unknown();
 #endif   		 
           // function failed