From 027c6be29f860c56815d70465b9db56abd175807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 19 Oct 2004 23:07:19 +0000 Subject: [PATCH] Updated due to changes to the kernel_args frame buffer structure. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9422 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/arch/x86/stage2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/kernel/boot/arch/x86/stage2.c b/src/kernel/boot/arch/x86/stage2.c index 583df0a154..d32a75f20e 100644 --- a/src/kernel/boot/arch/x86/stage2.c +++ b/src/kernel/boot/arch/x86/stage2.c @@ -143,15 +143,15 @@ _start(uint32 memSize, ext_memory *extMemoryBlock, uint32 extMemoryCount, if (in_vesa) { struct VBEModeInfoBlock *mode_info = (struct VBEModeInfoBlock *)(vesa_ptr + 0x200); - ka->fb.enabled = 1; - ka->fb.x_size = mode_info->x_resolution; - ka->fb.y_size = mode_info->y_resolution; - ka->fb.bit_depth = mode_info->bits_per_pixel; - ka->fb.mapping.start = mode_info->phys_base_ptr; - ka->fb.mapping.size = ka->fb.x_size * ka->fb.y_size * (ka->fb.bit_depth/8); - ka->fb.already_mapped = 0; + ka->frame_buffer.enabled = 1; + ka->frame_buffer.width = mode_info->x_resolution; + ka->frame_buffer.height = mode_info->y_resolution; + ka->frame_buffer.depth = mode_info->bits_per_pixel; + ka->frame_buffer.physical_buffer.start = mode_info->phys_base_ptr; + ka->frame_buffer.physical_buffer.size = ka->frame_buffer.width + * ka->frame_buffer.height * (ka->frame_buffer.depth / 8); } else - ka->fb.enabled = 0; + ka->frame_buffer.enabled = 0; mmu_init(ka, &next_paddr); @@ -352,8 +352,8 @@ _start(uint32 memSize, ext_memory *extMemoryBlock, uint32 extMemoryCount, ka->kernel_args_size = sizeof(kernel_args); ka->version = CURRENT_KERNEL_ARGS_VERSION; ka->arch_args.system_time_cv_factor = cv_factor; - ka->str = NULL; ka->arch_args.page_hole = 0xffc00000; + ka->num_kernel_args_ranges = 0; ka->num_cpus = 1; #if 0 dprintf("kernel args at 0x%x\n", ka);