ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- comment out ext2.sys in textsetup.sif, as it doesn't load

Browse Source 
- fix stupid error when creating page directory
- fix PtrToPfn() based on updated mm types
- some enhancements

svn path=/branches/ros-amd64-bringup/; revision=35360
This commit is contained in:
Timo Kreuzer
2008-08-16 00:16:54 +00:00
parent bb78749234
commit 20f583f4cb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/boot/bootdata/txtsetup.sif
+1 -1
View File
@@ -33,7 +33,7 @@ pci.sys=,,,,,,,,,,,,4
scsiport.sys=,,,,,,x,,,,,,4
uniata.sys=,,,,,,,,,,,,4
fastfat.sys=,,,,,,x,,,,,,4
ext2.sys=,,,,,,x,,,,,,4
;ext2.sys=,,,,,,x,,,,,,4
[HardwareIdsDatabase]
*PNP0C08 = acpi
reactos/boot/freeldr/freeldr/arch/amd64/loader.c
+3 -3
View File
@@ -117,7 +117,7 @@ FrLdrGetOrCreatePageDir(PPAGE_DIRECTORY_AMD64 pDir, ULONG Index)
if (!pSubDir)
return NULL;
RtlZeroMemory(pSubDir, PAGE_SIZE);
pDir->Pde[Index].PageFrameNumber = (ULONGLONG)pSubDir / PAGE_SIZE;
pDir->Pde[Index].PageFrameNumber = PtrToPfn(pSubDir);
pDir->Pde[Index].Valid = 1;
pDir->Pde[Index].Write = 1;
}
@@ -196,7 +196,7 @@ FrLdrSetupPageDirectory(VOID)
ULONG KernelPages;
/* Allocate a Page for the PML4 */
pPML4 = MmAllocateMemoryWithType(4096, LoaderSpecialMemory);
pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory);
ASSERT(pPML4);
@@ -205,7 +205,7 @@ FrLdrSetupPageDirectory(VOID)
* virtual address 0xfffff6fb7dbedf68 */
pPML4->Pde[VAtoPXI(PXE_BASE)].Valid = 1;
pPML4->Pde[VAtoPXI(PXE_BASE)].Write = 1;
pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(PXE_BASE);
pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(pPML4);
/* Setup low memory pages */
if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024)
reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
+1 -1
View File
@@ -30,7 +30,7 @@
#define VA_MASK 0x0000FFFFFFFFFFFFUL
#define PtrToPfn(p) \
((((ULONGLONG)p) >> PAGE_SHIFT) & 0xffffffffffULL)
((((ULONGLONG)p) >> PAGE_SHIFT) & 0xfffffffULL)
#define VAtoPXI(va) (((va) >> PXI_SHIFT) & 0x1FF)
#define VAtoPPI(va) (((va) >> PPI_SHIFT) & 0x1FF)