diff --git a/Userland/Libraries/LibEDID/EDID.cpp b/Userland/Libraries/LibEDID/EDID.cpp index 7e3b5f8d0d..efd5cbb001 100644 --- a/Userland/Libraries/LibEDID/EDID.cpp +++ b/Userland/Libraries/LibEDID/EDID.cpp @@ -462,6 +462,12 @@ ErrorOr Parser::parse() if (major_version != 1 || m_revision > 4) return Error::from_string_literal("Unsupported Parser version"sv); +#ifdef KERNEL + m_version = TRY(Kernel::KString::formatted("1.{}", (int)m_revision)); +#else + m_version = String::formatted("1.{}", (int)m_revision); +#endif + u8 checksum = 0x0; for (size_t i = 0; i < sizeof(Definitions::EDID); i++) checksum += m_bytes[i]; @@ -540,9 +546,13 @@ ErrorOr Parser::for_each_extension_block(Functionview(); +#else + return m_version; +#endif } String Parser::legacy_manufacturer_id() const diff --git a/Userland/Libraries/LibEDID/EDID.h b/Userland/Libraries/LibEDID/EDID.h index c42dd16cbb..9cf0ae02b2 100644 --- a/Userland/Libraries/LibEDID/EDID.h +++ b/Userland/Libraries/LibEDID/EDID.h @@ -6,17 +6,23 @@ #pragma once +#include #include #include #include #include #include #include -#include #include #include #include +#ifdef KERNEL +# include +#else +# include +#endif + namespace EDID { namespace Definitions { @@ -415,7 +421,7 @@ public: bool operator==(Parser const& other) const; - String version() const; + StringView version() const; auto bytes() const { return m_bytes; } @@ -442,6 +448,11 @@ private: ByteBuffer m_bytes_buffer; ReadonlyBytes m_bytes; u8 m_revision { 0 }; +#ifdef KERNEL + OwnPtr m_version; +#else + String m_version; +#endif }; } diff --git a/Userland/Libraries/LibEDID/VIC.cpp b/Userland/Libraries/LibEDID/VIC.cpp index dd9e375898..460c664bde 100644 --- a/Userland/Libraries/LibEDID/VIC.cpp +++ b/Userland/Libraries/LibEDID/VIC.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include namespace EDID {