diff options
author | Liav A <liavalb@gmail.com> | 2022-06-10 20:25:22 +0300 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2022-06-10 22:32:54 +0100 |
commit | 938d579d160547c94ce519203aba9554b5b7a9ab (patch) | |
tree | e9b0d187b699a775b595d40ad01d25391fac1826 /Kernel | |
parent | 6291821489d7ae0e861d729a73c2ae5e40b77eee (diff) | |
download | serenity-938d579d160547c94ce519203aba9554b5b7a9ab.zip |
Kernel/Graphics: Re-organize the DisplayConnector class a bit
Move methods that are overriding the virtual methods in the File class,
to a private access scope in the DisplayConnector class because nobody
tries to access them in any derived class of this class.
Diffstat (limited to 'Kernel')
-rw-r--r-- | Kernel/Graphics/DisplayConnector.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Kernel/Graphics/DisplayConnector.h b/Kernel/Graphics/DisplayConnector.h index f817a69686..ceeac71114 100644 --- a/Kernel/Graphics/DisplayConnector.h +++ b/Kernel/Graphics/DisplayConnector.h @@ -105,16 +105,6 @@ public: protected: void set_edid_bytes(Array<u8, 128> const& edid_bytes); - // ^File - virtual bool is_seekable() const override { return true; } - virtual bool can_read(OpenFileDescription const&, u64) const final override { return true; } - virtual bool can_write(OpenFileDescription const&, u64) const final override { return true; } - virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override final; - virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override final; - virtual ErrorOr<Memory::Region*> mmap(Process&, OpenFileDescription&, Memory::VirtualRange const&, u64, int, bool) override final; - virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override final; - virtual StringView class_name() const override final { return "DisplayConnector"sv; } - DisplayConnector(PhysicalAddress framebuffer_address, size_t framebuffer_resource_size, bool enable_write_combine_optimization); DisplayConnector(size_t framebuffer_resource_size, bool enable_write_combine_optimization); virtual void enable_console() = 0; @@ -141,6 +131,16 @@ protected: u8* framebuffer_data() { return m_framebuffer_data; } private: + // ^File + virtual bool is_seekable() const override { return true; } + virtual bool can_read(OpenFileDescription const&, u64) const final override { return true; } + virtual bool can_write(OpenFileDescription const&, u64) const final override { return true; } + virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override final; + virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override final; + virtual ErrorOr<Memory::Region*> mmap(Process&, OpenFileDescription&, Memory::VirtualRange const&, u64, int, bool) override final; + virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override final; + virtual StringView class_name() const override final { return "DisplayConnector"sv; } + DisplayConnector& operator=(DisplayConnector const&) = delete; DisplayConnector& operator=(DisplayConnector&&) = delete; DisplayConnector(DisplayConnector&&) = delete; |