From a31ca1282ebd13da58e5db1da369d95c3e696031 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 18 Feb 2020 14:30:39 +0100 Subject: [PATCH] Base: Rename /dev/psaux to /dev/mouse Since this device doesn't actually hand out raw PS/2 aux packets, let's just call it "mouse" instead. :^) --- Kernel/build-root-filesystem.sh | 6 +++--- Servers/WindowServer/EventLoop.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh index aeb3227956..922083703e 100755 --- a/Kernel/build-root-filesystem.sh +++ b/Kernel/build-root-filesystem.sh @@ -59,9 +59,9 @@ chmod 666 mnt/dev/debuglog mknod mnt/dev/keyboard c 85 1 chmod 440 mnt/dev/keyboard chown 0:$phys_gid mnt/dev/keyboard -mknod mnt/dev/psaux c 10 1 -chmod 440 mnt/dev/psaux -chown 0:$phys_gid mnt/dev/psaux +mknod mnt/dev/mouse c 10 1 +chmod 440 mnt/dev/mouse +chown 0:$phys_gid mnt/dev/mouse mknod mnt/dev/audio c 42 42 chmod 220 mnt/dev/audio chown 0:$audio_gid mnt/dev/audio diff --git a/Servers/WindowServer/EventLoop.cpp b/Servers/WindowServer/EventLoop.cpp index 8ae086fb59..078794d6f3 100644 --- a/Servers/WindowServer/EventLoop.cpp +++ b/Servers/WindowServer/EventLoop.cpp @@ -52,7 +52,7 @@ EventLoop::EventLoop() : m_server(Core::LocalServer::construct()) { m_keyboard_fd = open("/dev/keyboard", O_RDONLY | O_NONBLOCK | O_CLOEXEC); - m_mouse_fd = open("/dev/psaux", O_RDONLY | O_NONBLOCK | O_CLOEXEC); + m_mouse_fd = open("/dev/mouse", O_RDONLY | O_NONBLOCK | O_CLOEXEC); bool ok = m_server->take_over_from_system_server(); ASSERT(ok);