Applied official linux kernel code style guidelines

Due to my change to vim and the clang-format plugin this was needed!

1 files changed, 100 insertions, 98 deletions

diff --git a/src/kernel/memory/paging.c b/src/kernel/memory/paging.c
index e4169ba..a29d7db 100644
--- a/src/kernel/memory/paging.c
+++ b/src/kernel/memory/paging.c
@@ -14,179 +14,181 @@ uint32_t user_page_tables[1024][1024] __attribute__((aligned(4096)));
 
 void paging_init()
 {
-    for (uint32_t i = 0; i < 1024; i++) {
-        for (uint32_t j = 0; j < 1024; j++) {
-            current_page_tables[i][j] = ((j * 0x1000) + (i * 0x400000)) | PT_RW;
-        }
-    }
+	for (uint32_t i = 0; i < 1024; i++) {
+		for (uint32_t j = 0; j < 1024; j++) {
+			current_page_tables[i][j] = ((j * 0x1000) + (i * 0x400000)) | PT_RW;
+		}
+	}
 
-    for (uint32_t i = 0; i < 1024; i++) {
-        current_page_directory[i] = ((uint32_t) current_page_tables[i]) | PD_RW | PD_PRESENT;
-    }
+	for (uint32_t i = 0; i < 1024; i++) {
+		current_page_directory[i] = ((uint32_t)current_page_tables[i]) | PD_RW | PD_PRESENT;
+	}
 
-    paging_set_present(0, memory_get_all() >> 3); // /4
+	paging_set_present(0, memory_get_all() >> 3); // /4
 }
 
 void paging_install()
 {
-    // User paging
-    paging_switch_directory(1);
-    paging_init();
-    paging_set_user(0, memory_get_all() >> 3);
+	// User paging
+	paging_switch_directory(1);
+	paging_init();
+	paging_set_user(0, memory_get_all() >> 3);
 
-    // Kernel paging
-    paging_switch_directory(0);
-    paging_init();
-    paging_set_used(0, ((uint32_t) ASM_KERNEL_END >> 12) + 1); // /4096
+	// Kernel paging
+	paging_switch_directory(0);
+	paging_init();
+	paging_set_used(0, ((uint32_t)ASM_KERNEL_END >> 12) + 1); // /4096
 
-    paging_enable();
+	paging_enable();
 
-    vga_log("Installed paging");
+	vga_log("Installed paging");
 }
 
 void paging_disable()
 {
-    uint32_t cr0;
-    asm ("mov %%cr0, %0": "=r"(cr0));
-    cr0 &= 0x7fffffff;
-    asm ("mov %0, %%cr0"::"r"(cr0));
-    paging_enabled = 0;
+	uint32_t cr0;
+	asm("mov %%cr0, %0" : "=r"(cr0));
+	cr0 &= 0x7fffffff;
+	asm("mov %0, %%cr0" ::"r"(cr0));
+	paging_enabled = 0;
 }
 
 void paging_switch_directory(int user)
 {
-    if (user == 1) {
-        current_page_tables = user_page_tables;
-        current_page_directory = user_page_directory;
-    } else {
-        current_page_tables = kernel_page_tables;
-        current_page_directory = kernel_page_directory;
-    }
-    asm ("mov %0, %%cr3"::"r"(current_page_directory));
+	if (user == 1) {
+		current_page_tables = user_page_tables;
+		current_page_directory = user_page_directory;
+	} else {
+		current_page_tables = kernel_page_tables;
+		current_page_directory = kernel_page_directory;
+	}
+	asm("mov %0, %%cr3" ::"r"(current_page_directory));
 }
 
 void paging_enable()
 {
-    asm ("mov %0, %%cr3"::"r"(current_page_directory));
-    uint32_t cr0;
-    asm ("mov %%cr0, %0": "=r"(cr0));
-    cr0 |= 0x80000000;
-    asm ("mov %0, %%cr0"::"r"(cr0));
-    paging_enabled = 1;
+	asm("mov %0, %%cr3" ::"r"(current_page_directory));
+	uint32_t cr0;
+	asm("mov %%cr0, %0" : "=r"(cr0));
+	cr0 |= 0x80000000;
+	asm("mov %0, %%cr0" ::"r"(cr0));
+	paging_enabled = 1;
 }
 
 inline void invlpg(uint32_t addr)
 {
-    asm ("invlpg (%0)"::"r" (addr) : "memory");
+	asm("invlpg (%0)" ::"r"(addr) : "memory");
 }
 
 void paging_map(uint32_t phy, uint32_t virt, uint16_t flags)
 {
-    uint32_t pdi = virt >> 22;
-    uint32_t pti = virt >> 12 & 0x03FF;
-    current_page_tables[pdi][pti] = phy | flags;
-    invlpg(virt);
+	uint32_t pdi = virt >> 22;
+	uint32_t pti = virt >> 12 & 0x03FF;
+	current_page_tables[pdi][pti] = phy | flags;
+	invlpg(virt);
 }
 
 uint32_t paging_get_phys(uint32_t virt)
 {
-    uint32_t pdi = virt >> 22;
-    uint32_t pti = (virt >> 12) & 0x03FF;
-    return current_page_tables[pdi][pti] & 0xFFFFF000;
+	uint32_t pdi = virt >> 22;
+	uint32_t pti = (virt >> 12) & 0x03FF;
+	return current_page_tables[pdi][pti] & 0xFFFFF000;
 }
 
 uint16_t paging_get_flags(uint32_t virt)
 {
-    uint32_t pdi = virt >> 22;
-    uint32_t pti = (virt >> 12) & 0x03FF;
-    return current_page_tables[pdi][pti] & 0xFFF;
+	uint32_t pdi = virt >> 22;
+	uint32_t pti = (virt >> 12) & 0x03FF;
+	return current_page_tables[pdi][pti] & 0xFFF;
 }
 
 void paging_set_flag_up(uint32_t virt, uint32_t count, uint32_t flag)
 {
-    uint32_t page_n = virt / 4096;
-    for (uint32_t i = page_n; i < page_n + count; i++) {
-        current_page_tables[i / 1024][i % 1024] |= flag;
-        invlpg(i * 4096);
-    }
+	uint32_t page_n = virt / 4096;
+	for (uint32_t i = page_n; i < page_n + count; i++) {
+		current_page_tables[i / 1024][i % 1024] |= flag;
+		invlpg(i * 4096);
+	}
 }
 
 void paging_set_flag_down(uint32_t virt, uint32_t count, uint32_t flag)
 {
-    uint32_t page_n = virt / 4096;
-    for (uint32_t i = page_n; i < page_n + count; i++) {
-        current_page_tables[i / 1024][i % 1024] &= ~flag;
-        invlpg(i * 4096);
-    }
+	uint32_t page_n = virt / 4096;
+	for (uint32_t i = page_n; i < page_n + count; i++) {
+		current_page_tables[i / 1024][i % 1024] &= ~flag;
+		invlpg(i * 4096);
+	}
 }
 
 void paging_set_present(uint32_t virt, uint32_t count)
 {
-    paging_set_flag_up(virt, count, PT_PRESENT);
+	paging_set_flag_up(virt, count, PT_PRESENT);
 }
 
 void paging_set_absent(uint32_t virt, uint32_t count)
 {
-    paging_set_flag_down(virt, count, PT_PRESENT);
+	paging_set_flag_down(virt, count, PT_PRESENT);
 }
 
 void paging_set_used(uint32_t virt, uint32_t count)
 {
-    paging_set_flag_up(virt, count, PT_USED);
+	paging_set_flag_up(virt, count, PT_USED);
 }
 
 void paging_set_free(uint32_t virt, uint32_t count)
 {
-    paging_set_flag_down(virt, count, PT_USED);
+	paging_set_flag_down(virt, count, PT_USED);
 }
 
 void paging_set_user(uint32_t virt, uint32_t count)
 {
-    uint32_t page_n = virt / 4096;
-    for (uint32_t i = page_n; i < page_n + count; i += 1024) {
-        current_page_directory[i / 1024] |= PD_ALL_PRIV;
-    }
-    paging_set_flag_up(virt, count, PT_ALL_PRIV);
+	uint32_t page_n = virt / 4096;
+	for (uint32_t i = page_n; i < page_n + count; i += 1024) {
+		current_page_directory[i / 1024] |= PD_ALL_PRIV;
+	}
+	paging_set_flag_up(virt, count, PT_ALL_PRIV);
 }
 
 uint32_t paging_find_pages(uint32_t count)
 {
-    uint32_t continuous = 0;
-    uint32_t startDir = 0;
-    uint32_t startPage = 0;
-    for (uint32_t i = 0; i < 1024; i++) {
-        for (uint32_t j = 0; j < 1024; j++) {
-            if (!(current_page_tables[i][j] & PT_PRESENT) || (current_page_tables[i][j] & PT_USED)) {
-                continuous = 0;
-                startDir = i;
-                startPage = j + 1;
-            } else {
-                if (++continuous == count)
-                    return (startDir * 0x400000) + (startPage * 0x1000);
-            }
-        }
-    }
-
-    panic("Out of memory!");
-    return 0;
+	uint32_t continuous = 0;
+	uint32_t startDir = 0;
+	uint32_t startPage = 0;
+	for (uint32_t i = 0; i < 1024; i++) {
+		for (uint32_t j = 0; j < 1024; j++) {
+			if (!(current_page_tables[i][j] & PT_PRESENT) ||
+			    (current_page_tables[i][j] & PT_USED)) {
+				continuous = 0;
+				startDir = i;
+				startPage = j + 1;
+			} else {
+				if (++continuous == count)
+					return (startDir * 0x400000) + (startPage * 0x1000);
+			}
+		}
+	}
+
+	panic("Out of memory!");
+	return 0;
 }
 
 uint32_t paging_alloc_pages(uint32_t count)
 {
-    uint32_t ptr = paging_find_pages(count);
-    paging_set_used(ptr, count);
-    paging_set_user(ptr, count);
-    return ptr;
+	uint32_t ptr = paging_find_pages(count);
+	paging_set_used(ptr, count);
+	paging_set_user(ptr, count);
+	return ptr;
 }
 
 uint32_t paging_get_used_pages()
 {
-    uint32_t n = 0;
-    for (uint32_t i = 0; i < 1024; i++) {
-        for (uint32_t j = 0; j < 1024; j++) {
-            uint8_t flags = current_page_tables[i][j] & PT_USED;
-            if (flags == 1) n++;
-        }
-    }
-    return n;
+	uint32_t n = 0;
+	for (uint32_t i = 0; i < 1024; i++) {
+		for (uint32_t j = 0; j < 1024; j++) {
+			uint8_t flags = current_page_tables[i][j] & PT_USED;
+			if (flags == 1)
+				n++;
+		}
+	}
+	return n;
 }
\ No newline at end of file