From be459acaea138102f97d25c355b12025836ab003 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 9 Dec 2019 20:43:29 +0100 Subject: [PATCH] TTY: Change the MasterPTY device major to not conflict with /dev/psaux The 1st master pseudoterminal had the same device ID as /dev/psaux which was caught by an assertion in Device VFS registration. This would cause us to overwrite the PS/2 mouse device registration which was definitely not good. --- Kernel/TTY/MasterPTY.cpp | 2 +- Kernel/TTY/SlavePTY.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/TTY/MasterPTY.cpp b/Kernel/TTY/MasterPTY.cpp index dc46506ce8..04a8fc47de 100644 --- a/Kernel/TTY/MasterPTY.cpp +++ b/Kernel/TTY/MasterPTY.cpp @@ -9,7 +9,7 @@ //#define MASTERPTY_DEBUG MasterPTY::MasterPTY(unsigned index) - : CharacterDevice(10, index) + : CharacterDevice(100, index) , m_slave(adopt(*new SlavePTY(*this, index))) , m_index(index) { diff --git a/Kernel/TTY/SlavePTY.cpp b/Kernel/TTY/SlavePTY.cpp index b368b56c24..0a5a389ae5 100644 --- a/Kernel/TTY/SlavePTY.cpp +++ b/Kernel/TTY/SlavePTY.cpp @@ -6,7 +6,7 @@ //#define SLAVEPTY_DEBUG SlavePTY::SlavePTY(MasterPTY& master, unsigned index) - : TTY(11, index) + : TTY(101, index) , m_master(master) , m_index(index) {