Renaming scheme

2 files changed, 14 insertions, 14 deletions

diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index cffbfb8..4d6296a 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -6,7 +6,7 @@
 
 namespace teachos::arch::kernel
 {
-  auto print_mem_info(arch::memory::MemoryInfo * mem_info) -> void
+  auto print_mem_info(arch::memory::memory_info * mem_info) -> void
   {
     using namespace video::vga;
 
@@ -19,7 +19,7 @@ namespace teachos::arch::kernel
     text::write_number(mem_upper, text::common_attributes::green_on_black);
   }
 
-  auto print_memory_map(arch::memory::MemoryMap * mminfo) -> void
+  auto print_memory_map(arch::memory::memory_map * mminfo) -> void
   {
     using namespace video::vga;
 
@@ -45,7 +45,7 @@ namespace teachos::arch::kernel
       text::write_number(entry->length, text::common_attributes::green_on_black);
 
       text::write("Type: ", text::common_attributes::green_on_black);
-      text::write_number(static_cast<std::underlying_type<arch::memory::MemoryAreaType>::type>(entry->type),
+      text::write_number(static_cast<std::underlying_type<arch::memory::memory_area_type>::type>(entry->type),
                          text::common_attributes::green_on_black);
 
       text::write("Reserved: ", text::common_attributes::green_on_black);
@@ -123,8 +123,8 @@ namespace teachos::arch::kernel
     text::cursor(false);
     text::write("TeachOS is starting up...", text::common_attributes::green_on_black);
 
-    arch::memory::MultibootInfo * multiboot_information_pointer =
-        (arch::memory::MultibootInfo *)arch::boot::multiboot_information_pointer;
+    arch::memory::multi_boot_info * multiboot_information_pointer =
+        (arch::memory::multi_boot_info *)arch::boot::multiboot_information_pointer;
     auto multiboot_tag = &(multiboot_information_pointer->tags);
 
     text::write("Multiboot Start: ", text::common_attributes::green_on_black);
@@ -140,19 +140,19 @@ namespace teachos::arch::kernel
      *
      * The increment part aligns the size to an 8-byte address.
      */
-    for (auto tag = multiboot_tag; tag->type != arch::memory::MultibootTagType::END;
-         tag = (arch::memory::MultibootTag *)(((uint8_t *)tag) + ((tag->size + 7) & ~7)))
+    for (auto tag = multiboot_tag; tag->type != arch::memory::multi_boot_tag_type::END;
+         tag = (arch::memory::multi_boot_tag *)(((uint8_t *)tag) + ((tag->size + 7) & ~7)))
     {
       switch (tag->type)
       {
-        case arch::memory::MultibootTagType::BASIC_MEMORY_INFO:
-          print_mem_info((arch::memory::MemoryInfo *)tag);
+        case arch::memory::multi_boot_tag_type::BASIC_MEMORY_INFO:
+          print_mem_info((arch::memory::memory_info *)tag);
           break;
-        case arch::memory::MultibootTagType::ELF_SECTIONS:
+        case arch::memory::multi_boot_tag_type::ELF_SECTIONS:
           print_elf_sections((arch::memory::elf_symbols_section *)tag);
           break;
-        case arch::memory::MultibootTagType::MEMORY_MAP:
-          print_memory_map((arch::memory::MemoryMap *)tag);
+        case arch::memory::multi_boot_tag_type::MEMORY_MAP:
+          print_memory_map((arch::memory::memory_map *)tag);
           break;
         default:
           // All other cases are not important and can be ignored
diff --git a/arch/x86_64/src/memory/frame_allocator.cpp b/arch/x86_64/src/memory/frame_allocator.cpp
index 425528a..b9d26a5 100644
--- a/arch/x86_64/src/memory/frame_allocator.cpp
+++ b/arch/x86_64/src/memory/frame_allocator.cpp
@@ -2,8 +2,8 @@
 
 namespace teachos::arch::memory
 {
-  auto AreaFrameAllocator::allocate_frame() -> std::optional<Frame> {}
+  auto area_frame_allocator::allocate_frame() -> std::optional<frame> {}
 
-  auto AreaFrameAllocator::deallocate_frame(Frame frame) -> void {}
+  auto area_frame_allocator::deallocate_frame(frame frame) -> void {}
 
 }  // namespace teachos::arch::memory