mirror of
https://github.com/reactos/reactos.git
synced 2024-11-20 06:15:26 +00:00
- Replaced the old default mode algortihm with video mode list sorting.
- Added check for video mode memory model since we don't support anything but Direct Color and Packed Pixel modes. - More work in order to support VBE 1.2. - Fixed retun values in VBEInitialize. svn path=/trunk/; revision=9899
This commit is contained in:
Filip Navara
parent
629da60934
commit
2bb2c4aae8
2 changed files with 104 additions and 40 deletions
|
|
@ -68,6 +68,85 @@ VBEFindAdapter(
|
|||
return NO_ERROR;
|
||||
}
|
||||
|
||||
/*
|
||||
* VBESortModesCallback
|
||||
*
|
||||
* Helper function for sorting video mode list.
|
||||
*/
|
||||
|
||||
static int
|
||||
VBESortModesCallback(PVBE_MODEINFO VbeModeInfoA, PVBE_MODEINFO VbeModeInfoB)
|
||||
{
|
||||
DPRINT(("VBESortModesCallback: %dx%dx%d / %dx%dx%d\n",
|
||||
VbeModeInfoA->XResolution, VbeModeInfoA->YResolution,
|
||||
VbeModeInfoA->BitsPerPixel,
|
||||
VbeModeInfoB->XResolution, VbeModeInfoB->YResolution,
|
||||
VbeModeInfoB->BitsPerPixel));
|
||||
|
||||
/*
|
||||
* FIXME: Until some reasonable method for changing video modes will
|
||||
* be available we favor more bits per pixel. It should be changed
|
||||
* later.
|
||||
*/
|
||||
if (VbeModeInfoA->BitsPerPixel < VbeModeInfoB->BitsPerPixel) return 1;
|
||||
if (VbeModeInfoA->BitsPerPixel > VbeModeInfoB->BitsPerPixel) return -1;
|
||||
if (VbeModeInfoA->XResolution < VbeModeInfoB->XResolution) return -1;
|
||||
if (VbeModeInfoA->XResolution > VbeModeInfoB->XResolution) return 1;
|
||||
if (VbeModeInfoA->YResolution < VbeModeInfoB->YResolution) return -1;
|
||||
if (VbeModeInfoA->YResolution > VbeModeInfoB->YResolution) return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* VBESortModes
|
||||
*
|
||||
* Simple function for sorting the video mode list. Uses bubble sort.
|
||||
*/
|
||||
|
||||
VOID FASTCALL
|
||||
VBESortModes(PVBE_DEVICE_EXTENSION DeviceExtension)
|
||||
{
|
||||
BOOLEAN Finished = FALSE;
|
||||
ULONG Pos;
|
||||
int Result;
|
||||
VBE_MODEINFO TempModeInfo;
|
||||
WORD TempModeNumber;
|
||||
|
||||
while (!Finished)
|
||||
{
|
||||
Finished = TRUE;
|
||||
for (Pos = 0; Pos < DeviceExtension->ModeCount - 1; Pos++)
|
||||
{
|
||||
Result = VBESortModesCallback(
|
||||
DeviceExtension->ModeInfo + Pos,
|
||||
DeviceExtension->ModeInfo + Pos + 1);
|
||||
if (Result > 0)
|
||||
{
|
||||
Finished = FALSE;
|
||||
|
||||
VideoPortMoveMemory(
|
||||
&TempModeInfo,
|
||||
DeviceExtension->ModeInfo + Pos,
|
||||
sizeof(VBE_MODEINFO));
|
||||
TempModeNumber = DeviceExtension->ModeNumbers[Pos];
|
||||
|
||||
VideoPortMoveMemory(
|
||||
DeviceExtension->ModeInfo + Pos,
|
||||
DeviceExtension->ModeInfo + Pos + 1,
|
||||
sizeof(VBE_MODEINFO));
|
||||
DeviceExtension->ModeNumbers[Pos] =
|
||||
DeviceExtension->ModeNumbers[Pos + 1];
|
||||
|
||||
VideoPortMoveMemory(
|
||||
DeviceExtension->ModeInfo + Pos + 1,
|
||||
&TempModeInfo,
|
||||
sizeof(VBE_MODEINFO));
|
||||
DeviceExtension->ModeNumbers[Pos + 1] = TempModeNumber;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* VBEInitialize
|
||||
*
|
||||
|
|
@ -93,9 +172,6 @@ VBEInitialize(PVOID HwDeviceExtension)
|
|||
USHORT ModeTemp;
|
||||
ULONG CurrentMode;
|
||||
PVBE_MODEINFO VbeModeInfo;
|
||||
VBE_MODEINFO TempVbeModeInfo;
|
||||
WORD TempVbeModeNumber;
|
||||
WORD DefaultMode;
|
||||
|
||||
/*
|
||||
* Get the Int 10 interface that we will use for allocating real
|
||||
|
|
@ -112,7 +188,7 @@ VBEInitialize(PVOID HwDeviceExtension)
|
|||
if (Status != NO_ERROR)
|
||||
{
|
||||
DPRINT(("Failed to get Int 10 service functions (Status %x)\n", Status));
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -131,7 +207,7 @@ VBEInitialize(PVOID HwDeviceExtension)
|
|||
if (Status != NO_ERROR)
|
||||
{
|
||||
DPRINT(("Failed to allocate virtual memory (Status %x)\n", Status));
|
||||
return 0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -174,27 +250,15 @@ VBEInitialize(PVOID HwDeviceExtension)
|
|||
#endif
|
||||
{
|
||||
DPRINT(("VBE BIOS present, but incompatible version.\n"));
|
||||
return ERROR_DEV_NOT_EXIST;
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
DPRINT(("No VBE BIOS found.\n"));
|
||||
return ERROR_DEV_NOT_EXIST;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#ifdef VBE12_SUPPORT
|
||||
if (VBEDeviceExtension->VbeInfo.Version < 0x200)
|
||||
{
|
||||
/*
|
||||
* FIXME: Build a mode list here based on the total memory
|
||||
* available on the video card and the video mode tables
|
||||
* from the VBE specification.
|
||||
*/
|
||||
return ERROR_NOT_SUPPORTED;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Build a mode list here that can be later used by
|
||||
* IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES and IOCTL_VIDEO_QUERY_AVAIL_MODES
|
||||
|
|
@ -236,7 +300,7 @@ VBEInitialize(PVOID HwDeviceExtension)
|
|||
* Get the actual mode infos.
|
||||
*/
|
||||
|
||||
for (CurrentMode = 0, SuitableModeCount = 0, DefaultMode = 0;
|
||||
for (CurrentMode = 0, SuitableModeCount = 0;
|
||||
CurrentMode < ModeCount;
|
||||
CurrentMode++)
|
||||
{
|
||||
|
|
@ -272,16 +336,21 @@ VBEInitialize(PVOID HwDeviceExtension)
|
|||
if (BiosRegisters.Eax == VBE_SUCCESS &&
|
||||
VbeModeInfo->XResolution >= 640 &&
|
||||
VbeModeInfo->YResolution >= 480 &&
|
||||
(VbeModeInfo->ModeAttributes & VBE_MODEATTR_LINEAR))
|
||||
(VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_PACKEDPIXEL ||
|
||||
VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_DIRECTCOLOR))
|
||||
{
|
||||
VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp | 0x4000;
|
||||
if (VbeModeInfo->XResolution == 640 &&
|
||||
VbeModeInfo->YResolution == 480 &&
|
||||
VbeModeInfo->BitsPerPixel == 32)
|
||||
if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_LINEAR)
|
||||
{
|
||||
DefaultMode = SuitableModeCount;
|
||||
VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp | 0x4000;
|
||||
SuitableModeCount++;
|
||||
}
|
||||
SuitableModeCount++;
|
||||
#ifdef VBE12_SUPPORT
|
||||
else
|
||||
{
|
||||
VBEDeviceExtension->ModeNumbers[SuitableModeCount] = ModeTemp;
|
||||
SuitableModeCount++;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -291,21 +360,13 @@ VBEInitialize(PVOID HwDeviceExtension)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
VBEDeviceExtension->ModeCount = SuitableModeCount;
|
||||
|
||||
/*
|
||||
* Exchange the default mode so it's at the first place in list.
|
||||
* Sort the video mode list according to resolution and bits per pixel.
|
||||
*/
|
||||
|
||||
VideoPortMoveMemory(&TempVbeModeInfo, VBEDeviceExtension->ModeInfo,
|
||||
sizeof(VBE_MODEINFO));
|
||||
VideoPortMoveMemory(VBEDeviceExtension->ModeInfo, VBEDeviceExtension->ModeInfo + DefaultMode,
|
||||
sizeof(VBE_MODEINFO));
|
||||
VideoPortMoveMemory(VBEDeviceExtension->ModeInfo + DefaultMode, &TempVbeModeInfo,
|
||||
sizeof(VBE_MODEINFO));
|
||||
TempVbeModeNumber = VBEDeviceExtension->ModeNumbers[0];
|
||||
VBEDeviceExtension->ModeNumbers[0] = VBEDeviceExtension->ModeNumbers[DefaultMode];
|
||||
VBEDeviceExtension->ModeNumbers[DefaultMode] = TempVbeModeNumber;
|
||||
|
||||
VBEDeviceExtension->ModeCount = SuitableModeCount;
|
||||
VBESortModes(VBEDeviceExtension);
|
||||
|
||||
/*
|
||||
* Print the supported video modes when DBG is set.
|
||||
|
|
|
|||
|
|
@ -73,11 +73,14 @@
|
|||
#define VBE_DISPLAY_DATA_CHANNEL 0x4F14
|
||||
|
||||
/*
|
||||
* VBE Video Mode Information Attributes
|
||||
* VBE Video Mode Information Definitions
|
||||
*/
|
||||
|
||||
#define VBE_MODEATTR_LINEAR 0x80
|
||||
|
||||
#define VBE_MEMORYMODEL_PACKEDPIXEL 0x04
|
||||
#define VBE_MEMORYMODEL_DIRECTCOLOR 0x06
|
||||
|
||||
/*
|
||||
* VBE Return Codes
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue