efi: Cleanup arch_mmu, drop extra arch_timer.h

Change-Id: I0d6d2f8db2bc86c08d5ba2648f1cf46d85b54a5e Reviewed-on: https://review.haiku-os.org/c/haiku/+/2267 Reviewed-by: Adrien Destugues <[email protected]> Reviewed-by: Alex von Gluck IV <[email protected]>
2020-02-22 22:15:08 +00:00
parent d2986cb6d0
commit 71680f7b7d
6 changed files with 20 additions and 54 deletions
@@ -0,0 +1,10 @@
+/*
+ * Copyright, 2019-2020 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef ARCH_MMU_H
+#define ARCH_MMU_H
+
+void arch_mmu_init();
+
+#endif /* ARCH_MMU_H */
@@ -1,21 +0,0 @@
-/*
- * Copyright 2008, Dustin Howett, [email protected]. All rights reserved.
- * Distributed under the terms of the MIT License.
- */
-#ifndef HPET_H
-#define HPET_H
-
-#include <SupportDefs.h>
-#include <arch/x86/arch_hpet.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void arch_timer_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* HPET_H */
@@ -1,21 +0,0 @@
-/*
- * Copyright 2008, Dustin Howett, [email protected]. All rights reserved.
- * Distributed under the terms of the MIT License.
- */
-#ifndef HPET_H
-#define HPET_H
-
-#include <SupportDefs.h>
-#include <arch/x86/arch_hpet.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void arch_timer_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* HPET_H */
@@ -24,6 +24,15 @@
 extern "C" void arch_enter_kernel(uint64 pml4, uint64 entry_point,
 	uint64 stackTop);

+// From arch_mmu.cpp
+extern void arch_mmu_post_efi_setup(size_t memory_map_size,
+    efi_memory_descriptor *memory_map, size_t descriptor_size,
+    uint32_t descriptor_version);
+
+extern uint64_t arch_mmu_generate_post_efi_page_tables(size_t memory_map_size,
+    efi_memory_descriptor *memory_map, size_t descriptor_size,
+    uint32_t descriptor_version);
+

 void
 arch_start_kernel(addr_t kernelEntry)
@@ -47,18 +47,6 @@ extern status_t platform_kernel_address_to_bootloader_address(uint64_t address,
 extern status_t platform_bootloader_address_to_kernel_address(void *address,
 	uint64_t *_result);

-// Architecture dependant
-
-extern void arch_mmu_post_efi_setup(size_t memory_map_size,
-    efi_memory_descriptor *memory_map, size_t descriptor_size,
-    uint32_t descriptor_version);
-
-extern uint64_t arch_mmu_generate_post_efi_page_tables(size_t memory_map_size,
-    efi_memory_descriptor *memory_map, size_t descriptor_size,
-    uint32_t descriptor_version);
-
-void arch_mmu_init();
-
 #ifdef __cplusplus
 }
 #endif
@@ -19,6 +19,7 @@
 #include <boot/stage2.h>
 #include <boot/stdio.h>

+#include "arch_mmu.h"
 #include "arch_start.h"
 #include "acpi.h"
 #include "console.h"