forked from KolibriOS/kolibrios
Update BOOT_DATA structure and use it instead of all the BOOT_* vars.
git-svn-id: svn://kolibrios.org@7132 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
@@ -1336,7 +1336,7 @@ endp
|
||||
|
||||
align 4
|
||||
proc print_mem
|
||||
mov edi, BOOT_VAR + BOOT_MEMMAP_BLOCKS
|
||||
mov edi, BOOT.memmap_blocks
|
||||
mov ecx, [edi-4]
|
||||
test ecx, ecx
|
||||
jz .done
|
||||
|
@@ -10,7 +10,7 @@ $Revision$
|
||||
; Initializes MTRRs.
|
||||
proc init_mtrr
|
||||
|
||||
cmp [BOOT_VARS+BOOT_MTRR], byte 2
|
||||
cmp [BOOT.mtrr], byte 2
|
||||
je .exit
|
||||
|
||||
bt [cpu_caps], CAPS_MTRR
|
||||
|
@@ -112,13 +112,18 @@ macro movi r,i
|
||||
|
||||
include '../kglobals.inc'
|
||||
CAPS_MTRR equ 12
|
||||
MSR_MTRR_DEF_TYPE equ 0x2FF
|
||||
CAPS_PGE equ 13
|
||||
CAPS_PAT equ 16
|
||||
MSR_CR_PAT equ 0x277
|
||||
PAT_VALUE equ 0x00070106 ; (UC<<24)|(UCM<<16)|(WC<<8)|WB
|
||||
MEM_WB equ 6 ;write-back memory
|
||||
MEM_WC equ 1 ;write combined memory
|
||||
MEM_UC equ 0 ;uncached memory
|
||||
include 'mtrr.inc'
|
||||
|
||||
BOOT_VARS = 0
|
||||
BOOT_MTRR db 1
|
||||
BOOT.mtrr db 1
|
||||
align 4
|
||||
cpu_caps dd 1 shl CAPS_MTRR
|
||||
LFBAddress dd 0xE0000000
|
||||
|
Reference in New Issue
Block a user