diff options
Diffstat (limited to 'arch/x86_64/src/vga/text/device.cpp')
| -rw-r--r-- | arch/x86_64/src/vga/text/device.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86_64/src/vga/text/device.cpp b/arch/x86_64/src/vga/text/device.cpp index 2da9e06..dcacd8c 100644 --- a/arch/x86_64/src/vga/text/device.cpp +++ b/arch/x86_64/src/vga/text/device.cpp @@ -1,16 +1,16 @@ #include "kapi/cio.hpp" -#include "x86_64/boot/boot.hpp" -#include "x86_64/boot/ld.hpp" -#include "x86_64/vga/crtc.hpp" -#include "x86_64/vga/text.hpp" +#include "arch/boot/boot.hpp" +#include "arch/boot/ld.hpp" +#include "arch/vga/crtc.hpp" +#include "arch/vga/text.hpp" #include <bit> #include <cstddef> #include <cstdint> #include <string_view> -namespace teachos::vga::x86_64::text +namespace arch::vga::text { namespace { @@ -22,10 +22,10 @@ namespace teachos::vga::x86_64::text } // namespace device::device() - : m_buffer{default_buffer_width, default_buffer_height, - std::bit_cast<buffer::cell *>(default_buffer_address + - std::bit_cast<std::uintptr_t>(&teachos::boot::x86_64::TEACHOS_VMA)), - boot::bootstrap_information.vga_buffer_index} + : m_buffer{ + default_buffer_width, default_buffer_height, + std::bit_cast<buffer::cell *>(default_buffer_address + std::bit_cast<std::uintptr_t>(&boot::TEACHOS_VMA)), + kapi::boot::bootstrap_information.vga_buffer_index} { clear(); } @@ -43,12 +43,12 @@ namespace teachos::vga::x86_64::text crtc::data::write(crtc::data::read() | cursor_disable_byte); } - auto device::write(cio::output_stream stream, std::string_view text) -> void + auto device::write(kapi::cio::output_stream stream, std::string_view text) -> void { auto attributes = [&] -> attribute { switch (stream) { - case cio::output_stream::stderr: + case kapi::cio::output_stream::stderr: return red_on_black; default: return green_on_black; @@ -57,4 +57,4 @@ namespace teachos::vga::x86_64::text m_buffer.write(text, attributes); } -} // namespace teachos::vga::x86_64::text +} // namespace arch::vga::text |