diff options
| -rw-r--r-- | kernel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kernel/include/mm/physical_mm.h | 2 | ||||
| -rw-r--r-- | kernel/include/mm/virtual_mm.h | 2 | ||||
| -rw-r--r-- | kernel/kernel/kernel.cc | 8 | ||||
| -rw-r--r-- | kernel/libk/kmalloc.cc | 2 | ||||
| -rw-r--r-- | kernel/mm/physical_mm/bitmap.cc (renamed from kernel/mm/physical_mm/memory_map.cc) | 0 | ||||
| -rw-r--r-- | kernel/mm/physical_mm/physical_mm.cc | 2 | ||||
| -rw-r--r-- | kernel/mm/virtual_mm/virtual_mm.cc | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt index e3212b0..c0903fd 100644 --- a/kernel/CMakeLists.txt +++ b/kernel/CMakeLists.txt @@ -21,7 +21,7 @@ set(SRC libk/kmalloc.cc mm/memory_map.cc - mm/physical_mm/memory_map.cc + mm/physical_mm/bitmap.cc mm/physical_mm/physical_mm.cc mm/virtual_mm/virtual_mm.cc ) diff --git a/kernel/include/mm/physical_mm.h b/kernel/include/mm/physical_mm.h index b5631c5..2fa85ea 100644 --- a/kernel/include/mm/physical_mm.h +++ b/kernel/include/mm/physical_mm.h @@ -34,7 +34,7 @@ namespace PhysicalMM { -void init(void); +void initialize(void); uint32_t find_free_block(void); void *allocate_block(void); void free_block(void *physical_address); diff --git a/kernel/include/mm/virtual_mm.h b/kernel/include/mm/virtual_mm.h index 313b1f9..29a7f2b 100644 --- a/kernel/include/mm/virtual_mm.h +++ b/kernel/include/mm/virtual_mm.h @@ -85,7 +85,7 @@ bool switch_page_directory(uint32_t *page_directory); /* * Initialize the virtual memory manager */ -void init(void); +void initialize(void); /* * Map a physical address to a virtual address diff --git a/kernel/kernel/kernel.cc b/kernel/kernel/kernel.cc index 98d1f5f..54eb0e5 100644 --- a/kernel/kernel/kernel.cc +++ b/kernel/kernel/kernel.cc @@ -41,11 +41,11 @@ kernel_main(uint32_t magic, multiboot_info_t *multiboot_info) GDT::load(); MemoryMap::load(multiboot_info); - PhysicalMM::init(); - VirtualMM::init(); + PhysicalMM::initialize(); + VirtualMM::initialize(); - // void *x = virtual_mm_find_free_addresses(1046999); - // printk("debug", "x(0x%x)", x); + void *x = VirtualMM::find_free_addresses(1046999); + printk("debug", "x(0x%x)", x); #if 0 int *x = PhysicalMM::allocate_block(); diff --git a/kernel/libk/kmalloc.cc b/kernel/libk/kmalloc.cc index 4afaa61..3c7dd91 100644 --- a/kernel/libk/kmalloc.cc +++ b/kernel/libk/kmalloc.cc @@ -25,7 +25,7 @@ memory_chunk_t *starting_mc = NULL; -static memory_chunk_t * +memory_chunk_t * add_block(void *address, uint32_t size) { memory_chunk_t *mc = (memory_chunk_t *) address; diff --git a/kernel/mm/physical_mm/memory_map.cc b/kernel/mm/physical_mm/bitmap.cc index 6284173..6284173 100644 --- a/kernel/mm/physical_mm/memory_map.cc +++ b/kernel/mm/physical_mm/bitmap.cc diff --git a/kernel/mm/physical_mm/physical_mm.cc b/kernel/mm/physical_mm/physical_mm.cc index cc70ea6..fb34aef 100644 --- a/kernel/mm/physical_mm/physical_mm.cc +++ b/kernel/mm/physical_mm/physical_mm.cc @@ -91,7 +91,7 @@ deinitialize_region(uint32_t start, uint32_t length) } void -init(void) +initialize(void) { free_memory_regions_t *free_memory_regions = MemoryMap::get_free_regions(); log_memory_map(free_memory_regions); diff --git a/kernel/mm/virtual_mm/virtual_mm.cc b/kernel/mm/virtual_mm/virtual_mm.cc index 2293083..a3e9fee 100644 --- a/kernel/mm/virtual_mm/virtual_mm.cc +++ b/kernel/mm/virtual_mm/virtual_mm.cc @@ -63,7 +63,7 @@ enable_paging(void) } void -init(void) +initialize(void) { for (uint32_t i = 0; i < 1024; i++) page_table[i] = 0; |