From 3ce0197e99ecea7be66decc2c3c6f785497ef862 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Thu, 10 Sep 2026 15:08:37 +0200
Subject: kernel: replace some more plain pointers

---
 kapi/kapi/devices/bus.hpp            | 2 +-
 kapi/kapi/devices/facet_registry.hpp | 2 +-
 kapi/kapi/memory/address.hpp         | 2 +-
 kapi/kapi/memory/page_mapper.hpp     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kapi')

diff --git a/kapi/kapi/devices/bus.hpp b/kapi/kapi/devices/bus.hpp
index 476216c7..018cf2ae 100644
--- a/kapi/kapi/devices/bus.hpp
+++ b/kapi/kapi/devices/bus.hpp
@@ -66,7 +66,7 @@ namespace kapi::devices
 
     mutable tracked_mutex m_lock{};
 
-    bus_protocol * m_protocol{};
+    kstd::observer_ptr<bus_protocol> m_protocol{};
     kstd::vector<kstd::shared_ptr<device>> m_devices{};
   };
 
diff --git a/kapi/kapi/devices/facet_registry.hpp b/kapi/kapi/devices/facet_registry.hpp
index 4fa6186a..5fb4795a 100644
--- a/kapi/kapi/devices/facet_registry.hpp
+++ b/kapi/kapi/devices/facet_registry.hpp
@@ -274,7 +274,7 @@ namespace kapi::devices
 
     kstd::vector<entry> m_entries;
     kstd::vector<kstd::weak_ptr<facet_registry_observer>> m_observers;
-    kstd::vector<facet_registry_observer *> m_static_observers;
+    kstd::vector<kstd::observer_ptr<facet_registry_observer>> m_static_observers;
   };
 
   //! @}
diff --git a/kapi/kapi/memory/address.hpp b/kapi/kapi/memory/address.hpp
index 0fab06e0..79806ce4 100644
--- a/kapi/kapi/memory/address.hpp
+++ b/kapi/kapi/memory/address.hpp
@@ -76,7 +76,7 @@ namespace kapi::memory
     template<typename ObjectType>
     explicit operator kstd::observer_ptr<ObjectType>() const noexcept
     {
-      return kstd::make_observer(reinterpret_cast<ObjectType *>(m_value));
+      return kstd::make_observer(std::bit_cast<ObjectType *>(m_value));
     }
 
     //! Create a new address n beyond this one.
diff --git a/kapi/kapi/memory/page_mapper.hpp b/kapi/kapi/memory/page_mapper.hpp
index a310e209..5ac0210f 100644
--- a/kapi/kapi/memory/page_mapper.hpp
+++ b/kapi/kapi/memory/page_mapper.hpp
@@ -73,7 +73,7 @@ namespace kapi::memory
     template<typename T>
     [[nodiscard]] auto map_as(page page, frame frame, flags flags) -> kstd::observer_ptr<T>
     {
-      return std::bit_cast<T *>(map(page, frame, flags));
+      return reinterpret_pointer_cast<T>(map(page, frame, flags));
     }
 
   protected:
-- 
cgit v1.2.3