diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2025-07-23 13:27:30 +0000 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2025-07-23 13:27:30 +0000 |
| commit | 29f0e6ad021997e4b6995de4f795781ac381f697 (patch) | |
| tree | da515017e23b773ebd2754f90ca6d3ee480e3c94 | |
| parent | e97e86d169849527190cef1913efdd247e6f68df (diff) | |
| download | teachos-29f0e6ad021997e4b6995de4f795781ac381f697.tar.xz teachos-29f0e6ad021997e4b6995de4f795781ac381f697.zip | |
x86_64: move port_io to x86_64/io
| -rw-r--r-- | arch/x86_64/include/x86_64/io/port_io.hpp (renamed from arch/x86_64/include/arch/io/port_io.hpp) | 11 | ||||
| -rw-r--r-- | arch/x86_64/include/x86_64/vga/io.hpp | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/arch/x86_64/include/arch/io/port_io.hpp b/arch/x86_64/include/x86_64/io/port_io.hpp index ba41660..4cf0b65 100644 --- a/arch/x86_64/include/arch/io/port_io.hpp +++ b/arch/x86_64/include/x86_64/io/port_io.hpp @@ -1,12 +1,11 @@ -#ifndef TEACHOS_ARCH_X86_64_IO_PORT_IO_HPP -#define TEACHOS_ARCH_X86_64_IO_PORT_IO_HPP +#ifndef TEACHOS_X86_64_IO_PORT_IO_HPP +#define TEACHOS_X86_64_IO_PORT_IO_HPP -#include <concepts> #include <cstddef> #include <cstdint> #include <type_traits> -namespace teachos::arch::io +namespace teachos::x86_64::io { /** * @brief An I/O port of a given size at a given address. @@ -128,6 +127,6 @@ namespace teachos::arch::io } }; -} // namespace teachos::arch::io +} // namespace teachos::x86_64::io -#endif // TEACHOS_ARCH_X86_64_IO_PORT_IO_HPP +#endif
\ No newline at end of file diff --git a/arch/x86_64/include/x86_64/vga/io.hpp b/arch/x86_64/include/x86_64/vga/io.hpp index 803dc21..4d99788 100644 --- a/arch/x86_64/include/x86_64/vga/io.hpp +++ b/arch/x86_64/include/x86_64/vga/io.hpp @@ -1,7 +1,7 @@ #ifndef TEACHOS_X86_64_VGA_IO_HPP #define TEACHOS_X86_64_VGA_IO_HPP -#include "arch/io/port_io.hpp" +#include "x86_64/io/port_io.hpp" #include <cstddef> @@ -12,12 +12,12 @@ namespace teachos::x86_64::vga::io /** * @brief The address port of the CRT Controller. */ - using address_port = arch::io::port<0x3d4, 1>; + using address_port = x86_64::io::port<0x3d4, 1>; /** * @brief The data port of the CRT Controller. */ - using data_port = arch::io::port<0x3d5, 1>; + using data_port = x86_64::io::port<0x3d5, 1>; namespace registers { |