Merged VESA-paging fix

Fixed paging activation before initialization of VESA driver

1 files changed, 12 insertions, 0 deletions

diff --git a/src/kernel/paging/paging.c b/src/kernel/paging/paging.c
index 4bb69d0..1712f7e 100644
--- a/src/kernel/paging/paging.c
+++ b/src/kernel/paging/paging.c
@@ -105,6 +105,18 @@ void initialise_paging() {
     switch_page_directory(current_directory);
 }
 
+void disable_paging() {
+    uint32_t cr0;
+    asm volatile("mov %%cr0, %0": "=r"(cr0));
+    cr0 &= 0x7fffffff;
+    asm volatile("mov %0, %%cr0"::"r"(cr0));
+}
+
+void enable_paging() {
+    switch_page_directory(kernel_directory);
+    switch_page_directory(current_directory);
+}
+
 void switch_page_directory(page_directory_t *dir) {
     current_directory = dir;
     asm volatile("mov %0, %%cr3"::"r"(dir->physicalAddr));