chore: clean up facet ids

6 files changed, 8 insertions, 7 deletions

diff --git a/kapi/kapi/boot_modules/device.hpp b/kapi/kapi/boot_modules/device.hpp
index 74152306..4bdd34e4 100644
--- a/kapi/kapi/boot_modules/device.hpp
+++ b/kapi/kapi/boot_modules/device.hpp
@@ -2,11 +2,13 @@
 #define TEACHOS_KAPI_BOOT_MODULES_DEVICE_HPP
 
 #include <kapi/boot_modules/module.hpp>
+#include <kapi/capabilities/facet_id.hpp>
 #include <kapi/devices.hpp>
 #include <kapi/memory.hpp>
 
 #include <cstddef>
 #include <string_view>
+#include <utility>
 
 namespace kapi::boot_modules
 {
@@ -20,7 +22,7 @@ namespace kapi::boot_modules
   //! to materialize as "real" devices, e.g. a ram disk, and have a driver bound to them.
   struct boot_module_signature
   {
-    constexpr auto static id = kapi::capabilities::facet_id{"boot_module_signature"};
+    constexpr auto static id = kapi::capabilities::facet_id{"sig.dev.bmod"};
 
     virtual ~boot_module_signature() = default;
 
@@ -34,7 +36,7 @@ namespace kapi::boot_modules
   //! The claim facet of a boot module driver.
   struct boot_module_claim
   {
-    constexpr auto static id = kapi::capabilities::facet_id{"boot_module_claim"};
+    constexpr auto static id = kapi::capabilities::facet_id{"clm.drv.bmod"};
 
     virtual ~boot_module_claim() = default;
 
diff --git a/kapi/kapi/devices/bus.hpp b/kapi/kapi/devices/bus.hpp
index 365d5c6c..dc46dc3a 100644
--- a/kapi/kapi/devices/bus.hpp
+++ b/kapi/kapi/devices/bus.hpp
@@ -23,7 +23,7 @@ namespace kapi::devices
   struct bus : device
   {
     //! The id of the bus facet.
-    constexpr auto static id = kapi::capabilities::facet_id{"bus"};
+    constexpr auto static id = kapi::capabilities::facet_id{"type.dev.bus"};
 
     //! Construct a bus with the given name.
     //!
diff --git a/kapi/kapi/devices/bus_protocol.hpp b/kapi/kapi/devices/bus_protocol.hpp
index 5a47ecef..0338f6ad 100644
--- a/kapi/kapi/devices/bus_protocol.hpp
+++ b/kapi/kapi/devices/bus_protocol.hpp
@@ -26,7 +26,7 @@ namespace kapi::devices
   struct bus_protocol
   {
     //! The id of the bus protocol facet.
-    constexpr auto static id = kapi::capabilities::facet_id{"bus_protocol"};
+    constexpr auto static id = kapi::capabilities::facet_id{"prot.bus.base"};
 
     //! Allow safe destruction through base pointers.
     virtual ~bus_protocol() = default;
diff --git a/kapi/kapi/filesystem.hpp b/kapi/kapi/filesystem.hpp
index 076edbb3..04630006 100644
--- a/kapi/kapi/filesystem.hpp
+++ b/kapi/kapi/filesystem.hpp
@@ -18,7 +18,6 @@
 #include <cstddef>
 #include <span>
 #include <string_view>
-#include <utility>
 
 //! The interface for filesystem operations in the kernel.
 //!
diff --git a/kapi/kapi/filesystem/block_special_file.hpp b/kapi/kapi/filesystem/block_special_file.hpp
index 79a52817..384dd39c 100644
--- a/kapi/kapi/filesystem/block_special_file.hpp
+++ b/kapi/kapi/filesystem/block_special_file.hpp
@@ -19,7 +19,7 @@ namespace kapi::filesystem
 
   struct block_special_file
   {
-    constexpr auto static id = kapi::capabilities::facet_id{"block"};
+    constexpr auto static id = kapi::capabilities::facet_id{"fs.spec.block"};
 
     //! Virtual destructor to enable clean deletes through base pointers.
     virtual ~block_special_file() = default;
diff --git a/kapi/kapi/filesystem/character_special_file.hpp b/kapi/kapi/filesystem/character_special_file.hpp
index 5524f97f..b7a0dd9e 100644
--- a/kapi/kapi/filesystem/character_special_file.hpp
+++ b/kapi/kapi/filesystem/character_special_file.hpp
@@ -19,7 +19,7 @@ namespace kapi::filesystem
 
   struct character_special_file
   {
-    constexpr auto static id = kapi::capabilities::facet_id{"char"};
+    constexpr auto static id = kapi::capabilities::facet_id{"fs.spec.char"};
 
     //! Virtual destructor to enable clean deletes through base pointers.
     virtual ~character_special_file() = default;