i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the resolution of the boot loader to a maximal width of 800 pixels to

Browse Source 
have a smaller window in Bochs :)
Debugging output only if TRACE_VIDEO was defined.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8733 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-08-31 01:04:24 +00:00
parent d885b0a17c
commit b1cd9d2d94
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/boot/platform/bios_ia32/video.cpp
+17 -8
View File
@@ -21,6 +21,14 @@
#include <string.h> #include <string.h>
//#define TRACE_VIDEO
#ifdef TRACE_VIDEO
# define TRACE(x) printf x
#else
# define TRACE(x) ;
#endif
struct video_mode { struct video_mode {
list_link link; list_link link;
uint16 mode; uint16 mode;
@@ -117,14 +125,14 @@ vesa_init(vbe_info_block *info, video_mode **_standardMode)
if (mode == 0xffff) if (mode == 0xffff)
break; break;
dprintf(" %lx: ", mode); TRACE((" %lx: ", mode));
struct vbe_mode_info modeInfo; struct vbe_mode_info modeInfo;
if (vesa_get_mode_info(mode, &modeInfo) == B_OK) { if (vesa_get_mode_info(mode, &modeInfo) == B_OK) {
dprintf("%ld x %ld x %ld (a = %ld, mem = %ld, phy = %lx, p = %ld, b = %ld)\n", TRACE(("%ld x %ld x %ld (a = %ld, mem = %ld, phy = %lx, p = %ld, b = %ld)\n",
modeInfo.width, modeInfo.height, modeInfo.bits_per_pixel, modeInfo.attributes, modeInfo.width, modeInfo.height, modeInfo.bits_per_pixel, modeInfo.attributes,
modeInfo.memory_model, modeInfo.physical_base, modeInfo.num_planes, modeInfo.memory_model, modeInfo.physical_base, modeInfo.num_planes,
modeInfo.num_banks); modeInfo.num_banks));
const uint32 requiredAttributes = MODE_ATTR_AVAILABLE | MODE_ATTR_GRAPHICS_MODE const uint32 requiredAttributes = MODE_ATTR_AVAILABLE | MODE_ATTR_GRAPHICS_MODE
| MODE_ATTR_COLOR_MODE | MODE_ATTR_LINEAR_BUFFER; | MODE_ATTR_COLOR_MODE | MODE_ATTR_LINEAR_BUFFER;
@@ -150,15 +158,15 @@ vesa_init(vbe_info_block *info, video_mode **_standardMode)
standardMode = videoMode; standardMode = videoMode;
else if (standardMode != NULL) { else if (standardMode != NULL) {
// switch to the one with the higher resolution // switch to the one with the higher resolution
// ToDo: is that always a good idea? // ToDo: is that always a good idea? for now we'll use 800x600
if (modeInfo.width > standardMode->width) if (modeInfo.width > standardMode->width && modeInfo.width <= 800)
standardMode = videoMode; standardMode = videoMode;
} }
list_add_item(&sModeList, videoMode); list_add_item(&sModeList, videoMode);
} }
} else } else
dprintf("(failed)\n"); TRACE(("(failed)\n"));
} }
if (standardMode == NULL) { if (standardMode == NULL) {
@@ -373,11 +381,12 @@ platform_init_video(void)
sVesaCompatible = vesa_init(&sInfo, &sMode) == B_OK; sVesaCompatible = vesa_init(&sInfo, &sMode) == B_OK;
if (!sVesaCompatible) { if (!sVesaCompatible) {
dprintf("No VESA compatible graphics!\n"); TRACE(("No VESA compatible graphics!\n"));
return B_ERROR; return B_ERROR;
} }
dprintf("VESA compatible graphics!\n"); TRACE(("VESA compatible graphics!\n"));
return B_OK; return B_OK;
} }