Merge branch 'fmorgner/x86-64-double-fault-handling' into 'develop'

x86_64: handle double faults

See merge request teachos/kernel!59

1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/kapi/devices/device.cpp b/kernel/kapi/devices/device.cpp
index 2576e20a..3a3b7cc1 100644
--- a/kernel/kapi/devices/device.cpp
+++ b/kernel/kapi/devices/device.cpp
@@ -23,12 +23,12 @@ namespace kapi::devices
       : m_name(name)
   {}
 
-  auto device::facet(kapi::capabilities::facet_id facet) noexcept -> void *
+  auto device::facet(kapi::capabilities::facet_id facet) noexcept -> kstd::observer_ptr<void>
   {
     return query_facet(facet);
   }
 
-  auto device::facet(kapi::capabilities::facet_id facet) const noexcept -> void const *
+  auto device::facet(kapi::capabilities::facet_id facet) const noexcept -> kstd::observer_ptr<void const>
   {
     return const_cast<device *>(this)->query_facet(facet);
   }
@@ -61,10 +61,10 @@ namespace kapi::devices
     m_state = state;
   }
 
-  auto device::bound_driver() const noexcept -> driver *
+  auto device::bound_driver() const noexcept -> kstd::shared_ptr<driver>
   {
     auto guard = kstd::lock_guard{m_lock};
-    return m_driver.lock().get();
+    return m_driver.lock();
   }
 
   auto device::bind_driver(kstd::weak_ptr<struct driver> driver) -> void
@@ -114,7 +114,7 @@ namespace kapi::devices
     m_resources = std::move(resources);
   }
 
-  auto device::query_facet(kapi::capabilities::facet_id) -> void *
+  auto device::query_facet(kapi::capabilities::facet_id) -> kstd::observer_ptr<void>
   {
     return nullptr;
   }