Author: tkreuzer
Date: Sat Sep 20 04:33:53 2008
New Revision: 36343
URL:
http://svn.reactos.org/svn/reactos?rev=36343&view=rev
Log:
Map the APIC page.
Modified:
branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
[iso-8859-1] Sat Sep 20 04:33:53 2008
@@ -193,11 +193,6 @@
*
* Returns:
* None.
- *
- * Remarks:
- * We are setting PDEs, but using the equvivalent (for our purpose) PTE structure.
- * As such, please note that PageFrameNumber == PageEntryNumber.
- *
*--*/
VOID
FASTCALL
@@ -255,6 +250,12 @@
DbgPrint("Could not map KUSER_SHARED_DATA page.\n", KernelPages);
}
+ /* Map APIC page */
+ if (!FrLdrMapSinglePage(APIC_BASE, APIC_PHYS_BASE))
+ {
+ DbgPrint("Could not map APIC page.\n", KernelPages);
+ }
+
}
VOID
Modified:
branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
[iso-8859-1] Sat Sep 20 04:33:53 2008
@@ -41,7 +41,9 @@
#define HYPERSPACE_BASE 0xfffff70000000000ULL
#define HAL_BASE 0xffffffff80000000ULL
-#define APIC_BASE 0xffffffffff000000ULL // FIXME
+#define APIC_BASE 0xfffffffffee00000ULL // FIXME
+
+#define APIC_PHYS_BASE 0xfee00000
#define NUM_PAGES_KERNEL