aboutsummaryrefslogtreecommitdiff
path: root/libs/multiboot2
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@ost.ch>2025-07-17 21:09:02 +0000
committerFelix Morgner <felix.morgner@ost.ch>2025-07-18 13:02:34 +0200
commit14ed096fc5de6844cb116f3319c0d03043d26ea2 (patch)
treee78cc753b2d6dcabd703aebc4b9bea1783cc2e6d /libs/multiboot2
parent891ca8834122e55638d33a129baab7292b8ed6d0 (diff)
downloadteachos-14ed096fc5de6844cb116f3319c0d03043d26ea2.tar.xz
teachos-14ed096fc5de6844cb116f3319c0d03043d26ea2.zip
x86-64: prepare new architecture
Diffstat (limited to 'libs/multiboot2')
-rw-r--r--libs/multiboot2/include/multiboot2/impl/data.hpp6
-rw-r--r--libs/multiboot2/include/multiboot2/impl/iterator.hpp5
2 files changed, 7 insertions, 4 deletions
diff --git a/libs/multiboot2/include/multiboot2/impl/data.hpp b/libs/multiboot2/include/multiboot2/impl/data.hpp
index 367e8cb..a5f2e14 100644
--- a/libs/multiboot2/include/multiboot2/impl/data.hpp
+++ b/libs/multiboot2/include/multiboot2/impl/data.hpp
@@ -99,17 +99,17 @@ namespace multiboot2::impl
/**
* @brief Start address of this region
*/
- std::uint64_t const base;
+ std::uint64_t base;
/**
* @brief Size of this region in bytes.
*/
- std::uint64_t const size_in_B;
+ std::uint64_t size_in_B;
/**
* @brief Type of this region.
*/
- memory_type const type;
+ memory_type type;
std::uint32_t : 0;
};
diff --git a/libs/multiboot2/include/multiboot2/impl/iterator.hpp b/libs/multiboot2/include/multiboot2/impl/iterator.hpp
index b84ef2c..e82326d 100644
--- a/libs/multiboot2/include/multiboot2/impl/iterator.hpp
+++ b/libs/multiboot2/include/multiboot2/impl/iterator.hpp
@@ -40,7 +40,10 @@ namespace multiboot2::impl
{
m_current = next;
}
- m_current.reset();
+ else
+ {
+ m_current.reset();
+ }
}
return *this;
}