Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No longer enables video mode when in debug mode (when a menu came up before

Browse Source 
it switched to the logo mode afterwards).
Improved and broke the second call of platform_switch_to_logo() with a
different video mode: it now at least works when switching to a lower
resolution.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9535 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-10-27 16:25:30 +00:00
parent ead4f89ebb
commit a7fb02e6a2
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/kernel/boot/platform/bios_ia32/video.cpp
View File

@ -313,6 +313,10 @@ video_mode_menu()
extern "C" void extern "C" void
platform_switch_to_logo(void) platform_switch_to_logo(void)
{ {
// in debug mode, we'll never show the logo
if ((platform_boot_options() & BOOT_OPTION_DEBUG_OUTPUT) != 0)
return;
if (!sVesaCompatible || sMode == NULL) if (!sVesaCompatible || sMode == NULL)
// no logo for now... // no logo for now...
return; return;
@ -322,29 +326,35 @@ platform_switch_to_logo(void)
gKernelArgs.frame_buffer.enabled = 1; gKernelArgs.frame_buffer.enabled = 1;
if (gKernelArgs.frame_buffer.physical_buffer.start == 0) { struct vbe_mode_info modeInfo;
// the graphics memory has not been mapped yet! if (vesa_get_mode_info(sMode->mode, &modeInfo) != B_OK) {
struct vbe_mode_info modeInfo; platform_switch_to_text_mode();
if (vesa_get_mode_info(sMode->mode, &modeInfo) != B_OK) { return;
platform_switch_to_text_mode(); }
return;
}
gKernelArgs.frame_buffer.width = modeInfo.width; addr_t lastBase = gKernelArgs.frame_buffer.physical_buffer.start;
gKernelArgs.frame_buffer.height = modeInfo.height;
gKernelArgs.frame_buffer.depth = modeInfo.bits_per_pixel; gKernelArgs.frame_buffer.width = modeInfo.width;
gKernelArgs.frame_buffer.physical_buffer.size = gKernelArgs.frame_buffer.width gKernelArgs.frame_buffer.height = modeInfo.height;
* gKernelArgs.frame_buffer.height * (gKernelArgs.frame_buffer.depth / 8); gKernelArgs.frame_buffer.depth = modeInfo.bits_per_pixel;
gKernelArgs.frame_buffer.physical_buffer.start = modeInfo.physical_base; gKernelArgs.frame_buffer.physical_buffer.size = gKernelArgs.frame_buffer.width
* gKernelArgs.frame_buffer.height * (gKernelArgs.frame_buffer.depth / 8);
gKernelArgs.frame_buffer.physical_buffer.start = modeInfo.physical_base;
// ToDo: we assume that physical base is constant through the different resolutions
// ToDo: this is broken - if the newly chosen video mode is larger than the old one
// the boot loader will crash while trying to access unmapped memory
if (lastBase == 0) {
// the graphics memory has not been mapped yet!
sFrameBuffer = mmu_map_physical_memory(modeInfo.physical_base, sFrameBuffer = mmu_map_physical_memory(modeInfo.physical_base,
gKernelArgs.frame_buffer.physical_buffer.size, 0x03); gKernelArgs.frame_buffer.physical_buffer.size, 0x03);
// clear the video memory
// ToDo: this shouldn't be necessary on real hardware (and Bochs), but
// at least booting with Qemu looks ugly when this is missing
memset((void *)sFrameBuffer, 0, gKernelArgs.frame_buffer.physical_buffer.size);
} }
// clear the video memory
// ToDo: this shouldn't be necessary on real hardware (and Bochs), but
// at least booting with Qemu looks ugly when this is missing
memset((void *)sFrameBuffer, 0, gKernelArgs.frame_buffer.physical_buffer.size);
if (vesa_set_palette((const uint8 *)kPalette, 0, 256) != B_OK) if (vesa_set_palette((const uint8 *)kPalette, 0, 256) != B_OK)
dprintf("set palette failed!\n"); dprintf("set palette failed!\n");