1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:17:36 +00:00

Kernel: Remove KDSETMODE and KDGETMODE ioctl options from the TTY class

These options are not relevant and are actually meaningless on pure TTY
devices, as they are meant to be effective only for the VirtualConsole
devices.

This also removes the virtual marking from two methods because they're
no longer declared in the TTY class as well.
This commit is contained in:
Liav A 2023-08-25 10:05:40 +03:00 committed by Tim Schumacher
parent 258af88b29
commit 4177e6be8b
4 changed files with 25 additions and 20 deletions

View file

@ -562,19 +562,6 @@ ErrorOr<void> TTY::ioctl(OpenFileDescription&, unsigned request, Userspace<void*
case TIOCNOTTY: case TIOCNOTTY:
current_process.set_tty(nullptr); current_process.set_tty(nullptr);
return {}; return {};
case KDSETMODE: {
auto mode = static_cast<unsigned int>(arg.ptr());
if (mode != KD_TEXT && mode != KD_GRAPHICS)
return EINVAL;
set_graphical(mode == KD_GRAPHICS);
return {};
}
case KDGETMODE: {
auto mode_ptr = static_ptr_cast<int*>(arg);
int mode = (is_graphical()) ? KD_GRAPHICS : KD_TEXT;
return copy_to_user(mode_ptr, &mode);
}
} }
return EINVAL; return EINVAL;
} }

View file

@ -25,7 +25,7 @@ public:
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override; virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override;
virtual bool can_read(OpenFileDescription const&, u64) const override; virtual bool can_read(OpenFileDescription const&, u64) const override;
virtual bool can_write(OpenFileDescription const&, u64) const override; virtual bool can_write(OpenFileDescription const&, u64) const override;
virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override final; virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override;
unsigned short rows() const { return m_rows; } unsigned short rows() const { return m_rows; }
unsigned short columns() const { return m_columns; } unsigned short columns() const { return m_columns; }
@ -48,9 +48,6 @@ public:
virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_name() const = 0; virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_name() const = 0;
virtual bool is_graphical() const { return false; }
virtual void set_graphical(bool) { }
protected: protected:
virtual ErrorOr<size_t> on_tty_write(UserOrKernelBuffer const&, size_t) = 0; virtual ErrorOr<size_t> on_tty_write(UserOrKernelBuffer const&, size_t) = 0;
void set_size(unsigned short columns, unsigned short rows); void set_size(unsigned short columns, unsigned short rows);

View file

@ -194,6 +194,27 @@ UNMAP_AFTER_INIT VirtualConsole::~VirtualConsole()
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
ErrorOr<void> VirtualConsole::ioctl(OpenFileDescription& description, unsigned request, Userspace<void*> arg)
{
TRY(Process::current().require_promise(Pledge::tty));
switch (request) {
case KDSETMODE: {
auto mode = static_cast<unsigned int>(arg.ptr());
if (mode != KD_TEXT && mode != KD_GRAPHICS)
return EINVAL;
set_graphical(mode == KD_GRAPHICS);
return {};
}
case KDGETMODE: {
auto mode_ptr = static_ptr_cast<int*>(arg);
int mode = (is_graphical()) ? KD_GRAPHICS : KD_TEXT;
return copy_to_user(mode_ptr, &mode);
}
}
return TTY::ioctl(description, request, arg);
}
static inline Graphics::Console::Color ansi_color_to_standard_vga_color(VT::Color::ANSIColor color) static inline Graphics::Console::Color ansi_color_to_standard_vga_color(VT::Color::ANSIColor color)
{ {
switch (color) { switch (color) {

View file

@ -77,9 +77,8 @@ public:
void refresh_after_resolution_change(); void refresh_after_resolution_change();
// ^TTY bool is_graphical() const { return m_graphical; }
virtual bool is_graphical() const override { return m_graphical; } void set_graphical(bool graphical);
virtual void set_graphical(bool graphical) override;
void emit_char(char); void emit_char(char);
@ -91,6 +90,7 @@ private:
// ^TTY // ^TTY
virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_name() const override; virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_name() const override;
virtual ErrorOr<size_t> on_tty_write(UserOrKernelBuffer const&, size_t) override; virtual ErrorOr<size_t> on_tty_write(UserOrKernelBuffer const&, size_t) override;
virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override;
virtual void echo(u8) override; virtual void echo(u8) override;
// ^TerminalClient // ^TerminalClient