Changeset 69047 in vbox for trunk/src/VBox/Devices/Graphics/BIOS

Timestamp:

Oct 11, 2017 4:24:38 PM (7 years ago)

Author:

vboxsync

Message:

DevVGA+VGABIOS: eliminate defines (VBE_NEW_DYN_LIST and VRAM_SIZE_FIX) which are always there, since the other path is long obsolete

File:

• trunk/src/VBox/Devices/Graphics/BIOS/vbe.c (modified) (16 diffs)

trunk/src/VBox/Devices/Graphics/BIOS/vbe.c

@@ -38 +38 @@
  * of the LGPL is applied is otherwise unspecified.
  */
-
-// Use VBE new dynamic mode list.  Note that without this option, no
-// checks are currently done to make sure that modes fit into the
-// framebuffer!
-#define VBE_NEW_DYN_LIST
 
 #include <inttypes.h>
@@ -169 +164 @@
 }
 
-#ifdef VBE_NEW_DYN_LIST
 uint8_t in_byte(uint16_t port, uint16_t addr)
 {
@@ -175 +169 @@
     return inb(port);
 }
-#endif
 
 /* Display "chip" identification helpers. */
@@ -207 +200 @@
 
 /* Find the offset of the desired mode, given its number. */
-#ifdef VBE_NEW_DYN_LIST
 static uint16_t mode_info_find_mode(uint16_t mode, Boolean using_lfb)
 {
@@ -246 +238 @@
     return 0;
 }
-#else
-static ModeInfoListItem* mode_info_find_mode(uint16_t mode, Boolean using_lfb)
-{
-    ModeInfoListItem    *cur_info = &mode_info_list;
-
-    while (cur_info->mode != VBE_VESA_MODE_END_OF_LIST)
-    {
-        if (cur_info->mode == mode)
-        {
-            if (!using_lfb)
-                return cur_info;
-            else if (cur_info->info.ModeAttributes & VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE)
-                return cur_info;
-            else
-                cur_info++;
-        } else
-            cur_info++;
-    }
-    return 0;
-}
-#endif
 
 #ifndef VBOX
@@ -303 +274 @@
     uint16_t            cur_mode = 0;
     uint16_t            cur_ptr=34;
-#ifdef VBE_NEW_DYN_LIST
     uint16_t            cur_info_ofs;
     uint16_t            sig, vmode;
-#else
-    ModeInfoListItem    *cur_info = &mode_info_list;
-#endif
     uint16_t            max_bpp = dispi_get_max_bpp();
     VbeInfoBlock __far  *info_block;
@@ -314 +281 @@
     info_block = ES :> (VbeInfoBlock *)DI;
 
-#ifdef VBE_NEW_DYN_LIST
     /* Read VBE Extra Data signature */
     sig = in_word(VBE_EXTRA_PORT, 0);
@@ -326 +292 @@
     }
     cur_info_ofs = sizeof(VBEHeader);
-#endif
     status = *AX;
 
@@ -384 +349 @@
     }
 
-#ifdef VBE_NEW_DYN_LIST
     do
     {
@@ -406 +370 @@
     // Add vesa mode list terminator
     write_word(ES, DI + cur_ptr, vmode);
-#else
-    do
-    {
-        if (cur_info->info.BitsPerPixel <= max_bpp) {
-#ifdef VGA_DEBUG
-            printf("VBE found mode %x => %x\n", cur_info->mode,cur_mode);
-#endif
-            write_word(ES, DI + cur_ptr, cur_info->mode);
-            cur_mode++;
-            cur_ptr += 2;
-        }
-        cur_info++;
-    } while (cur_info->mode != VBE_VESA_MODE_END_OF_LIST);
-
-    // Add vesa mode list terminator
-    write_word(ES, DI + cur_ptr, cur_info->mode);
-#endif // VBE_NEW_DYN_LIST
     *AX = 0x004F;
 }
@@ -439 +386 @@
 {
     uint16_t            result = 0x0100;
-#ifdef VBE_NEW_DYN_LIST
     uint16_t            cur_info_ofs;
-#else
-    ModeInfoListItem    *cur_info;
-#endif
     Boolean             using_lfb;
     uint8_t             win_attr;
@@ -454 +397 @@
     CX = (CX & 0x1ff);
 
-#ifdef VBE_NEW_DYN_LIST
     cur_info_ofs = mode_info_find_mode(CX, using_lfb);
 
     if (cur_info_ofs) {
         uint16_t    i;
-#else
-    cur_info = mode_info_find_mode(CX, using_lfb);
-
-    if (cur_info != 0) {
-#endif
 #ifdef VGA_DEBUG
         printf("VBE found mode %x\n",CX);
 #endif
         memsetb(ES, DI, 0, 256);    // The mode info size is fixed
-#ifdef VBE_NEW_DYN_LIST
         for (i = 0; i < sizeof(ModeInfoBlockCompact); i++) {
             uint8_t b;
@@ -475 +411 @@
             write_byte(ES, DI + i, b);
         }
-#else
-        memcpyb(ES, DI, 0xc000, &(cur_info->info), sizeof(ModeInfoBlockCompact));
-#endif
         win_attr = read_byte(ES, DI + offsetof(ModeInfoBlock, WinAAttributes));
         if (win_attr & VBE_WINDOW_ATTRIBUTE_RELOCATABLE) {
@@ -512 +445 @@
 {
     uint16_t            result;
-#ifdef VBE_NEW_DYN_LIST
     uint16_t            cur_info_ofs;
-#else
-    ModeInfoListItem    *cur_info;
-#endif
     Boolean             using_lfb;
     uint8_t             no_clear;
@@ -541 +470 @@
     }
 
-#ifdef VBE_NEW_DYN_LIST
     cur_info_ofs = mode_info_find_mode(BX, using_lfb);
 
@@ -557 +485 @@
         printf("\txres%x yres%x bpp%x\n", xres, yres, bpp);
 #endif
-#else
-    cur_info = mode_info_find_mode(BX, using_lfb);
-
-    if (cur_info != 0)
-    {
-#ifdef VGA_DEBUG
-        printf("VBE found mode %x, setting:\n", BX);
-        printf("\txres%x yres%x bpp%x\n",
-                cur_info->info.XResolution,
-                cur_info->info.YResolution,
-                cur_info->info.BitsPerPixel);
-#endif
-#endif // VBE_NEW_DYN_LIST
 
         // first disable current mode (when switching between vesa modi)
         dispi_set_enable(VBE_DISPI_DISABLED);
 
-#ifdef VBE_NEW_DYN_LIST
         if (bpp == 4)
-#else
-        if (cur_info->info.BitsPerPixel == 4)
-#endif
         {
             biosfn_set_video_mode(0x6a);
         }
 
-#ifdef VBE_NEW_DYN_LIST
         dispi_set_bpp(bpp);
         dispi_set_xres(xres);
         dispi_set_yres(yres);
-#else
-        dispi_set_bpp(cur_info->info.BitsPerPixel);
-        dispi_set_xres(cur_info->info.XResolution);
-        dispi_set_yres(cur_info->info.YResolution);
-#endif
         dispi_set_bank(0);
         dispi_set_enable(VBE_DISPI_ENABLED | no_clear | lfb_flag);