From 6d199e7843718460c7fca773effe90a73a6cd68e Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Wed, 21 Jun 2006 16:58:06 +0000 Subject: - improved VBE display capabilities check (X resulution checked now) - removed obsolete defines (LFB always available, always generate dynamic list) - CR/LF to LF fixes --- vbe.c | 76 +++++++++++++++++--------------------------- vbetables.h | 102 ------------------------------------------------------------ 2 files changed, 28 insertions(+), 150 deletions(-) diff --git a/vbe.c b/vbe.c index d4becd3..78bfd8f 100644 --- a/vbe.c +++ b/vbe.c @@ -30,15 +30,10 @@ // defines available -// enable LFB support -#define VBE_HAVE_LFB // disable VESA/VBE2 check in vbe info //#define VBE2_NO_VESA_CHECK -// dynamicly generate a mode_info list -#define DYN_LIST - #include "vbe.h" #include "vbetables.h" @@ -52,10 +47,6 @@ extern char vbebios_vendor_name; extern char vbebios_product_name; extern char vbebios_product_revision; -#ifndef DYN_LIST -extern Bit16u vbebios_mode_list; -#endif - ASM_START // FIXME: 'merge' these (c) etc strings with the vgabios.c strings? _vbebios_copyright: @@ -90,32 +81,6 @@ _no_vbebios_info_string: msg_vbe_init: .ascii "VBE Bios $Id$" .byte 0x0a,0x0d, 0x00 -#endif - -#ifndef DYN_LIST -// FIXME: for each new mode add a statement here -// at least until dynamic list creation is working -_vbebios_mode_list: - -.word VBE_VESA_MODE_640X400X8 -.word VBE_VESA_MODE_640X480X8 -.word VBE_VESA_MODE_800X600X4 -.word VBE_VESA_MODE_800X600X8 -.word VBE_VESA_MODE_1024X768X8 -.word VBE_VESA_MODE_640X480X1555 -.word VBE_VESA_MODE_640X480X565 -.word VBE_VESA_MODE_640X480X888 -.word VBE_VESA_MODE_800X600X1555 -.word VBE_VESA_MODE_800X600X565 -.word VBE_VESA_MODE_800X600X888 -.word VBE_VESA_MODE_1024X768X1555 -.word VBE_VESA_MODE_1024X768X565 -.word VBE_VESA_MODE_1024X768X888 -.word VBE_OWN_MODE_640X480X8888 -.word VBE_OWN_MODE_800X600X8888 -.word VBE_OWN_MODE_1024X768X8888 -.word VBE_OWN_MODE_320X200X8 -.word VBE_VESA_MODE_END_OF_LIST #endif .align 2 @@ -327,6 +292,28 @@ get_bpp_noinc: pop dx ret +; get display capabilities + +_dispi_get_max_xres: + push dx + push bx + call dispi_get_enable + mov bx, ax + or ax, # VBE_DISPI_GETCAPS + call _dispi_set_enable + mov dx, # VBE_DISPI_IOPORT_INDEX + mov ax, # VBE_DISPI_INDEX_XRES + out dx, ax + mov dx, # VBE_DISPI_IOPORT_DATA + in ax, dx + push ax + mov ax, bx + call _dispi_set_enable + pop ax + pop bx + pop dx + ret + _dispi_get_max_bpp: push dx push bx @@ -689,15 +676,9 @@ Bit16u *AX;Bit16u ES;Bit16u DI; vbe_info_block.Capabilities[2] = 0; vbe_info_block.Capabilities[3] = 0; -#ifdef DYN_LIST // VBE Video Mode Pointer (dynamicly generated from the mode_info_list) vbe_info_block.VideoModePtr_Seg= ES ; vbe_info_block.VideoModePtr_Off= DI + 34; -#else - // VBE Video Mode Pointer (staticly in rom) - vbe_info_block.VideoModePtr_Seg = 0xc000; - vbe_info_block.VideoModePtr_Off = &vbebios_mode_list; -#endif // VBE Total Memory (in 64b blocks) vbe_info_block.TotalMemory = VBE_TOTAL_VIDEO_MEMORY_DIV_64K; @@ -722,10 +703,10 @@ Bit16u *AX;Bit16u ES;Bit16u DI; memcpyb(ES, DI, ss, &vbe_info_block, 256); } -#ifdef DYN_LIST do { - if (cur_info->info.BitsPerPixel <= dispi_get_max_bpp()) { + if ((cur_info->info.XResolution <= dispi_get_max_xres()) && + (cur_info->info.BitsPerPixel <= dispi_get_max_bpp())) { #ifdef DEBUG printf("VBE found mode %x => %x\n", cur_info->mode,cur_mode); #endif @@ -738,7 +719,6 @@ Bit16u *AX;Bit16u ES;Bit16u DI; // Add vesa mode list terminator write_word(ES, DI + cur_ptr, cur_info->mode); -#endif result = 0x4f; @@ -1212,12 +1192,12 @@ ASM_END * * Input: * AX = 4F08h - * BL = 00h set DAC palette width - * = 01h get DAC palette width - * BH = If BL=00h: desired number of bits per primary color + * BL = 00h set DAC palette width + * = 01h get DAC palette width + * BH = If BL=00h: desired number of bits per primary color * Output: * AX = VBE Return Status - * BH = current number of bits per primary color (06h = standard VGA) + * BH = current number of bits per primary color (06h = standard VGA) */ ASM_START vbe_biosfn_set_get_dac_palette_format: diff --git a/vbetables.h b/vbetables.h index a62d464..412bb0c 100644 --- a/vbetables.h +++ b/vbetables.h @@ -21,9 +21,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -58,11 +56,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -91,9 +85,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, @@ -127,11 +119,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -224,9 +212,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -261,11 +247,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -294,9 +276,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -331,11 +311,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -364,9 +340,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -401,11 +375,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 15, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -434,9 +404,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -471,11 +439,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 15, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -504,9 +468,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -541,11 +503,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 15, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -574,9 +532,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -611,11 +567,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -644,9 +596,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -681,11 +631,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -714,9 +660,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -751,11 +695,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -784,9 +724,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -821,11 +759,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -854,9 +788,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -891,11 +823,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -924,9 +852,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -961,11 +887,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -994,9 +916,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -1031,11 +951,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 24, /*Bit8u DirectColorModeInfo*/ VBE_DIRECTCOLOR_RESERVED_BITS_AVAILABLE, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -1064,9 +980,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -1101,11 +1015,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 24, /*Bit8u DirectColorModeInfo*/ VBE_DIRECTCOLOR_RESERVED_BITS_AVAILABLE, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -1134,9 +1044,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | @@ -1171,11 +1079,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 24, /*Bit8u DirectColorModeInfo*/ VBE_DIRECTCOLOR_RESERVED_BITS_AVAILABLE, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above @@ -1204,9 +1108,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | -#ifdef VBE_HAVE_LFB VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | -#endif VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, @@ -1240,11 +1142,7 @@ static ModeInfoListItem mode_info_list[]= /*Bit8u RsvdFieldPosition*/ 0, /*Bit8u DirectColorModeInfo*/ 0, // Mandatory information for VBE 2.0 and above -#ifdef VBE_HAVE_LFB /*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -#else - /*Bit32u PhysBasePtr*/ 0, -#endif /*Bit32u OffScreenMemOffset*/ 0, /*Bit16u OffScreenMemSize*/ 0, // Mandatory information for VBE 3.0 and above -- cgit v1.2.3