From 3e2c0a326466fb4f6e093520f53d61ee768a1036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 10 Apr 2005 14:45:24 +0000 Subject: [PATCH] kDefaultPageFlags is now defined in mmu.h, so that it can be used by other sources as well. Maybe we can remove that parameter from mmu_map_physical_memory() altogether, though. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12283 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/platform/bios_ia32/mmu.cpp | 1 - src/kernel/boot/platform/bios_ia32/mmu.h | 9 ++++++--- src/kernel/boot/platform/bios_ia32/video.cpp | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/kernel/boot/platform/bios_ia32/mmu.cpp b/src/kernel/boot/platform/bios_ia32/mmu.cpp index c73eeca6e5..b793c7bb65 100644 --- a/src/kernel/boot/platform/bios_ia32/mmu.cpp +++ b/src/kernel/boot/platform/bios_ia32/mmu.cpp @@ -57,7 +57,6 @@ struct extended_memory { uint32 type; }; -static const uint32 kDefaultPageFlags = 0x03; // present, R/W static const uint32 kDefaultPageTableFlags = 0x07; // present, user, R/W static const size_t kMaxKernelSize = 0x100000; // 1 MB for the kernel diff --git a/src/kernel/boot/platform/bios_ia32/mmu.h b/src/kernel/boot/platform/bios_ia32/mmu.h index 04baa2f6f0..7cd38633f9 100644 --- a/src/kernel/boot/platform/bios_ia32/mmu.h +++ b/src/kernel/boot/platform/bios_ia32/mmu.h @@ -1,7 +1,7 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the OpenBeOS License. -*/ + * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #ifndef MMU_H #define MMU_H @@ -9,6 +9,9 @@ #include +// For use with mmu_map_physical_memory() +static const uint32 kDefaultPageFlags = 0x3; // present, R/W + #ifdef __cplusplus extern "C" { #endif diff --git a/src/kernel/boot/platform/bios_ia32/video.cpp b/src/kernel/boot/platform/bios_ia32/video.cpp index 2960fad257..5ab7c71fa4 100644 --- a/src/kernel/boot/platform/bios_ia32/video.cpp +++ b/src/kernel/boot/platform/bios_ia32/video.cpp @@ -479,7 +479,7 @@ fallback: if (lastBase == 0) { // the graphics memory has not been mapped yet! sFrameBuffer = mmu_map_physical_memory(gKernelArgs.frame_buffer.physical_buffer.start, - gKernelArgs.frame_buffer.physical_buffer.size, 0x03); + gKernelArgs.frame_buffer.physical_buffer.size, kDefaultPageFlags); } // clear the video memory