mirror of
https://github.com/reactos/reactos.git
synced 2024-12-27 17:44:45 +00:00
- Map only the vga frame buffer for the hal to write debug messages
and map it higher up in the kernel address space so more space is available for the nonpaged and paged pools. svn path=/trunk/; revision=8769
This commit is contained in:
parent
d4bd6869fe
commit
3db0cc5595
4 changed files with 22 additions and 12 deletions
|
@ -16,7 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id: display.c,v 1.13 2004/01/18 22:35:26 gdalsnes Exp $
|
/* $Id: display.c,v 1.14 2004/03/16 22:45:55 dwelch Exp $
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
|
@ -577,9 +577,8 @@ HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock)
|
||||||
ULONG ScanLines;
|
ULONG ScanLines;
|
||||||
ULONG Data;
|
ULONG Data;
|
||||||
|
|
||||||
VideoBuffer = (WORD *)(0xd0000000 + 0xb8000);
|
VideoBuffer = (WORD *)(0xff3b8000);
|
||||||
GraphVideoBuffer = (PUCHAR)(0xd0000000 + 0xa0000);
|
GraphVideoBuffer = (PUCHAR)(0xff3a0000);
|
||||||
// VideoBuffer = HalMapPhysicalMemory (0xb8000, 2);
|
|
||||||
|
|
||||||
/* Set cursor position */
|
/* Set cursor position */
|
||||||
// CursorX = LoaderBlock->cursorx;
|
// CursorX = LoaderBlock->cursorx;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id: mda.c,v 1.3 2002/09/08 10:23:27 chorns Exp $
|
/* $Id: mda.c,v 1.4 2004/03/16 22:45:56 dwelch Exp $
|
||||||
*
|
*
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* FILE: ntoskrnl/kd/mda.c
|
* FILE: ntoskrnl/kd/mda.c
|
||||||
|
@ -77,7 +77,7 @@ KdInitializeMda(VOID)
|
||||||
MdaStatusPort = 0x3ba;
|
MdaStatusPort = 0x3ba;
|
||||||
MdaGfxPort = 0x3bf;
|
MdaGfxPort = 0x3bf;
|
||||||
|
|
||||||
VideoBuffer = (PUSHORT)(0xd0000000 + 0xb0000);
|
VideoBuffer = (PUSHORT)(0xff3b0000);
|
||||||
|
|
||||||
MdaCursorX = MdaCursorY = 0;
|
MdaCursorX = MdaCursorY = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,7 +139,6 @@ _multiboot_entry:
|
||||||
movl $(V2P(kernel_pagetable+30*4096) + 0x7), 0xC78(%esi)
|
movl $(V2P(kernel_pagetable+30*4096) + 0x7), 0xC78(%esi)
|
||||||
movl $(V2P(kernel_pagetable+31*4096) + 0x7), 0xC7c(%esi)
|
movl $(V2P(kernel_pagetable+31*4096) + 0x7), 0xC7c(%esi)
|
||||||
|
|
||||||
movl $(V2P(lowmem_pagetable) + 0x7), 0xD00(%esi)
|
|
||||||
movl $(V2P(startup_pagedirectory) + 0x7), 0xF00(%esi)
|
movl $(V2P(startup_pagedirectory) + 0x7), 0xF00(%esi)
|
||||||
#ifdef MP
|
#ifdef MP
|
||||||
movl $(V2P(apic_pagetable) + 0x7), 0xFEC(%esi)
|
movl $(V2P(apic_pagetable) + 0x7), 0xFEC(%esi)
|
||||||
|
@ -200,6 +199,18 @@ _multiboot_entry:
|
||||||
movl $0x1007, %eax
|
movl $0x1007, %eax
|
||||||
movl %eax, (%esi, %edi)
|
movl %eax, (%esi, %edi)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Initialize a part of the same pagetable to map the vga frame buffer.
|
||||||
|
*/
|
||||||
|
movl $0xa0007, %eax
|
||||||
|
movl $0x20, %ecx
|
||||||
|
movl $0xE80, %edi
|
||||||
|
.l9:
|
||||||
|
movl %eax, (%esi, %edi)
|
||||||
|
add $4, %edi
|
||||||
|
add $0x1000, %eax
|
||||||
|
loop .l9
|
||||||
|
|
||||||
#ifdef MP
|
#ifdef MP
|
||||||
|
|
||||||
.m1:
|
.m1:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $Id: mminit.c,v 1.61 2004/03/16 21:13:15 dwelch Exp $
|
/* $Id: mminit.c,v 1.62 2004/03/16 22:45:56 dwelch Exp $
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top directory
|
* COPYRIGHT: See COPYING in the top directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
|
@ -48,7 +48,7 @@ static MEMORY_AREA* kernel_data_desc = NULL;
|
||||||
static MEMORY_AREA* kernel_param_desc = NULL;
|
static MEMORY_AREA* kernel_param_desc = NULL;
|
||||||
static MEMORY_AREA* kernel_pool_desc = NULL;
|
static MEMORY_AREA* kernel_pool_desc = NULL;
|
||||||
static MEMORY_AREA* kernel_shared_data_desc = NULL;
|
static MEMORY_AREA* kernel_shared_data_desc = NULL;
|
||||||
static MEMORY_AREA* kernel_mapped_low_mem_desc = NULL;
|
static MEMORY_AREA* kernel_mapped_vga_framebuffer_desc = NULL;
|
||||||
static MEMORY_AREA* MiKernelMapDescriptor = NULL;
|
static MEMORY_AREA* MiKernelMapDescriptor = NULL;
|
||||||
static MEMORY_AREA* MiPagedPoolDescriptor = NULL;
|
static MEMORY_AREA* MiPagedPoolDescriptor = NULL;
|
||||||
|
|
||||||
|
@ -146,14 +146,14 @@ MmInitVirtualMemory(ULONG LastKernelAddress,
|
||||||
FALSE,
|
FALSE,
|
||||||
BoundaryAddressMultiple);
|
BoundaryAddressMultiple);
|
||||||
|
|
||||||
BaseAddress = (PVOID)0xd0000000;
|
BaseAddress = (PVOID)0xFF3A0000;
|
||||||
MmCreateMemoryArea(NULL,
|
MmCreateMemoryArea(NULL,
|
||||||
MmGetKernelAddressSpace(),
|
MmGetKernelAddressSpace(),
|
||||||
MEMORY_AREA_SYSTEM,
|
MEMORY_AREA_SYSTEM,
|
||||||
&BaseAddress,
|
&BaseAddress,
|
||||||
0x100000,
|
0x20000,
|
||||||
0,
|
0,
|
||||||
&kernel_mapped_low_mem_desc,
|
&kernel_mapped_vga_framebuffer_desc,
|
||||||
FALSE,
|
FALSE,
|
||||||
FALSE,
|
FALSE,
|
||||||
BoundaryAddressMultiple);
|
BoundaryAddressMultiple);
|
||||||
|
|
Loading…
Reference in a new issue