diff options
Diffstat (limited to 'kapi')
| -rw-r--r-- | kapi/kapi/devices.hpp | 2 | ||||
| -rw-r--r-- | kapi/kapi/filesystem.hpp | 8 | ||||
| -rw-r--r-- | kapi/kapi/filesystem/block_device.hpp (renamed from kapi/kapi/devices/block_device.hpp) | 12 | ||||
| -rw-r--r-- | kapi/kapi/filesystem/character_device.hpp (renamed from kapi/kapi/devices/character_device.hpp) | 12 |
4 files changed, 17 insertions, 17 deletions
diff --git a/kapi/kapi/devices.hpp b/kapi/kapi/devices.hpp index c1e7e9f4..51f5129e 100644 --- a/kapi/kapi/devices.hpp +++ b/kapi/kapi/devices.hpp @@ -1,10 +1,8 @@ #ifndef TEACHOS_KAPI_DEVICES_HPP #define TEACHOS_KAPI_DEVICES_HPP -#include <kapi/devices/block_device.hpp> // IWYU pragma: export #include <kapi/devices/bus.hpp> // IWYU pragma: export #include <kapi/devices/bus_protocol.hpp> // IWYU pragma: export -#include <kapi/devices/character_device.hpp> // IWYU pragma: export #include <kapi/devices/cpu.hpp> // IWYU pragma: export #include <kapi/devices/device.hpp> // IWYU pragma: export #include <kapi/devices/device_registry.hpp> // IWYU pragma: export diff --git a/kapi/kapi/filesystem.hpp b/kapi/kapi/filesystem.hpp index 4b0971f6..6796532f 100644 --- a/kapi/kapi/filesystem.hpp +++ b/kapi/kapi/filesystem.hpp @@ -1,9 +1,11 @@ #ifndef TEACHOS_KAPI_FILESYSTEM_HPP #define TEACHOS_KAPI_FILESYSTEM_HPP -#include <kapi/filesystem/device_number.hpp> // IWYU pragma: export -#include <kapi/filesystem/file_status.hpp> // IWYU pragma: export -#include <kapi/filesystem/file_type.hpp> // IWYU pragma: export +#include <kapi/filesystem/block_device.hpp> // IWYU pragma: export +#include <kapi/filesystem/character_device.hpp> // IWYU pragma: export +#include <kapi/filesystem/device_number.hpp> // IWYU pragma: export +#include <kapi/filesystem/file_status.hpp> // IWYU pragma: export +#include <kapi/filesystem/file_type.hpp> // IWYU pragma: export #include <kstd/result.hpp> #include <kstd/system_error.hpp> diff --git a/kapi/kapi/devices/block_device.hpp b/kapi/kapi/filesystem/block_device.hpp index e606188e..6d062b07 100644 --- a/kapi/kapi/devices/block_device.hpp +++ b/kapi/kapi/filesystem/block_device.hpp @@ -1,7 +1,7 @@ -#ifndef TEACHOS_KAPI_DEVICES_BLOCK_DEVICE_HPP -#define TEACHOS_KAPI_DEVICES_BLOCK_DEVICE_HPP +#ifndef TEACHOS_KAPI_FILESYSTEM_BLOCK_DEVICE_HPP +#define TEACHOS_KAPI_FILESYSTEM_BLOCK_DEVICE_HPP -// IWYU pragma: private, include <kapi/devices.hpp> +// IWYU pragma: private, include <kapi/filesystem.hpp> #include <kapi/devices/interface_id.hpp> @@ -10,12 +10,12 @@ #include <cstddef> -namespace kapi::devices +namespace kapi::filesystem { struct block_device { - constexpr auto static id = interface_id{"block"}; + constexpr auto static id = kapi::devices::interface_id{"block"}; //! Virtual destructor to enable clean deletes through base pointers. virtual ~block_device() = default; @@ -46,6 +46,6 @@ namespace kapi::devices [[nodiscard]] auto virtual capacity() const -> kstd::units::bytes = 0; }; -} // namespace kapi::devices +} // namespace kapi::filesystem #endif
\ No newline at end of file diff --git a/kapi/kapi/devices/character_device.hpp b/kapi/kapi/filesystem/character_device.hpp index 40921940..b839410d 100644 --- a/kapi/kapi/devices/character_device.hpp +++ b/kapi/kapi/filesystem/character_device.hpp @@ -1,7 +1,7 @@ -#ifndef TEACHOS_KAPI_DEVICES_CHARACTER_DEVICE_HPP -#define TEACHOS_KAPI_DEVICES_CHARACTER_DEVICE_HPP +#ifndef TEACHOS_KAPI_FILESYSTEM_CHARACTER_DEVICE_HPP +#define TEACHOS_KAPI_FILESYSTEM_CHARACTER_DEVICE_HPP -// IWYU pragma: private, include <kapi/devices.hpp> +// IWYU pragma: private, include <kapi/filesystem.hpp> #include <kapi/devices/interface_id.hpp> @@ -11,12 +11,12 @@ #include <cstddef> #include <span> -namespace kapi::devices +namespace kapi::filesystem { struct character_device { - constexpr auto static id = interface_id{"char"}; + constexpr auto static id = kapi::devices::interface_id{"char"}; //! Virtual destructor to enable clean deletes through base pointers. virtual ~character_device() = default; @@ -34,6 +34,6 @@ namespace kapi::devices auto virtual write_block(std::span<std::byte const> buffer) -> kstd::result<kstd::units::bytes> = 0; }; -} // namespace kapi::devices +} // namespace kapi::filesystem #endif
\ No newline at end of file |