- LFB flag now stored in the register VBE_DISPI_INDEX_ENABLE

- release date in Changelog fixed
- release date of VBE BIOS 0.6 was the same as VGA BIOS 0.3b
- year changed in copyright messages

5 files changed, 12 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index d49f8f1..2e2ac6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 cvs-current:
 
 vgabios-0.3b
-  - "Christophe Bothamy" <cbothamy@free.fr>: Mar 10 2002
+  - "Christophe Bothamy" <cbothamy@free.fr>: Nov 23 2002
     . added lfb-mode numbers (patch from mathis)
     . updated the Makefile
     . removed display of copyrights. 
diff --git a/vbe.c b/vbe.c
index c211114..f7c3cd1 100644
--- a/vbe.c
+++ b/vbe.c
@@ -64,7 +64,7 @@ extern Bit16u vbebios_mode_list;
 ASM_START
 // FIXME: 'merge' these (c) etc strings with the vgabios.c strings?
 _vbebios_copyright:
-.ascii       "Bochs/Plex86 VBE(C) 2002 Jeroen Janssen <japj@darius.demon.nl>"
+.ascii       "Bochs/Plex86 VBE(C) 2003 Jeroen Janssen <japj@darius.demon.nl>"
 .byte        0x00
 
 _vbebios_vendor_name:
@@ -593,8 +593,10 @@ Bit16u *AX;Bit16u BX; Bit16u ES;Bit16u DI;
         ModeInfoListItem  *cur_info;
         Boolean           using_lfb;
         Bit8u             no_clear;
+        Bit8u             lfb_flag;
 
         using_lfb=((BX & VBE_MODE_LINEAR_FRAME_BUFFER) == VBE_MODE_LINEAR_FRAME_BUFFER);
+        lfb_flag=using_lfb?VBE_DISPI_LFB_ENABLED:0;
         no_clear=((BX & VBE_MODE_PRESERVE_DISPLAY_MEMORY) == VBE_MODE_PRESERVE_DISPLAY_MEMORY)?VBE_DISPI_NOCLEARMEM:0;
 
         BX = (BX & 0x1ff);
@@ -639,7 +641,7 @@ Bit16u *AX;Bit16u BX; Bit16u ES;Bit16u DI;
                 dispi_set_yres(cur_info->info.YResolution);
                 dispi_set_bpp(cur_info->info.BitsPerPixel);
                 dispi_set_bank(0);
-                dispi_set_enable(VBE_DISPI_ENABLED | no_clear);
+                dispi_set_enable(VBE_DISPI_ENABLED | no_clear | lfb_flag);
 
                   // FIXME: store current mode in BIOS data area
   
diff --git a/vbe.h b/vbe.h
index 2edda29..4609616 100644
--- a/vbe.h
+++ b/vbe.h
@@ -296,6 +296,7 @@ typedef struct ModeInfoBlock
   
   #define VBE_DISPI_DISABLED              0x00
   #define VBE_DISPI_ENABLED               0x01
+  #define VBE_DISPI_LFB_ENABLED           0x40
   #define VBE_DISPI_NOCLEARMEM            0x80
   
   #define VBE_DISPI_LFB_PHYSICAL_ADDRESS  0xE0000000
diff --git a/vbe_display_api.txt b/vbe_display_api.txt
index 4bd449c..c2cf49b 100644
--- a/vbe_display_api.txt
+++ b/vbe_display_api.txt
@@ -32,13 +32,13 @@ API History
 
 0xb0c2            supports 0xb0c1 VBE_DISPI_ interfaces, interfaces updated for additional features:
                   VBE_DISPI_INDEX_BPP supports >8bpp color depth (value = bits)
-                  VBE_DISPI_INDEX_ENABLE supports new flag VBE_DISPI_NOCLEARMEM
+                  VBE_DISPI_INDEX_ENABLE supports new flags VBE_DISPI_NOCLEARMEM and VBE_DISPI_LFB_ENABLED
 
                   
 
 History
 -------
-  Version 0.6     (UNRELEASED)  Jeroen Janssen
+  Version 0.6     2002 Nov 23  Jeroen Janssen
                   - Added LFB support
                   - Added Virt width, height and x,y offset
                   
@@ -51,7 +51,7 @@ History
 Todo
 ----
   Version 0.6     - add virtual width, height, x offset, y offset in bios & bochs
-                    (for set/get logical scan line length andset/get display start)
+                    (for set/get logical scan line length and set/get display start)
   
   Version 0.6+    [random order]
                   - Add lots of different (A)RGB formats
@@ -107,6 +107,7 @@ Abbreviations
   
   #define VBE_DISPI_DISABLED              0x00
   #define VBE_DISPI_ENABLED               0x01
+  #define VBE_DISPI_VBE_ENABLED           0x40
   #define VBE_DISPI_NOCLEARMEM            0x80
   
   #define VBE_DISPI_LFB_PHYSICAL_ADDRESS  0xE0000000
@@ -191,6 +192,7 @@ API
     16, 24 and 32. The value of 4 is not handled in the VBE code.
   * VBE_DISPI_INDEX_ENABLE : WORD {R,W}
     The new flag VBE_DISPI_NOCLEARMEM allows to preserve the VBE video memory.
+    The new flag VBE_DISPI_LFB_ENABLED indicates the usage of the LFB.
 
 Displaying GFX
 --------------
diff --git a/vgabios.c b/vgabios.c
index 6a412fc..c1c677c 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -195,7 +195,7 @@ vgabios_date:
 .byte	0x00
 
 vgabios_copyright:
-.ascii	"(C) 2002 the LGPL VGABios developers Team"
+.ascii	"(C) 2003 the LGPL VGABios developers Team"
 .byte	0x0a,0x0d
 .byte	0x00