From 53ddbce0b3dd818468d03325be467d4761a0ea23 Mon Sep 17 00:00:00 2001
From: Conrad Pankoff <deoxxa@fknsrs.biz>
Date: Mon, 12 Aug 2019 20:53:26 +1000
Subject: [PATCH] Kernel: Use established device name and number for
 framebuffer

This is to prepare for other framebuffer implementations, for which it
would be inappropriate to use the /dev/bxvga device name.
---
 Kernel/Devices/BXVGADevice.cpp    | 2 +-
 Kernel/build-root-filesystem.sh   | 2 +-
 Servers/WindowServer/WSScreen.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Kernel/Devices/BXVGADevice.cpp b/Kernel/Devices/BXVGADevice.cpp
index 174ff4c5f9f..6aa7f18e716 100644
--- a/Kernel/Devices/BXVGADevice.cpp
+++ b/Kernel/Devices/BXVGADevice.cpp
@@ -38,7 +38,7 @@ BXVGADevice& BXVGADevice::the()
 }
 
 BXVGADevice::BXVGADevice()
-    : BlockDevice(82, 413)
+    : BlockDevice(29, 0)
 {
     s_the = this;
     m_framebuffer_address = PhysicalAddress(find_framebuffer_address());
diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh
index 6cf3de7e81e..b082e317a38 100755
--- a/Kernel/build-root-filesystem.sh
+++ b/Kernel/build-root-filesystem.sh
@@ -22,7 +22,7 @@ echo "done"
 echo -n "setting up device nodes... "
 mkdir -p mnt/dev
 mkdir -p mnt/dev/pts
-mknod -m 666 mnt/dev/bxvga b 82 413
+mknod -m 666 mnt/dev/fb0 b 29 0
 mknod mnt/dev/tty0 c 4 0
 mknod mnt/dev/tty1 c 4 1
 mknod mnt/dev/tty2 c 4 2
diff --git a/Servers/WindowServer/WSScreen.cpp b/Servers/WindowServer/WSScreen.cpp
index 3d15b9f0728..e7456b4e410 100644
--- a/Servers/WindowServer/WSScreen.cpp
+++ b/Servers/WindowServer/WSScreen.cpp
@@ -23,7 +23,7 @@ WSScreen::WSScreen(unsigned width, unsigned height)
     ASSERT(!s_the);
     s_the = this;
     m_cursor_location = rect().center();
-    m_framebuffer_fd = open("/dev/bxvga", O_RDWR);
+    m_framebuffer_fd = open("/dev/fb0", O_RDWR);
     ASSERT(m_framebuffer_fd >= 0);
 
     set_resolution(width, height);