From 410183a7b034fb35be231fb882316def933935bc Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Tue, 15 Feb 2022 23:30:00 +0200 Subject: [PATCH] LibEDID: Exclude DMT::MonitorTiming::name() from the Kernel This API is only used by userland and it uses infallible Strings, so let's just ifdef it out of the Kernel. --- Userland/Libraries/LibEDID/DMT.cpp | 7 ++++++- Userland/Libraries/LibEDID/DMT.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Userland/Libraries/LibEDID/DMT.cpp b/Userland/Libraries/LibEDID/DMT.cpp index 6884420ef7..99d10945ef 100644 --- a/Userland/Libraries/LibEDID/DMT.cpp +++ b/Userland/Libraries/LibEDID/DMT.cpp @@ -4,9 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include +#ifndef KERNEL +# include +#endif + namespace EDID { // Monitor timings as per Display Monitor Timing Standard (DMT) 1.0 rev 13 @@ -116,12 +119,14 @@ u32 DMT::MonitorTiming::refresh_rate_hz() const return vertical_frequency_hz().ltrunk(); } +#ifndef KERNEL String DMT::MonitorTiming::name() const { if (scan_type == ScanType::Interlaced) return String::formatted("{} x {} @ {}Hz (Interlaced)", horizontal_pixels, vertical_lines, refresh_rate_hz()); return String::formatted("{} x {} @ {}Hz", horizontal_pixels, vertical_lines, refresh_rate_hz()); } +#endif auto DMT::find_timing_by_dmt_id(u8 dmt_id) -> MonitorTiming const* { diff --git a/Userland/Libraries/LibEDID/DMT.h b/Userland/Libraries/LibEDID/DMT.h index 2774b09315..2181399dbf 100644 --- a/Userland/Libraries/LibEDID/DMT.h +++ b/Userland/Libraries/LibEDID/DMT.h @@ -53,7 +53,9 @@ public: FixedPoint<16, u32> horizontal_frequency_khz() const; FixedPoint<16, u32> vertical_frequency_hz() const; u32 refresh_rate_hz() const; +#ifndef KERNEL String name() const; +#endif }; static MonitorTiming const* find_timing_by_dmt_id(u8);