From 9d0869b630baf5b94c6cb6a87520dd881ae08613 Mon Sep 17 00:00:00 2001 From: bellard Date: Wed, 14 Jun 2006 00:58:54 +0000 Subject: [PATCH] fixed VBE protected mode calls - added VGA and VBE save restore support (not fully tested) - automatic generation of VBE mode table git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1959 c046a42c-6fe2-441c-8c8c-71466251a162 --- pc-bios/vgabios-cirrus.bin | Bin 32768 -> 35328 bytes pc-bios/vgabios.bin | Bin 34304 -> 37888 bytes pc-bios/vgabios.diff | 3142 +++++++++--------------------------- 3 files changed, 780 insertions(+), 2362 deletions(-) diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin index b9229f6638378d78cdaa5edbc9764fca8e7cca79..34f9a9ff7ce38e4b582c81067454b89bf8d55ac7 100644 GIT binary patch delta 7061 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 diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin index 9b815bc78944056eefb3d956fd0ecf08a37fd516..17cb63f6ad879a589142c09e836821e35b63f706 100644 GIT binary patch delta 9445 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 delta 5495 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 diff --git a/pc-bios/vgabios.diff b/pc-bios/vgabios.diff index 93e23d3a40..661c032e46 100644 --- a/pc-bios/vgabios.diff +++ b/pc-bios/vgabios.diff @@ -1,10 +1,36 @@ +Index: Makefile +=================================================================== +RCS file: /sources/vgabios/vgabios/Makefile,v +retrieving revision 1.17 +diff -u -w -r1.17 Makefile +--- Makefile 6 Mar 2005 13:06:47 -0000 1.17 ++++ Makefile 14 Jun 2006 00:51:06 -0000 +@@ -22,7 +22,7 @@ + cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin + + clean: +- /bin/rm -f biossums *.o *.s *.ld86 \ ++ /bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \ + temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak + + dist-clean: clean +@@ -79,3 +79,9 @@ + + biossums: biossums.c + $(CC) -o biossums biossums.c ++ ++vbetables-gen: vbetables-gen.c ++ $(CC) -o vbetables-gen vbetables-gen.c ++ ++vbetables.h: vbetables-gen ++ ./vbetables-gen > $@ Index: clext.c =================================================================== RCS file: /sources/vgabios/vgabios/clext.c,v retrieving revision 1.10 diff -u -w -r1.10 clext.c --- clext.c 25 Mar 2006 10:19:15 -0000 1.10 -+++ clext.c 13 Jun 2006 16:47:23 -0000 ++++ clext.c 14 Jun 2006 00:51:06 -0000 @@ -544,6 +544,13 @@ cirrus_set_video_mode_extended: call cirrus_switch_mode @@ -72,14 +98,289 @@ diff -u -w -r1.10 clext.c cirrus_extbios_handlers: ;; 80h dw cirrus_extbios_80h +Index: vbe.c +=================================================================== +RCS file: /sources/vgabios/vgabios/vbe.c,v +retrieving revision 1.48 +diff -u -w -r1.48 vbe.c +--- vbe.c 26 Dec 2005 19:50:26 -0000 1.48 ++++ vbe.c 14 Jun 2006 00:51:07 -0000 +@@ -118,21 +118,114 @@ + .word VBE_VESA_MODE_END_OF_LIST + #endif + ++ .align 2 + vesa_pm_start: + dw vesa_pm_set_window - vesa_pm_start +- dw vesa_pm_set_display_strt - vesa_pm_start ++ dw vesa_pm_set_display_start - vesa_pm_start + dw vesa_pm_unimplemented - vesa_pm_start +- dw 0 ++ dw vesa_pm_io_ports_table - vesa_pm_start ++vesa_pm_io_ports_table: ++ dw VBE_DISPI_IOPORT_INDEX ++ dw VBE_DISPI_IOPORT_INDEX + 1 ++ dw VBE_DISPI_IOPORT_DATA ++ dw VBE_DISPI_IOPORT_DATA + 1 ++ dw 0xffff ++ dw 0xffff + + USE32 + vesa_pm_set_window: +- mov ax, #0x4f05 +- int #0x10 ++ cmp bx, #0x00 ++ je vesa_pm_set_display_window1 ++ mov ax, #0x0100 ++ ret ++vesa_pm_set_display_window1: ++ mov ax, dx ++ push dx ++ push ax ++ mov dx, # VBE_DISPI_IOPORT_INDEX ++ mov ax, # VBE_DISPI_INDEX_BANK ++ out dx, ax ++ pop ax ++ mov dx, # VBE_DISPI_IOPORT_DATA ++ out dx, ax ++ pop dx ++ mov ax, #0x004f + ret + + vesa_pm_set_display_start: +- mov ax, #0x4f07 +- int #0x10 ++ cmp bl, #0x80 ++ je vesa_pm_set_display_start1 ++ cmp bl, #0x00 ++ je vesa_pm_set_display_start1 ++ mov ax, #0x0100 ++ ret ++vesa_pm_set_display_start1: ++; convert offset to (X, Y) coordinate ++; (would be simpler to change Bochs VBE API...) ++ push eax ++ push ecx ++ push edx ++ push esi ++ push edi ++ shl edx, #16 ++ and ecx, #0xffff ++ or ecx, edx ++ shl ecx, #2 ++ mov eax, ecx ++ ++ push eax ++ mov dx, # VBE_DISPI_IOPORT_INDEX ++ mov ax, # VBE_DISPI_INDEX_VIRT_WIDTH ++ out dx, ax ++ mov dx, # VBE_DISPI_IOPORT_DATA ++ in ax, dx ++ movzx ecx, ax ++ ++ mov dx, # VBE_DISPI_IOPORT_INDEX ++ mov ax, # VBE_DISPI_INDEX_BPP ++ out dx, ax ++ mov dx, # VBE_DISPI_IOPORT_DATA ++ in ax, dx ++ movzx esi, ax ++ pop eax ++ ++ add esi, #7 ++ shr esi, #3 ++ imul ecx, esi ++ xor edx, edx ++ div ecx ++ mov edi, eax ++ mov eax, edx ++ xor edx, edx ++ div esi ++ ++ push dx ++ push ax ++ mov dx, # VBE_DISPI_IOPORT_INDEX ++ mov ax, # VBE_DISPI_INDEX_X_OFFSET ++ out dx, ax ++ pop ax ++ mov dx, # VBE_DISPI_IOPORT_DATA ++ out dx, ax ++ pop dx ++ ++ mov ax, di ++ push dx ++ push ax ++ mov dx, # VBE_DISPI_IOPORT_INDEX ++ mov ax, # VBE_DISPI_INDEX_Y_OFFSET ++ out dx, ax ++ pop ax ++ mov dx, # VBE_DISPI_IOPORT_DATA ++ out dx, ax ++ pop dx ++ ++ pop edi ++ pop esi ++ pop edx ++ pop ecx ++ pop eax ++ mov ax, #0x004f + ret + + vesa_pm_unimplemented: +@@ -835,6 +928,64 @@ + ASM_END + + ++Bit16u vbe_biosfn_read_video_state_size() ++{ ++ return 9 * 2; ++} ++ ++void vbe_biosfn_save_video_state(ES, BX) ++ Bit16u ES; Bit16u BX; ++{ ++ Bit16u enable, i; ++ ++ outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_ENABLE); ++ enable = inw(VBE_DISPI_IOPORT_DATA); ++ write_word(ES, BX, enable); ++ BX += 2; ++ if (!(enable & VBE_DISPI_ENABLED)) ++ return; ++ for(i = VBE_DISPI_INDEX_XRES; i <= VBE_DISPI_INDEX_Y_OFFSET; i++) { ++ if (i != VBE_DISPI_INDEX_ENABLE) { ++ outw(VBE_DISPI_IOPORT_INDEX, i); ++ write_word(ES, BX, inw(VBE_DISPI_IOPORT_DATA)); ++ BX += 2; ++ } ++ } ++} ++ ++ ++void vbe_biosfn_restore_video_state(ES, BX) ++ Bit16u ES; Bit16u BX; ++{ ++ Bit16u enable, i; ++ ++ enable = read_word(ES, BX); ++ BX += 2; ++ ++ if (!(enable & VBE_DISPI_ENABLED)) { ++ outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_ENABLE); ++ outw(VBE_DISPI_IOPORT_DATA, enable); ++ } else { ++ outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_XRES); ++ outw(VBE_DISPI_IOPORT_DATA, read_word(ES, BX)); ++ BX += 2; ++ outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_YRES); ++ outw(VBE_DISPI_IOPORT_DATA, read_word(ES, BX)); ++ BX += 2; ++ outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_BPP); ++ outw(VBE_DISPI_IOPORT_DATA, read_word(ES, BX)); ++ BX += 2; ++ outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_ENABLE); ++ outw(VBE_DISPI_IOPORT_DATA, enable); ++ ++ for(i = VBE_DISPI_INDEX_BANK; i <= VBE_DISPI_INDEX_Y_OFFSET; i++) { ++ outw(VBE_DISPI_IOPORT_INDEX, i); ++ outw(VBE_DISPI_IOPORT_DATA, read_word(ES, BX)); ++ BX += 2; ++ } ++ } ++} ++ + /** Function 04h - Save/Restore State + * + * Input: +@@ -849,10 +1000,48 @@ + * BX = Number of 64-byte blocks to hold the state buffer (if DL=00h) + * + */ +-void vbe_biosfn_save_restore_state(AX, DL, CX, ES, BX) ++void vbe_biosfn_save_restore_state(AX, CX, DX, ES, BX) ++Bit16u *AX; Bit16u CX; Bit16u DX; Bit16u ES; Bit16u *BX; + { +-} ++ Bit16u ss=get_SS(); ++ Bit16u result, val; + ++ result = 0x4f; ++ switch(GET_DL()) { ++ case 0x00: ++ val = biosfn_read_video_state_size2(CX); ++#ifdef DEBUG ++ printf("VGA state size=%x\n", val); ++#endif ++ if (CX & 8) ++ val += vbe_biosfn_read_video_state_size(); ++ write_word(ss, BX, val); ++ break; ++ case 0x01: ++ val = read_word(ss, BX); ++ val = biosfn_save_video_state(CX, ES, val); ++#ifdef DEBUG ++ printf("VGA save_state offset=%x\n", val); ++#endif ++ if (CX & 8) ++ vbe_biosfn_save_video_state(ES, val); ++ break; ++ case 0x02: ++ val = read_word(ss, BX); ++ val = biosfn_restore_video_state(CX, ES, val); ++#ifdef DEBUG ++ printf("VGA restore_state offset=%x\n", val); ++#endif ++ if (CX & 8) ++ vbe_biosfn_restore_video_state(ES, val); ++ break; ++ default: ++ // function failed ++ result = 0x100; ++ break; ++ } ++ write_word(ss, AX, result); ++} + + /** Function 05h - Display Window Control + * +@@ -1090,7 +1279,7 @@ + */ + ASM_START + vbe_biosfn_return_protected_mode_interface: +- test bx, bx ++ test bl, bl + jnz _fail + mov di, #0xc000 + mov es, di Index: vbe.h =================================================================== RCS file: /sources/vgabios/vgabios/vbe.h,v retrieving revision 1.24 diff -u -w -r1.24 vbe.h --- vbe.h 9 May 2004 20:31:31 -0000 1.24 -+++ vbe.h 13 Jun 2006 16:47:24 -0000 -@@ -193,6 +193,10 @@ ++++ vbe.h 14 Jun 2006 00:51:07 -0000 +@@ -14,7 +14,7 @@ + void vbe_biosfn_return_controller_information(AX, ES, DI); + void vbe_biosfn_return_mode_information(AX, CX, ES, DI); + void vbe_biosfn_set_mode(AX, BX, ES, DI); +-void vbe_biosfn_save_restore_state(AX, DL, CX, ES, BX); ++void vbe_biosfn_save_restore_state(AX, CX, DX, ES, BX); + void vbe_biosfn_set_get_palette_data(AX); + void vbe_biosfn_return_protected_mode_interface(AX); + +@@ -151,6 +151,12 @@ + Bit8u Reserved[189]; + } ModeInfoBlock; + ++typedef struct ModeInfoListItem ++{ ++ Bit16u mode; ++ ModeInfoBlockCompact info; ++} ModeInfoListItem; ++ + // VBE Return Status Info + // AL + #define VBE_RETURN_STATUS_SUPPORTED 0x4F +@@ -193,6 +199,10 @@ #define VBE_VESA_MODE_1280X1024X1555 0x119 #define VBE_VESA_MODE_1280X1024X565 0x11A #define VBE_VESA_MODE_1280X1024X888 0x11B @@ -90,7 +391,7 @@ diff -u -w -r1.24 vbe.h // BOCHS/PLEX86 'own' mode numbers #define VBE_OWN_MODE_320X200X8888 0x140 -@@ -202,6 +206,12 @@ +@@ -202,6 +212,12 @@ #define VBE_OWN_MODE_1024X768X8888 0x144 #define VBE_OWN_MODE_1280X1024X8888 0x145 #define VBE_OWN_MODE_320X200X8 0x146 @@ -103,7 +404,7 @@ diff -u -w -r1.24 vbe.h #define VBE_VESA_MODE_END_OF_LIST 0xFFFF -@@ -259,7 +269,7 @@ +@@ -259,7 +275,7 @@ // like 0xE0000000 @@ -112,2367 +413,484 @@ diff -u -w -r1.24 vbe.h #define VBE_DISPI_BANK_ADDRESS 0xA0000 #define VBE_DISPI_BANK_SIZE_KB 64 -Index: vbetables.h +Index: vgabios.c =================================================================== -RCS file: /sources/vgabios/vgabios/vbetables.h,v -retrieving revision 1.24 -diff -u -w -r1.24 vbetables.h ---- vbetables.h 22 Jul 2004 18:37:29 -0000 1.24 -+++ vbetables.h 13 Jun 2006 16:47:24 -0000 -@@ -14,46 +14,29 @@ - ModeInfoBlockCompact info; - } ModeInfoListItem; +RCS file: /sources/vgabios/vgabios/vgabios.c,v +retrieving revision 1.64 +diff -u -w -r1.64 vgabios.c +--- vgabios.c 25 Mar 2006 10:19:16 -0000 1.64 ++++ vgabios.c 14 Jun 2006 00:51:07 -0000 +@@ -109,8 +109,8 @@ + static void biosfn_write_string(); + static void biosfn_read_state_info(); + static void biosfn_read_video_state_size(); +-static void biosfn_save_video_state(); +-static void biosfn_restore_video_state(); ++static Bit16u biosfn_save_video_state(); ++static Bit16u biosfn_restore_video_state(); + extern Bit8u video_save_pointer_table[]; --// FIXME: check all member variables to be correct for the different modi --// FIXME: add more modi - static ModeInfoListItem mode_info_list[]= + // This is for compiling with gcc2 and gcc3 +@@ -748,12 +748,7 @@ + vbe_biosfn_set_mode(&AX,BX,ES,DI); + break; + case 0x04: +- //FIXME +-#ifdef DEBUG +- unimplemented(); +-#endif +- // function failed +- AX=0x100; ++ vbe_biosfn_save_restore_state(&AX, CX, DX, ES, &BX); + break; + case 0x09: + //FIXME +@@ -3138,23 +3133,215 @@ + } + + // -------------------------------------------------------------------------------------------- +-static void biosfn_read_video_state_size (CX,ES,BX) Bit16u CX;Bit16u ES;Bit16u BX; ++// -------------------------------------------------------------------------------------------- ++static Bit16u biosfn_read_video_state_size2 (CX) ++ Bit16u CX; { -- { -- VBE_VESA_MODE_640X400X8, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | +-#ifdef DEBUG +- unimplemented(); -#endif -- VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -- /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | -- VBE_WINDOW_ATTRIBUTE_READABLE | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+{ 0x0100, /* 640x400x8 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, - /*Bit16u BytesPerScanLine*/ 640, --// Mandatory information for VBE 1.2 and above - /*Bit16u XResolution*/ 640, - /*Bit16u YResolution*/ 400, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 8, -- /*Bit8u NumberOfBanks*/ 4, // 640x400/64kb == 4 -+/*Bit8u NumberOfBanks*/ 4, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PACKED_PIXEL, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 15, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 0, - /*Bit8u RedFieldPosition*/ 0, - /*Bit8u GreenMaskSize*/ 0, -@@ -63,15 +46,9 @@ - /*Bit8u RsvdMaskSize*/ 0, - /*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, ++ Bit16u size; ++ size = 0; ++ if (CX & 1) { ++ size += 0x46; ++ } ++ if (CX & 2) { ++ size += (5 + 8 + 5) * 2 + 6; ++ } ++ if (CX & 4) { ++ size += 3 + 256 * 3 + 1; + } +-static void biosfn_save_video_state (CX,ES,BX) Bit16u CX;Bit16u ES;Bit16u BX; ++ return size; ++} ++ ++static void biosfn_read_video_state_size (CX, BX) ++ Bit16u CX; Bit16u *BX; + { +-#ifdef DEBUG +- unimplemented(); -#endif - /*Bit32u OffScreenMemOffset*/ 0, - /*Bit16u OffScreenMemSize*/ 0, --// Mandatory information for VBE 3.0 and above - /*Bit16u LinBytesPerScanLine*/ 640, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -@@ -84,45 +61,28 @@ - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_640X480X8, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | ++ Bit16u ss=get_SS(); ++ write_word(ss, BX, biosfn_read_video_state_size2(CX)); + } +-static void biosfn_restore_video_state (CX,ES,BX) Bit16u CX;Bit16u ES;Bit16u BX; ++ ++static Bit16u biosfn_save_video_state (CX,ES,BX) ++ Bit16u CX;Bit16u ES;Bit16u BX; + { +-#ifdef DEBUG +- unimplemented(); -#endif -- VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -- /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_READABLE | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0101, /* 640x480x8 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, - /*Bit16u BytesPerScanLine*/ 640, --// Mandatory information for VBE 1.2 and above - /*Bit16u XResolution*/ 640, - /*Bit16u YResolution*/ 480, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 8, -- /*Bit8u NumberOfBanks*/ 5, // 640x480/64kb == 5 -+/*Bit8u NumberOfBanks*/ 5, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PACKED_PIXEL, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 11, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 0, - /*Bit8u RedFieldPosition*/ 0, - /*Bit8u GreenMaskSize*/ 0, -@@ -132,15 +92,9 @@ - /*Bit8u RsvdMaskSize*/ 0, - /*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 - /*Bit16u LinBytesPerScanLine*/ 640, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -@@ -153,44 +107,28 @@ - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_800X600X4, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | -- VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | -- VBE_MODE_ATTRIBUTE_TTY_BIOS_SUPPORT | -- VBE_MODE_ATTRIBUTE_COLOR_MODE | -- VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -- /*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | -- VBE_WINDOW_ATTRIBUTE_READABLE | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0102, /* 800x600x4 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, - /*Bit16u BytesPerScanLine*/ 100, --// Mandatory information for VBE 1.2 and above - /*Bit16u XResolution*/ 800, - /*Bit16u YResolution*/ 600, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 4, - /*Bit8u BitsPerPixel*/ 4, -- /*Bit8u NumberOfBanks*/ 16, -+/*Bit8u NumberOfBanks*/ 1, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PLANAR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 15, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 0, - /*Bit8u RedFieldPosition*/ 0, - /*Bit8u GreenMaskSize*/ 0, -@@ -200,11 +138,9 @@ - /*Bit8u RsvdMaskSize*/ 0, - /*Bit8u RsvdFieldPosition*/ 0, - /*Bit8u DirectColorModeInfo*/ 0, --// Mandatory information for VBE 2.0 and above -- /*Bit32u PhysBasePtr*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, - /*Bit32u OffScreenMemOffset*/ 0, - /*Bit16u OffScreenMemSize*/ 0, --// Mandatory information for VBE 3.0 and above - /*Bit16u LinBytesPerScanLine*/ 100, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -@@ -217,46 +153,28 @@ - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_800X600X8, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0103, /* 800x600x8 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, - /*Bit16u BytesPerScanLine*/ 800, --// Mandatory information for VBE 1.2 and above - /*Bit16u XResolution*/ 800, - /*Bit16u YResolution*/ 600, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 8, -- /*Bit8u NumberOfBanks*/ 8, // 800x600/64kb == 8 -+/*Bit8u NumberOfBanks*/ 8, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PACKED_PIXEL, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 7, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 0, - /*Bit8u RedFieldPosition*/ 0, - /*Bit8u GreenMaskSize*/ 0, -@@ -266,15 +184,9 @@ - /*Bit8u RsvdMaskSize*/ 0, - /*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 - /*Bit16u LinBytesPerScanLine*/ 800, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -@@ -287,46 +199,28 @@ - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_1024X768X8, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0105, /* 1024x768x8 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, - /*Bit16u BytesPerScanLine*/ 1024, --// Mandatory information for VBE 1.2 and above - /*Bit16u XResolution*/ 1024, - /*Bit16u YResolution*/ 768, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 8, -- /*Bit8u NumberOfBanks*/ 12, // 1024x768/64kb == 12 -+/*Bit8u NumberOfBanks*/ 12, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PACKED_PIXEL, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 3, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 0, - /*Bit8u RedFieldPosition*/ 0, - /*Bit8u GreenMaskSize*/ 0, -@@ -336,15 +230,9 @@ - /*Bit8u RsvdMaskSize*/ 0, - /*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 - /*Bit16u LinBytesPerScanLine*/ 1024, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -@@ -357,116 +245,74 @@ - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_640X480X1555, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0107, /* 1280x1024x8 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 640*2, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 640, -- /*Bit16u YResolution*/ 480, -+/*Bit16u BytesPerScanLine*/ 1280, -+/*Bit16u XResolution*/ 1280, -+/*Bit16u YResolution*/ 1024, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, -- /*Bit8u BitsPerPixel*/ 15, -- /*Bit8u NumberOfBanks*/ 1, -- /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BitsPerPixel*/ 8, -+/*Bit8u NumberOfBanks*/ 20, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PACKED_PIXEL, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 5, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) -- /*Bit8u RedMaskSize*/ 5, -- /*Bit8u RedFieldPosition*/ 10, -- /*Bit8u GreenMaskSize*/ 5, -- /*Bit8u GreenFieldPosition*/ 5, -- /*Bit8u BlueMaskSize*/ 5, -+/*Bit8u RedMaskSize*/ 0, -+/*Bit8u RedFieldPosition*/ 0, -+/*Bit8u GreenMaskSize*/ 0, -+/*Bit8u GreenFieldPosition*/ 0, -+/*Bit8u BlueMaskSize*/ 0, - /*Bit8u BlueFieldPosition*/ 0, -- /*Bit8u RsvdMaskSize*/ 1, -- /*Bit8u RsvdFieldPosition*/ 15, -+/*Bit8u RsvdMaskSize*/ 0, -+/*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 -- /*Bit16u LinBytesPerScanLine*/ 640*2, -+/*Bit16u LinBytesPerScanLine*/ 1280, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -- /*Bit8u LinRedMaskSize*/ 5, -- /*Bit8u LinRedFieldPosition*/ 10, -+/*Bit8u LinRedMaskSize*/ 0, -+/*Bit8u LinRedFieldPosition*/ 0, - /*Bit8u LinGreenMaskSize*/ 0, -- /*Bit8u LinGreenFieldPosition*/ 5, -- /*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinGreenFieldPosition*/ 0, -+/*Bit8u LinBlueMaskSize*/ 0, - /*Bit8u LinBlueFieldPosition*/ 0, -- /*Bit8u LinRsvdMaskSize*/ 1, -- /*Bit8u LinRsvdFieldPosition*/ 15, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_800X600X1555, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x010d, /* 320x200x15 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 800*2, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 800, -- /*Bit16u YResolution*/ 600, -+/*Bit16u BytesPerScanLine*/ 640, -+/*Bit16u XResolution*/ 320, -+/*Bit16u YResolution*/ 200, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 15, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u NumberOfBanks*/ 2, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 3, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 5, - /*Bit8u RedFieldPosition*/ 10, - /*Bit8u GreenMaskSize*/ 5, -@@ -476,16 +322,10 @@ - /*Bit8u RsvdMaskSize*/ 1, - /*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 -- /*Bit16u LinBytesPerScanLine*/ 800*2, -+/*Bit16u LinBytesPerScanLine*/ 640, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, - /*Bit8u LinRedMaskSize*/ 5, -@@ -497,256 +337,166 @@ - /*Bit8u LinRsvdMaskSize*/ 1, - /*Bit8u LinRsvdFieldPosition*/ 15, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_1024X768X1555, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x010e, /* 320x200x16 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 1024*2, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 1024, -- /*Bit16u YResolution*/ 768, -+/*Bit16u BytesPerScanLine*/ 640, -+/*Bit16u XResolution*/ 320, -+/*Bit16u YResolution*/ 200, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, -- /*Bit8u BitsPerPixel*/ 15, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u BitsPerPixel*/ 16, -+/*Bit8u NumberOfBanks*/ 2, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 1, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 5, -- /*Bit8u RedFieldPosition*/ 10, -- /*Bit8u GreenMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 11, -+/*Bit8u GreenMaskSize*/ 6, - /*Bit8u GreenFieldPosition*/ 5, - /*Bit8u BlueMaskSize*/ 5, - /*Bit8u BlueFieldPosition*/ 0, -- /*Bit8u RsvdMaskSize*/ 1, -- /*Bit8u RsvdFieldPosition*/ 15, -+/*Bit8u RsvdMaskSize*/ 0, -+/*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 -- /*Bit16u LinBytesPerScanLine*/ 1024*2, -+/*Bit16u LinBytesPerScanLine*/ 640, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, - /*Bit8u LinRedMaskSize*/ 5, -- /*Bit8u LinRedFieldPosition*/ 10, -- /*Bit8u LinGreenMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 11, -+/*Bit8u LinGreenMaskSize*/ 6, - /*Bit8u LinGreenFieldPosition*/ 5, - /*Bit8u LinBlueMaskSize*/ 5, - /*Bit8u LinBlueFieldPosition*/ 0, -- /*Bit8u LinRsvdMaskSize*/ 1, -- /*Bit8u LinRsvdFieldPosition*/ 15, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_640X480X565, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x010f, /* 320x200x24 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 640*2, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 640, -- /*Bit16u YResolution*/ 480, -+/*Bit16u BytesPerScanLine*/ 960, -+/*Bit16u XResolution*/ 320, -+/*Bit16u YResolution*/ 200, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, -- /*Bit8u BitsPerPixel*/ 16, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u BitsPerPixel*/ 24, -+/*Bit8u NumberOfBanks*/ 3, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 5, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) -- /*Bit8u RedMaskSize*/ 5, -- /*Bit8u RedFieldPosition*/ 11, -- /*Bit8u GreenMaskSize*/ 6, -- /*Bit8u GreenFieldPosition*/ 5, -- /*Bit8u BlueMaskSize*/ 5, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, - /*Bit8u BlueFieldPosition*/ 0, - /*Bit8u RsvdMaskSize*/ 0, - /*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 -- /*Bit16u LinBytesPerScanLine*/ 640*2, -+/*Bit16u LinBytesPerScanLine*/ 960, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -- /*Bit8u LinRedMaskSize*/ 5, -- /*Bit8u LinRedFieldPosition*/ 11, -- /*Bit8u LinGreenMaskSize*/ 6, -- /*Bit8u LinGreenFieldPosition*/ 5, -- /*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, - /*Bit8u LinBlueFieldPosition*/ 0, - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_800X600X565, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0110, /* 640x480x15 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 800*2, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 800, -- /*Bit16u YResolution*/ 600, -+/*Bit16u BytesPerScanLine*/ 1280, -+/*Bit16u XResolution*/ 640, -+/*Bit16u YResolution*/ 480, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, -- /*Bit8u BitsPerPixel*/ 16, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u BitsPerPixel*/ 15, -+/*Bit8u NumberOfBanks*/ 10, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 3, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 5, -- /*Bit8u RedFieldPosition*/ 11, -- /*Bit8u GreenMaskSize*/ 6, -+/*Bit8u RedFieldPosition*/ 10, -+/*Bit8u GreenMaskSize*/ 5, - /*Bit8u GreenFieldPosition*/ 5, - /*Bit8u BlueMaskSize*/ 5, - /*Bit8u BlueFieldPosition*/ 0, -- /*Bit8u RsvdMaskSize*/ 0, -- /*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 1, -+/*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 -- /*Bit16u LinBytesPerScanLine*/ 800*2, -+/*Bit16u LinBytesPerScanLine*/ 1280, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, - /*Bit8u LinRedMaskSize*/ 5, -- /*Bit8u LinRedFieldPosition*/ 11, -- /*Bit8u LinGreenMaskSize*/ 6, -+/*Bit8u LinRedFieldPosition*/ 10, -+/*Bit8u LinGreenMaskSize*/ 5, - /*Bit8u LinGreenFieldPosition*/ 5, - /*Bit8u LinBlueMaskSize*/ 5, - /*Bit8u LinBlueFieldPosition*/ 0, -- /*Bit8u LinRsvdMaskSize*/ 0, -- /*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 1, -+/*Bit8u LinRsvdFieldPosition*/ 15, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_1024X768X565, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0111, /* 640x480x16 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 1024*2, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 1024, -- /*Bit16u YResolution*/ 768, -+/*Bit16u BytesPerScanLine*/ 1280, -+/*Bit16u XResolution*/ 640, -+/*Bit16u YResolution*/ 480, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 16, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u NumberOfBanks*/ 10, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 1, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 5, - /*Bit8u RedFieldPosition*/ 11, - /*Bit8u GreenMaskSize*/ 6, -@@ -756,16 +506,10 @@ - /*Bit8u RsvdMaskSize*/ 0, - /*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 -- /*Bit16u LinBytesPerScanLine*/ 1024*2, -+/*Bit16u LinBytesPerScanLine*/ 1280, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, - /*Bit8u LinRedMaskSize*/ 5, -@@ -777,46 +521,28 @@ - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_640X480X888, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0112, /* 640x480x24 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 640*3, --// Mandatory information for VBE 1.2 and above -+/*Bit16u BytesPerScanLine*/ 1920, - /*Bit16u XResolution*/ 640, - /*Bit16u YResolution*/ 480, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 24, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u NumberOfBanks*/ 15, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 3, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 8, - /*Bit8u RedFieldPosition*/ 16, - /*Bit8u GreenMaskSize*/ 8, -@@ -826,16 +552,10 @@ - /*Bit8u RsvdMaskSize*/ 0, - /*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 -- /*Bit16u LinBytesPerScanLine*/ 640*3, -+/*Bit16u LinBytesPerScanLine*/ 1920, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, - /*Bit8u LinRedMaskSize*/ 8, -@@ -847,186 +567,764 @@ - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_800X600X888, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0113, /* 800x600x15 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 800*3, --// Mandatory information for VBE 1.2 and above -+/*Bit16u BytesPerScanLine*/ 1600, - /*Bit16u XResolution*/ 800, - /*Bit16u YResolution*/ 600, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, -- /*Bit8u BitsPerPixel*/ 24, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u BitsPerPixel*/ 15, -+/*Bit8u NumberOfBanks*/ 15, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 1, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) -- /*Bit8u RedMaskSize*/ 8, -- /*Bit8u RedFieldPosition*/ 16, -- /*Bit8u GreenMaskSize*/ 8, -- /*Bit8u GreenFieldPosition*/ 8, -- /*Bit8u BlueMaskSize*/ 8, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 10, -+/*Bit8u GreenMaskSize*/ 5, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, - /*Bit8u BlueFieldPosition*/ 0, -- /*Bit8u RsvdMaskSize*/ 0, -- /*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 1, -+/*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 -- /*Bit16u LinBytesPerScanLine*/ 800*3, -+/*Bit16u LinBytesPerScanLine*/ 1600, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -- /*Bit8u LinRedMaskSize*/ 8, -- /*Bit8u LinRedFieldPosition*/ 16, -- /*Bit8u LinGreenMaskSize*/ 8, -- /*Bit8u LinGreenFieldPosition*/ 8, -- /*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 10, -+/*Bit8u LinGreenMaskSize*/ 5, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, - /*Bit8u LinBlueFieldPosition*/ 0, -- /*Bit8u LinRsvdMaskSize*/ 0, -- /*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 1, -+/*Bit8u LinRsvdFieldPosition*/ 15, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_VESA_MODE_1024X768X888, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0114, /* 800x600x16 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 1024*3, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 1024, -- /*Bit16u YResolution*/ 768, -+/*Bit16u BytesPerScanLine*/ 1600, -+/*Bit16u XResolution*/ 800, -+/*Bit16u YResolution*/ 600, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, -- /*Bit8u BitsPerPixel*/ 24, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u BitsPerPixel*/ 16, -+/*Bit8u NumberOfBanks*/ 15, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, - /*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) -- /*Bit8u RedMaskSize*/ 8, -- /*Bit8u RedFieldPosition*/ 16, -- /*Bit8u GreenMaskSize*/ 8, -- /*Bit8u GreenFieldPosition*/ 8, -- /*Bit8u BlueMaskSize*/ 8, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 11, -+/*Bit8u GreenMaskSize*/ 6, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, - /*Bit8u BlueFieldPosition*/ 0, - /*Bit8u RsvdMaskSize*/ 0, - /*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 -- /*Bit16u LinBytesPerScanLine*/ 1024*3, -+/*Bit16u LinBytesPerScanLine*/ 1600, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -- /*Bit8u LinRedMaskSize*/ 8, -- /*Bit8u LinRedFieldPosition*/ 16, -- /*Bit8u LinGreenMaskSize*/ 8, -- /*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 11, -+/*Bit8u LinGreenMaskSize*/ 6, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0115, /* 800x600x24 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2400, -+/*Bit16u XResolution*/ 800, -+/*Bit16u YResolution*/ 600, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 24, -+/*Bit8u NumberOfBanks*/ 22, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2400, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0116, /* 1024x768x15 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2048, -+/*Bit16u XResolution*/ 1024, -+/*Bit16u YResolution*/ 768, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 15, -+/*Bit8u NumberOfBanks*/ 24, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 10, -+/*Bit8u GreenMaskSize*/ 5, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 1, -+/*Bit8u RsvdFieldPosition*/ 15, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2048, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 10, -+/*Bit8u LinGreenMaskSize*/ 5, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 1, -+/*Bit8u LinRsvdFieldPosition*/ 15, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0117, /* 1024x768x16 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2048, -+/*Bit16u XResolution*/ 1024, -+/*Bit16u YResolution*/ 768, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 16, -+/*Bit8u NumberOfBanks*/ 24, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 11, -+/*Bit8u GreenMaskSize*/ 6, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2048, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 11, -+/*Bit8u LinGreenMaskSize*/ 6, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0118, /* 1024x768x24 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 3072, -+/*Bit16u XResolution*/ 1024, -+/*Bit16u YResolution*/ 768, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 24, -+/*Bit8u NumberOfBanks*/ 36, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 3072, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0119, /* 1280x1024x15 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2560, -+/*Bit16u XResolution*/ 1280, -+/*Bit16u YResolution*/ 1024, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 15, -+/*Bit8u NumberOfBanks*/ 40, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 10, -+/*Bit8u GreenMaskSize*/ 5, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 1, -+/*Bit8u RsvdFieldPosition*/ 15, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2560, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 10, -+/*Bit8u LinGreenMaskSize*/ 5, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 1, -+/*Bit8u LinRsvdFieldPosition*/ 15, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x011a, /* 1280x1024x16 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2560, -+/*Bit16u XResolution*/ 1280, -+/*Bit16u YResolution*/ 1024, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 16, -+/*Bit8u NumberOfBanks*/ 40, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 11, -+/*Bit8u GreenMaskSize*/ 6, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2560, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 11, -+/*Bit8u LinGreenMaskSize*/ 6, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x011b, /* 1280x1024x24 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 3840, -+/*Bit16u XResolution*/ 1280, -+/*Bit16u YResolution*/ 1024, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 24, -+/*Bit8u NumberOfBanks*/ 60, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 3840, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x011c, /* 1600x1200x8 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 1600, -+/*Bit16u XResolution*/ 1600, -+/*Bit16u YResolution*/ 1200, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 8, -+/*Bit8u NumberOfBanks*/ 30, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PACKED_PIXEL, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 0, -+/*Bit8u RedFieldPosition*/ 0, -+/*Bit8u GreenMaskSize*/ 0, -+/*Bit8u GreenFieldPosition*/ 0, -+/*Bit8u BlueMaskSize*/ 0, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 1600, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 0, -+/*Bit8u LinRedFieldPosition*/ 0, -+/*Bit8u LinGreenMaskSize*/ 0, -+/*Bit8u LinGreenFieldPosition*/ 0, -+/*Bit8u LinBlueMaskSize*/ 0, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x011d, /* 1600x1200x15 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 3200, -+/*Bit16u XResolution*/ 1600, -+/*Bit16u YResolution*/ 1200, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 15, -+/*Bit8u NumberOfBanks*/ 59, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 10, -+/*Bit8u GreenMaskSize*/ 5, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 1, -+/*Bit8u RsvdFieldPosition*/ 15, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 3200, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 10, -+/*Bit8u LinGreenMaskSize*/ 5, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 1, -+/*Bit8u LinRsvdFieldPosition*/ 15, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x011e, /* 1600x1200x16 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 3200, -+/*Bit16u XResolution*/ 1600, -+/*Bit16u YResolution*/ 1200, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 16, -+/*Bit8u NumberOfBanks*/ 59, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 11, -+/*Bit8u GreenMaskSize*/ 6, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 3200, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 11, -+/*Bit8u LinGreenMaskSize*/ 6, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x011f, /* 1600x1200x24 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 4800, -+/*Bit16u XResolution*/ 1600, -+/*Bit16u YResolution*/ 1200, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 24, -+/*Bit8u NumberOfBanks*/ 88, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 4800, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, - /*Bit8u LinBlueMaskSize*/ 8, - /*Bit8u LinBlueFieldPosition*/ 0, - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_OWN_MODE_640X480X8888, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0140, /* 320x200x32 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 1280, -+/*Bit16u XResolution*/ 320, -+/*Bit16u YResolution*/ 200, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 32, -+/*Bit8u NumberOfBanks*/ 4, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 8, -+/*Bit8u RsvdFieldPosition*/ 24, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 1280, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 8, -+/*Bit8u LinRsvdFieldPosition*/ 24, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0141, /* 640x400x32 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2560, -+/*Bit16u XResolution*/ 640, -+/*Bit16u YResolution*/ 400, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 32, -+/*Bit8u NumberOfBanks*/ 16, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 8, -+/*Bit8u RsvdFieldPosition*/ 24, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2560, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 8, -+/*Bit8u LinRsvdFieldPosition*/ 24, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0142, /* 640x480x32 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2560, -+/*Bit16u XResolution*/ 640, -+/*Bit16u YResolution*/ 480, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 32, -+/*Bit8u NumberOfBanks*/ 19, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 8, -+/*Bit8u RsvdFieldPosition*/ 24, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2560, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 8, -+/*Bit8u LinRsvdFieldPosition*/ 24, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0143, /* 800x600x32 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 640*4, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 640, -- /*Bit16u YResolution*/ 480, -+/*Bit16u BytesPerScanLine*/ 3200, -+/*Bit16u XResolution*/ 800, -+/*Bit16u YResolution*/ 600, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 32, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u NumberOfBanks*/ 30, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 1, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 8, - /*Bit8u RedFieldPosition*/ 16, - /*Bit8u GreenMaskSize*/ 8, -@@ -1035,17 +1333,11 @@ - /*Bit8u BlueFieldPosition*/ 0, - /*Bit8u RsvdMaskSize*/ 8, - /*Bit8u RsvdFieldPosition*/ 24, -- /*Bit8u DirectColorModeInfo*/ VBE_DIRECTCOLOR_RESERVED_BITS_AVAILABLE, --// Mandatory information for VBE 2.0 and above --#ifdef VBE_HAVE_LFB -+/*Bit8u DirectColorModeInfo*/ 0, - /*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 -- /*Bit16u LinBytesPerScanLine*/ 640*4, -+/*Bit16u LinBytesPerScanLine*/ 3200, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, - /*Bit8u LinRedMaskSize*/ 8, -@@ -1057,46 +1349,28 @@ - /*Bit8u LinRsvdMaskSize*/ 8, - /*Bit8u LinRsvdFieldPosition*/ 24, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_OWN_MODE_800X600X8888, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0144, /* 1024x768x32 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 800*4, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 800, -- /*Bit16u YResolution*/ 600, -+/*Bit16u BytesPerScanLine*/ 4096, -+/*Bit16u XResolution*/ 1024, -+/*Bit16u YResolution*/ 768, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 32, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u NumberOfBanks*/ 48, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 1, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 8, - /*Bit8u RedFieldPosition*/ 16, - /*Bit8u GreenMaskSize*/ 8, -@@ -1105,17 +1379,11 @@ - /*Bit8u BlueFieldPosition*/ 0, - /*Bit8u RsvdMaskSize*/ 8, - /*Bit8u RsvdFieldPosition*/ 24, -- /*Bit8u DirectColorModeInfo*/ VBE_DIRECTCOLOR_RESERVED_BITS_AVAILABLE, --// Mandatory information for VBE 2.0 and above --#ifdef VBE_HAVE_LFB -+/*Bit8u DirectColorModeInfo*/ 0, - /*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 -- /*Bit16u LinBytesPerScanLine*/ 800*4, -+/*Bit16u LinBytesPerScanLine*/ 4096, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, - /*Bit8u LinRedMaskSize*/ 8, -@@ -1127,46 +1395,28 @@ - /*Bit8u LinRsvdMaskSize*/ 8, - /*Bit8u LinRsvdFieldPosition*/ 24, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_OWN_MODE_1024X768X8888, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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 | -- VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+} }, -+{ 0x0145, /* 1280x1024x32 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, -- /*Bit16u BytesPerScanLine*/ 1024*4, --// Mandatory information for VBE 1.2 and above -- /*Bit16u XResolution*/ 1024, -- /*Bit16u YResolution*/ 768, -+/*Bit16u BytesPerScanLine*/ 5120, -+/*Bit16u XResolution*/ 1280, -+/*Bit16u YResolution*/ 1024, - /*Bit8u XCharSize*/ 8, - /*Bit8u YCharSize*/ 16, - /*Bit8u NumberOfPlanes*/ 1, - /*Bit8u BitsPerPixel*/ 32, -- /*Bit8u NumberOfBanks*/ 1, -+/*Bit8u NumberOfBanks*/ 80, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 1, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 8, - /*Bit8u RedFieldPosition*/ 16, - /*Bit8u GreenMaskSize*/ 8, -@@ -1175,17 +1425,11 @@ - /*Bit8u BlueFieldPosition*/ 0, - /*Bit8u RsvdMaskSize*/ 8, - /*Bit8u RsvdFieldPosition*/ 24, -- /*Bit8u DirectColorModeInfo*/ VBE_DIRECTCOLOR_RESERVED_BITS_AVAILABLE, --// Mandatory information for VBE 2.0 and above --#ifdef VBE_HAVE_LFB -+/*Bit8u DirectColorModeInfo*/ 0, - /*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 -- /*Bit16u LinBytesPerScanLine*/ 1024*4, -+/*Bit16u LinBytesPerScanLine*/ 5120, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, - /*Bit8u LinRedMaskSize*/ 8, -@@ -1197,33 +1441,17 @@ - /*Bit8u LinRsvdMaskSize*/ 8, - /*Bit8u LinRsvdFieldPosition*/ 24, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- -- { -- VBE_OWN_MODE_320X200X8, -- { --/*typedef struct ModeInfoBlock --{*/ --// Mandatory information for all VBE revisions -- /*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, -+} }, -+{ 0x0146, /* 320x200x8 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, - /*Bit8u WinBAttributes*/ 0, - /*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, - /*Bit16u WinASegment*/ VGAMEM_GRAPH, -- /*Bit16u WinBSegment*/ 0, -+/*Bit16u WinBSegment*/ 0x0000, - /*Bit32u WinFuncPtr*/ 0, - /*Bit16u BytesPerScanLine*/ 320, --// Mandatory information for VBE 1.2 and above - /*Bit16u XResolution*/ 320, - /*Bit16u YResolution*/ 200, - /*Bit8u XCharSize*/ 8, -@@ -1233,9 +1461,8 @@ - /*Bit8u NumberOfBanks*/ 1, - /*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PACKED_PIXEL, - /*Bit8u BankSize*/ 0, -- /*Bit8u NumberOfImagePages*/ 3, -+/*Bit8u NumberOfImagePages*/ 0, - /*Bit8u Reserved_page*/ 0, --// Direct Color fields (required for direct/6 and YUV/7 memory models) - /*Bit8u RedMaskSize*/ 0, - /*Bit8u RedFieldPosition*/ 0, - /*Bit8u GreenMaskSize*/ 0, -@@ -1245,15 +1472,9 @@ - /*Bit8u RsvdMaskSize*/ 0, - /*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 - /*Bit16u LinBytesPerScanLine*/ 320, - /*Bit8u BnkNumberOfPages*/ 0, - /*Bit8u LinNumberOfPages*/ 0, -@@ -1266,17 +1487,286 @@ - /*Bit8u LinRsvdMaskSize*/ 0, - /*Bit8u LinRsvdFieldPosition*/ 0, - /*Bit32u MaxPixelClock*/ 0, --/*} ModeInfoBlock;*/ -- } -- }, -- --/** END OF THE LIST **/ -- { -- VBE_VESA_MODE_END_OF_LIST, -- { -- 0, -- } -- } -+} }, -+{ 0x0147, /* 1600x1200x32 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 6400, -+/*Bit16u XResolution*/ 1600, -+/*Bit16u YResolution*/ 1200, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 32, -+/*Bit8u NumberOfBanks*/ 118, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 8, -+/*Bit8u RsvdFieldPosition*/ 24, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 6400, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 8, -+/*Bit8u LinRsvdFieldPosition*/ 24, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0148, /* 1152x864x8 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 1152, -+/*Bit16u XResolution*/ 1152, -+/*Bit16u YResolution*/ 864, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 8, -+/*Bit8u NumberOfBanks*/ 16, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_PACKED_PIXEL, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 0, -+/*Bit8u RedFieldPosition*/ 0, -+/*Bit8u GreenMaskSize*/ 0, -+/*Bit8u GreenFieldPosition*/ 0, -+/*Bit8u BlueMaskSize*/ 0, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 1152, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 0, -+/*Bit8u LinRedFieldPosition*/ 0, -+/*Bit8u LinGreenMaskSize*/ 0, -+/*Bit8u LinGreenFieldPosition*/ 0, -+/*Bit8u LinBlueMaskSize*/ 0, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x0149, /* 1152x864x15 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2304, -+/*Bit16u XResolution*/ 1152, -+/*Bit16u YResolution*/ 864, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 15, -+/*Bit8u NumberOfBanks*/ 31, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 10, -+/*Bit8u GreenMaskSize*/ 5, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 1, -+/*Bit8u RsvdFieldPosition*/ 15, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2304, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 10, -+/*Bit8u LinGreenMaskSize*/ 5, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 1, -+/*Bit8u LinRsvdFieldPosition*/ 15, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x014a, /* 1152x864x16 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 2304, -+/*Bit16u XResolution*/ 1152, -+/*Bit16u YResolution*/ 864, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 16, -+/*Bit8u NumberOfBanks*/ 31, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 5, -+/*Bit8u RedFieldPosition*/ 11, -+/*Bit8u GreenMaskSize*/ 6, -+/*Bit8u GreenFieldPosition*/ 5, -+/*Bit8u BlueMaskSize*/ 5, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 2304, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 5, -+/*Bit8u LinRedFieldPosition*/ 11, -+/*Bit8u LinGreenMaskSize*/ 6, -+/*Bit8u LinGreenFieldPosition*/ 5, -+/*Bit8u LinBlueMaskSize*/ 5, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x014b, /* 1152x864x24 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 3456, -+/*Bit16u XResolution*/ 1152, -+/*Bit16u YResolution*/ 864, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 24, -+/*Bit8u NumberOfBanks*/ 46, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 0, -+/*Bit8u RsvdFieldPosition*/ 0, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 3456, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 0, -+/*Bit8u LinRsvdFieldPosition*/ 0, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ 0x014c, /* 1152x864x32 */ -+{ /*Bit16u ModeAttributes*/ VBE_MODE_ATTRIBUTE_SUPPORTED | VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | VBE_MODE_ATTRIBUTE_COLOR_MODE | VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | VBE_MODE_ATTRIBUTE_GRAPHICS_MODE, -+/*Bit8u WinAAttributes*/ VBE_WINDOW_ATTRIBUTE_RELOCATABLE | VBE_WINDOW_ATTRIBUTE_READABLE | VBE_WINDOW_ATTRIBUTE_WRITEABLE, -+/*Bit8u WinBAttributes*/ 0, -+/*Bit16u WinGranularity*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinSize*/ VBE_DISPI_BANK_SIZE_KB, -+/*Bit16u WinASegment*/ VGAMEM_GRAPH, -+/*Bit16u WinBSegment*/ 0x0000, -+/*Bit32u WinFuncPtr*/ 0, -+/*Bit16u BytesPerScanLine*/ 4608, -+/*Bit16u XResolution*/ 1152, -+/*Bit16u YResolution*/ 864, -+/*Bit8u XCharSize*/ 8, -+/*Bit8u YCharSize*/ 16, -+/*Bit8u NumberOfPlanes*/ 1, -+/*Bit8u BitsPerPixel*/ 32, -+/*Bit8u NumberOfBanks*/ 61, -+/*Bit8u MemoryModel*/ VBE_MEMORYMODEL_DIRECT_COLOR, -+/*Bit8u BankSize*/ 0, -+/*Bit8u NumberOfImagePages*/ 0, -+/*Bit8u Reserved_page*/ 0, -+/*Bit8u RedMaskSize*/ 8, -+/*Bit8u RedFieldPosition*/ 16, -+/*Bit8u GreenMaskSize*/ 8, -+/*Bit8u GreenFieldPosition*/ 8, -+/*Bit8u BlueMaskSize*/ 8, -+/*Bit8u BlueFieldPosition*/ 0, -+/*Bit8u RsvdMaskSize*/ 8, -+/*Bit8u RsvdFieldPosition*/ 24, -+/*Bit8u DirectColorModeInfo*/ 0, -+/*Bit32u PhysBasePtr*/ VBE_DISPI_LFB_PHYSICAL_ADDRESS, -+/*Bit32u OffScreenMemOffset*/ 0, -+/*Bit16u OffScreenMemSize*/ 0, -+/*Bit16u LinBytesPerScanLine*/ 4608, -+/*Bit8u BnkNumberOfPages*/ 0, -+/*Bit8u LinNumberOfPages*/ 0, -+/*Bit8u LinRedMaskSize*/ 8, -+/*Bit8u LinRedFieldPosition*/ 16, -+/*Bit8u LinGreenMaskSize*/ 8, -+/*Bit8u LinGreenFieldPosition*/ 8, -+/*Bit8u LinBlueMaskSize*/ 8, -+/*Bit8u LinBlueFieldPosition*/ 0, -+/*Bit8u LinRsvdMaskSize*/ 8, -+/*Bit8u LinRsvdFieldPosition*/ 24, -+/*Bit32u MaxPixelClock*/ 0, -+} }, -+{ VBE_VESA_MODE_END_OF_LIST, -+{ 0, -+} }, - }; ++ Bit16u i, v, crtc_addr, ar_index; ++ ++ crtc_addr = read_word(BIOSMEM_SEG, BIOSMEM_CRTC_ADDRESS); ++ if (CX & 1) { ++ write_byte(ES, BX, inb(VGAREG_SEQU_ADDRESS)); BX++; ++ write_byte(ES, BX, inb(crtc_addr)); BX++; ++ write_byte(ES, BX, inb(VGAREG_GRDC_ADDRESS)); BX++; ++ inb(VGAREG_ACTL_RESET); ++ ar_index = inb(VGAREG_ACTL_ADDRESS); ++ write_byte(ES, BX, ar_index); BX++; ++ write_byte(ES, BX, inb(VGAREG_READ_FEATURE_CTL)); BX++; ++ ++ for(i=1;i<=4;i++){ ++ outb(VGAREG_SEQU_ADDRESS, i); ++ write_byte(ES, BX, inb(VGAREG_SEQU_DATA)); BX++; ++ } ++ outb(VGAREG_SEQU_ADDRESS, 0); ++ write_byte(ES, BX, inb(VGAREG_SEQU_DATA)); BX++; ++ ++ for(i=0;i<=0x18;i++) { ++ outb(crtc_addr,i); ++ write_byte(ES, BX, inb(crtc_addr+1)); BX++; ++ } ++ ++ for(i=0;i<=0x13;i++) { ++ inb(VGAREG_ACTL_RESET); ++ outb(VGAREG_ACTL_ADDRESS, i | (ar_index & 0x20)); ++ write_byte(ES, BX, inb(VGAREG_ACTL_READ_DATA)); BX++; ++ } ++ inb(VGAREG_ACTL_RESET); ++ ++ for(i=0;i<=8;i++) { ++ outb(VGAREG_GRDC_ADDRESS,i); ++ write_byte(ES, BX, inb(VGAREG_GRDC_DATA)); BX++; ++ } ++ ++ write_word(ES, BX, crtc_addr); BX+= 2; ++ ++ /* XXX: read plane latches */ ++ write_byte(ES, BX, 0); BX++; ++ write_byte(ES, BX, 0); BX++; ++ write_byte(ES, BX, 0); BX++; ++ write_byte(ES, BX, 0); BX++; ++ } ++ if (CX & 2) { ++ write_byte(ES, BX, read_byte(BIOSMEM_SEG,BIOSMEM_CURRENT_MODE)); BX++; ++ write_word(ES, BX, read_word(BIOSMEM_SEG,BIOSMEM_NB_COLS)); BX += 2; ++ write_word(ES, BX, read_word(BIOSMEM_SEG,BIOSMEM_PAGE_SIZE)); BX += 2; ++ write_word(ES, BX, read_word(BIOSMEM_SEG,BIOSMEM_CRTC_ADDRESS)); BX += 2; ++ write_byte(ES, BX, read_byte(BIOSMEM_SEG,BIOSMEM_NB_ROWS)); BX++; ++ write_word(ES, BX, read_word(BIOSMEM_SEG,BIOSMEM_CHAR_HEIGHT)); BX += 2; ++ write_byte(ES, BX, read_byte(BIOSMEM_SEG,BIOSMEM_VIDEO_CTL)); BX++; ++ write_byte(ES, BX, read_byte(BIOSMEM_SEG,BIOSMEM_SWITCHES)); BX++; ++ write_byte(ES, BX, read_byte(BIOSMEM_SEG,BIOSMEM_MODESET_CTL)); BX++; ++ write_word(ES, BX, read_word(BIOSMEM_SEG,BIOSMEM_CURSOR_TYPE)); BX += 2; ++ for(i=0;i<8;i++) { ++ write_word(ES, BX, read_word(BIOSMEM_SEG, BIOSMEM_CURSOR_POS+2*i)); ++ BX += 2; ++ } ++ write_word(ES, BX, read_word(BIOSMEM_SEG,BIOSMEM_CURRENT_START)); BX += 2; ++ write_byte(ES, BX, read_byte(BIOSMEM_SEG,BIOSMEM_CURRENT_PAGE)); BX++; ++ /* current font */ ++ write_word(ES, BX, read_word(0, 0x1f * 4)); BX += 2; ++ write_word(ES, BX, read_word(0, 0x1f * 4 + 2)); BX += 2; ++ write_word(ES, BX, read_word(0, 0x43 * 4)); BX += 2; ++ write_word(ES, BX, read_word(0, 0x43 * 4 + 2)); BX += 2; ++ } ++ if (CX & 4) { ++ /* XXX: check this */ ++ write_byte(ES, BX, inb(VGAREG_DAC_STATE)); BX++; /* read/write mode dac */ ++ write_byte(ES, BX, inb(VGAREG_DAC_WRITE_ADDRESS)); BX++; /* pix address */ ++ write_byte(ES, BX, inb(VGAREG_PEL_MASK)); BX++; ++ // Set the whole dac always, from 0 ++ outb(VGAREG_DAC_WRITE_ADDRESS,0x00); ++ for(i=0;i<256*3;i++) { ++ write_byte(ES, BX, inb(VGAREG_DAC_DATA)); BX++; ++ } ++ write_byte(ES, BX, 0); BX++; /* color select register */ ++ } ++ return BX; ++} ++ ++static Bit16u biosfn_restore_video_state (CX,ES,BX) ++ Bit16u CX;Bit16u ES;Bit16u BX; ++{ ++ Bit16u i, crtc_addr, v, addr1, ar_index; ++ ++ if (CX & 1) { ++ // Reset Attribute Ctl flip-flop ++ inb(VGAREG_ACTL_RESET); ++ ++ crtc_addr = read_word(ES, BX + 0x40); ++ addr1 = BX; ++ BX += 5; ++ ++ for(i=1;i<=4;i++){ ++ outb(VGAREG_SEQU_ADDRESS, i); ++ outb(VGAREG_SEQU_DATA, read_byte(ES, BX)); BX++; ++ } ++ outb(VGAREG_SEQU_ADDRESS, 0); ++ outb(VGAREG_SEQU_DATA, read_byte(ES, BX)); BX++; ++ ++ // Disable CRTC write protection ++ outw(crtc_addr,0x0011); ++ // Set CRTC regs ++ for(i=0;i<=0x18;i++) { ++ if (i != 0x11) { ++ outb(crtc_addr,i); ++ outb(crtc_addr+1, read_byte(ES, BX)); ++ } ++ BX++; ++ } ++ // select crtc base address ++ v = inb(VGAREG_READ_MISC_OUTPUT) & ~0x01; ++ if (crtc_addr = 0x3d4) ++ v |= 0x01; ++ outb(VGAREG_WRITE_MISC_OUTPUT, v); ++ ++ // enable write protection if needed ++ outb(crtc_addr, 0x11); ++ outb(crtc_addr+1, read_byte(ES, BX - 0x18 + 0x11)); ++ ++ // Set Attribute Ctl ++ ar_index = read_byte(ES, addr1 + 0x03); ++ inb(VGAREG_ACTL_RESET); ++ for(i=0;i<=0x13;i++) { ++ outb(VGAREG_ACTL_ADDRESS, i | (ar_index & 0x20)); ++ outb(VGAREG_ACTL_WRITE_DATA, read_byte(ES, BX)); BX++; ++ } ++ outb(VGAREG_ACTL_ADDRESS, ar_index); ++ inb(VGAREG_ACTL_RESET); ++ ++ for(i=0;i<=8;i++) { ++ outb(VGAREG_GRDC_ADDRESS,i); ++ outb(VGAREG_GRDC_DATA, read_byte(ES, BX)); BX++; ++ } ++ BX += 2; /* crtc_addr */ ++ BX += 4; /* plane latches */ ++ ++ outb(VGAREG_SEQU_ADDRESS, read_byte(ES, addr1)); addr1++; ++ outb(crtc_addr, read_byte(ES, addr1)); addr1++; ++ outb(VGAREG_GRDC_ADDRESS, read_byte(ES, addr1)); addr1++; ++ addr1++; ++ outb(crtc_addr - 0x4 + 0xa, read_byte(ES, addr1)); addr1++; ++ } ++ if (CX & 2) { ++ write_byte(BIOSMEM_SEG,BIOSMEM_CURRENT_MODE, read_byte(ES, BX)); BX++; ++ write_word(BIOSMEM_SEG,BIOSMEM_NB_COLS, read_word(ES, BX)); BX += 2; ++ write_word(BIOSMEM_SEG,BIOSMEM_PAGE_SIZE, read_word(ES, BX)); BX += 2; ++ write_word(BIOSMEM_SEG,BIOSMEM_CRTC_ADDRESS, read_word(ES, BX)); BX += 2; ++ write_byte(BIOSMEM_SEG,BIOSMEM_NB_ROWS, read_byte(ES, BX)); BX++; ++ write_word(BIOSMEM_SEG,BIOSMEM_CHAR_HEIGHT, read_word(ES, BX)); BX += 2; ++ write_byte(BIOSMEM_SEG,BIOSMEM_VIDEO_CTL, read_byte(ES, BX)); BX++; ++ write_byte(BIOSMEM_SEG,BIOSMEM_SWITCHES, read_byte(ES, BX)); BX++; ++ write_byte(BIOSMEM_SEG,BIOSMEM_MODESET_CTL, read_byte(ES, BX)); BX++; ++ write_word(BIOSMEM_SEG,BIOSMEM_CURSOR_TYPE, read_word(ES, BX)); BX += 2; ++ for(i=0;i<8;i++) { ++ write_word(BIOSMEM_SEG, BIOSMEM_CURSOR_POS+2*i, read_word(ES, BX)); ++ BX += 2; ++ } ++ write_word(BIOSMEM_SEG,BIOSMEM_CURRENT_START, read_word(ES, BX)); BX += 2; ++ write_byte(BIOSMEM_SEG,BIOSMEM_CURRENT_PAGE, read_byte(ES, BX)); BX++; ++ /* current font */ ++ write_word(0, 0x1f * 4, read_word(ES, BX)); BX += 2; ++ write_word(0, 0x1f * 4 + 2, read_word(ES, BX)); BX += 2; ++ write_word(0, 0x43 * 4, read_word(ES, BX)); BX += 2; ++ write_word(0, 0x43 * 4 + 2, read_word(ES, BX)); BX += 2; ++ } ++ if (CX & 4) { ++ BX++; ++ v = read_byte(ES, BX); BX++; ++ outb(VGAREG_PEL_MASK, read_byte(ES, BX)); BX++; ++ // Set the whole dac always, from 0 ++ outb(VGAREG_DAC_WRITE_ADDRESS,0x00); ++ for(i=0;i<256*3;i++) { ++ outb(VGAREG_DAC_DATA, read_byte(ES, BX)); BX++; ++ } ++ BX++; ++ outb(VGAREG_DAC_WRITE_ADDRESS, v); ++ } ++ return BX; + } - #endif + // ============================================================================================ +diff -u -w vbetables-gen.c +--- vbetables-gen.c 1970-01-01 01:00:00.000000000 +0100 ++++ vbetables-gen.c 2006-06-14 00:52:18.000000000 +0200 +@@ -0,0 +1,217 @@ ++/* Generate the VGABIOS VBE Tables */ ++#include ++#include ++ ++typedef struct { ++ int width; ++ int height; ++ int depth; ++ int mode; ++} ModeInfo; ++ ++ModeInfo modes[] = { ++ /* standard VESA modes */ ++{ 640, 400, 8 , 0x100}, ++{ 640, 480, 8 , 0x101}, ++{ 800, 600, 4 , 0x102}, ++{ 800, 600, 8 , 0x103}, ++ //{ 1024, 768, 4 , 0x104}, ++{ 1024, 768, 8 , 0x105}, ++ //{ 1280, 1024, 4 , 0x106}, ++{ 1280, 1024, 8 , 0x107}, ++{ 320, 200, 15 , 0x10D}, ++{ 320, 200, 16 , 0x10E}, ++{ 320, 200, 24 , 0x10F}, ++{ 640, 480, 15 , 0x110}, ++{ 640, 480, 16 , 0x111}, ++{ 640, 480, 24 , 0x112}, ++{ 800, 600, 15 , 0x113}, ++{ 800, 600, 16 , 0x114}, ++{ 800, 600, 24 , 0x115}, ++{ 1024, 768, 15 , 0x116}, ++{ 1024, 768, 16 , 0x117}, ++{ 1024, 768, 24 , 0x118}, ++{ 1280, 1024, 15 , 0x119}, ++{ 1280, 1024, 16 , 0x11A}, ++{ 1280, 1024, 24 , 0x11B}, ++{ 1600, 1200, 8 , 0x11C}, ++{ 1600, 1200, 15 , 0x11D}, ++{ 1600, 1200, 16 , 0x11E}, ++{ 1600, 1200, 24 , 0x11F}, ++ ++ /* BOCHS/PLE, 86 'own' mode numbers */ ++{ 320, 200, 32 , 0x140}, ++{ 640, 400, 32 , 0x141}, ++{ 640, 480, 32 , 0x142}, ++{ 800, 600, 32 , 0x143}, ++{ 1024, 768, 32 , 0x144}, ++{ 1280, 1024, 32 , 0x145}, ++{ 320, 200, 8 , 0x146}, ++{ 1600, 1200, 32 , 0x147}, ++{ 1152, 864, 8 , 0x148}, ++{ 1152, 864, 15 , 0x149}, ++{ 1152, 864, 16 , 0x14a}, ++{ 1152, 864, 24 , 0x14b}, ++{ 1152, 864, 32 , 0x14c}, ++{ 0, }, ++}; ++ ++int main(int argc, char **argv) ++{ ++ const ModeInfo *pm; ++ int pitch, r_size, r_pos, g_size, g_pos, b_size, b_pos, a_size, a_pos; ++ const char *str; ++ ++ printf("/* THIS FILE IS AUTOMATICALLY GENERATED - DO NOT EDIT */\n"); ++ printf("static ModeInfoListItem mode_info_list[]=\n"); ++ printf("{\n"); ++ for(pm = modes; pm->mode != 0; pm++) { ++ printf("{ 0x%04x, /* %dx%dx%d */\n", ++ pm->mode, pm->width, pm->height, pm->depth); ++ printf("{ /*Bit16u ModeAttributes*/ %s,\n", ++ "VBE_MODE_ATTRIBUTE_SUPPORTED | " ++ "VBE_MODE_ATTRIBUTE_EXTENDED_INFORMATION_AVAILABLE | " ++ "VBE_MODE_ATTRIBUTE_COLOR_MODE | " ++ "VBE_MODE_ATTRIBUTE_LINEAR_FRAME_BUFFER_MODE | " ++ "VBE_MODE_ATTRIBUTE_GRAPHICS_MODE"); ++ ++ printf("/*Bit8u WinAAttributes*/ %s,\n", ++ "VBE_WINDOW_ATTRIBUTE_RELOCATABLE | " ++ "VBE_WINDOW_ATTRIBUTE_READABLE | " ++ "VBE_WINDOW_ATTRIBUTE_WRITEABLE"); ++ ++ printf("/*Bit8u WinBAttributes*/ %d,\n", 0); ++ ++ printf("/*Bit16u WinGranularity*/ %s,\n", "VBE_DISPI_BANK_SIZE_KB"); ++ ++ printf("/*Bit16u WinSize*/ %s,\n", "VBE_DISPI_BANK_SIZE_KB"); ++ ++ printf("/*Bit16u WinASegment*/ %s,\n", "VGAMEM_GRAPH"); ++ ++ printf("/*Bit16u WinBSegment*/ 0x%04x,\n", 0); ++ ++ printf("/*Bit32u WinFuncPtr*/ %d,\n", 0); ++ ++ if (pm->depth == 4) ++ pitch = (pm->width + 7) / 8; ++ else ++ pitch = pm->width * ((pm->depth + 7) / 8); ++ printf("/*Bit16u BytesPerScanLine*/ %d,\n", pitch); ++ ++ // Mandatory information for VBE 1.2 and above ++ printf("/*Bit16u XResolution*/ %d,\n", pm->width); ++ printf("/*Bit16u YResolution*/ %d,\n", pm->height); ++ printf("/*Bit8u XCharSize*/ %d,\n", 8); ++ printf("/*Bit8u YCharSize*/ %d,\n", 16); ++ if (pm->depth == 4) { ++ printf("/*Bit8u NumberOfPlanes*/ %d,\n", 4); ++ printf("/*Bit8u BitsPerPixel*/ %d,\n", pm->depth); ++ } else { ++ printf("/*Bit8u NumberOfPlanes*/ %d,\n", 1); ++ printf("/*Bit8u BitsPerPixel*/ %d,\n", pm->depth); ++ } ++ printf("/*Bit8u NumberOfBanks*/ %d,\n", ++ (pm->height * pitch + 65535) / 65536); ++ ++ if (pm->depth == 4) ++ str = "VBE_MEMORYMODEL_PLANAR"; ++ else if (pm->depth == 8) ++ str = "VBE_MEMORYMODEL_PACKED_PIXEL"; ++ else ++ str = "VBE_MEMORYMODEL_DIRECT_COLOR"; ++ printf("/*Bit8u MemoryModel*/ %s,\n", str); ++ printf("/*Bit8u BankSize*/ %d,\n", 0); ++ /* XXX: check */ ++ printf("/*Bit8u NumberOfImagePages*/ %d,\n", 0); ++ printf("/*Bit8u Reserved_page*/ %d,\n", 0); ++ ++ // Direct Color fields (required for direct/6 and YUV/7 memory models) ++ switch(pm->depth) { ++ case 15: ++ r_size = 5; ++ r_pos = 10; ++ g_size = 5; ++ g_pos = 5; ++ b_size = 5; ++ b_pos = 0; ++ a_size = 1; ++ a_pos = 15; ++ break; ++ case 16: ++ r_size = 5; ++ r_pos = 11; ++ g_size = 6; ++ g_pos = 5; ++ b_size = 5; ++ b_pos = 0; ++ a_size = 0; ++ a_pos = 0; ++ break; ++ case 24: ++ r_size = 8; ++ r_pos = 16; ++ g_size = 8; ++ g_pos = 8; ++ b_size = 8; ++ b_pos = 0; ++ a_size = 0; ++ a_pos = 0; ++ break; ++ case 32: ++ r_size = 8; ++ r_pos = 16; ++ g_size = 8; ++ g_pos = 8; ++ b_size = 8; ++ b_pos = 0; ++ a_size = 8; ++ a_pos = 24; ++ break; ++ default: ++ r_size = 0; ++ r_pos = 0; ++ g_size = 0; ++ g_pos = 0; ++ b_size = 0; ++ b_pos = 0; ++ a_size = 0; ++ a_pos = 0; ++ break; ++ } ++ ++ printf("/*Bit8u RedMaskSize*/ %d,\n", r_size); ++ printf("/*Bit8u RedFieldPosition*/ %d,\n", r_pos); ++ printf("/*Bit8u GreenMaskSize*/ %d,\n", g_size); ++ printf("/*Bit8u GreenFieldPosition*/ %d,\n", g_pos); ++ printf("/*Bit8u BlueMaskSize*/ %d,\n", b_size); ++ printf("/*Bit8u BlueFieldPosition*/ %d,\n", b_pos); ++ printf("/*Bit8u RsvdMaskSize*/ %d,\n", a_size); ++ printf("/*Bit8u RsvdFieldPosition*/ %d,\n", a_pos); ++ printf("/*Bit8u DirectColorModeInfo*/ %d,\n", 0); ++ ++// Mandatory information for VBE 2.0 and above ++ printf("/*Bit32u PhysBasePtr*/ %s,\n", ++ "VBE_DISPI_LFB_PHYSICAL_ADDRESS"); ++ printf("/*Bit32u OffScreenMemOffset*/ %d,\n", 0); ++ printf("/*Bit16u OffScreenMemSize*/ %d,\n", 0); ++ // Mandatory information for VBE 3.0 and above ++ printf("/*Bit16u LinBytesPerScanLine*/ %d,\n", pitch); ++ printf("/*Bit8u BnkNumberOfPages*/ %d,\n", 0); ++ printf("/*Bit8u LinNumberOfPages*/ %d,\n", 0); ++ printf("/*Bit8u LinRedMaskSize*/ %d,\n", r_size); ++ printf("/*Bit8u LinRedFieldPosition*/ %d,\n", r_pos); ++ printf("/*Bit8u LinGreenMaskSize*/ %d,\n", g_size); ++ printf("/*Bit8u LinGreenFieldPosition*/ %d,\n", g_pos); ++ printf("/*Bit8u LinBlueMaskSize*/ %d,\n", b_size); ++ printf("/*Bit8u LinBlueFieldPosition*/ %d,\n", b_pos); ++ printf("/*Bit8u LinRsvdMaskSize*/ %d,\n", a_size); ++ printf("/*Bit8u LinRsvdFieldPosition*/ %d,\n", a_pos); ++ printf("/*Bit32u MaxPixelClock*/ %d,\n", 0); ++ printf("} },\n"); ++ } ++ printf("{ VBE_VESA_MODE_END_OF_LIST,\n"); ++ printf("{ 0,\n"); ++ printf("} },\n"); ++ printf("};\n"); ++ return 0; ++}