summaryrefslogtreecommitdiff
path: root/Kernel
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-04-08 14:09:22 +0200
committerAndreas Kling <kling@serenityos.org>2020-04-08 17:19:46 +0200
commitbefe4c6709815849c396d137cf97fac628812e8c (patch)
tree87737f100cc39160b11adc04ccac40f53a860a84 /Kernel
parentc8087a42fc6b57a31ad24cd73ab1c617adfbd0ab (diff)
downloadserenity-befe4c6709815849c396d137cf97fac628812e8c.zip
Kernel: Remove DebugLogDevice
This was a cute idea but ultimately it's just not useful since we already have the dbgputch() and dbgputstr() syscalls.
Diffstat (limited to 'Kernel')
-rw-r--r--Kernel/Devices/DebugLogDevice.cpp57
-rw-r--r--Kernel/Devices/DebugLogDevice.h47
-rw-r--r--Kernel/Makefile1
-rwxr-xr-xKernel/build-root-filesystem.sh2
-rw-r--r--Kernel/init.cpp2
5 files changed, 0 insertions, 109 deletions
diff --git a/Kernel/Devices/DebugLogDevice.cpp b/Kernel/Devices/DebugLogDevice.cpp
deleted file mode 100644
index 49406582a5..0000000000
--- a/Kernel/Devices/DebugLogDevice.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <Kernel/Devices/DebugLogDevice.h>
-#include <LibBareMetal/IO.h>
-
-namespace Kernel {
-
-static DebugLogDevice* s_the;
-
-DebugLogDevice& DebugLogDevice::the()
-{
- ASSERT(s_the);
- return *s_the;
-}
-
-DebugLogDevice::DebugLogDevice()
- : CharacterDevice(1, 18)
-{
- s_the = this;
-}
-
-DebugLogDevice::~DebugLogDevice()
-{
-}
-
-ssize_t DebugLogDevice::write(FileDescription&, const u8* data, ssize_t data_size)
-{
- for (int i = 0; i < data_size; ++i)
- IO::out8(0xe9, data[i]);
- return data_size;
-}
-
-}
diff --git a/Kernel/Devices/DebugLogDevice.h b/Kernel/Devices/DebugLogDevice.h
deleted file mode 100644
index 0dceb0aad6..0000000000
--- a/Kernel/Devices/DebugLogDevice.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <Kernel/Devices/CharacterDevice.h>
-
-namespace Kernel {
-
-class DebugLogDevice final : public CharacterDevice {
-public:
- DebugLogDevice();
- virtual ~DebugLogDevice() override;
-
- static DebugLogDevice& the();
-
-private:
- // ^CharacterDevice
- virtual ssize_t read(FileDescription&, u8*, ssize_t) override { return 0; }
- virtual ssize_t write(FileDescription&, const u8*, ssize_t) override;
- virtual bool can_write(const FileDescription&) const override { return true; }
- virtual bool can_read(const FileDescription&) const override { return true; }
- virtual const char* class_name() const override { return "DebugLogDevice"; }
-};
-
-}
diff --git a/Kernel/Makefile b/Kernel/Makefile
index fc5cc89b1b..340a0e4861 100644
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -35,7 +35,6 @@ OBJS = \
Devices/BXVGADevice.o \
Devices/BlockDevice.o \
Devices/CharacterDevice.o \
- Devices/DebugLogDevice.o \
Devices/Device.o \
Devices/DiskPartition.o \
Devices/FullDevice.o \
diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh
index 826be080bb..ab354603a5 100755
--- a/Kernel/build-root-filesystem.sh
+++ b/Kernel/build-root-filesystem.sh
@@ -49,13 +49,11 @@ mknod mnt/dev/random c 1 8
mknod mnt/dev/null c 1 3
mknod mnt/dev/zero c 1 5
mknod mnt/dev/full c 1 7
-mknod mnt/dev/debuglog c 1 18
# random, is failing (randomly) on fuse-ext2 on macos :)
chmod 666 mnt/dev/random || true
chmod 666 mnt/dev/null
chmod 666 mnt/dev/zero
chmod 666 mnt/dev/full
-chmod 666 mnt/dev/debuglog
mknod mnt/dev/keyboard c 85 1
chmod 440 mnt/dev/keyboard
chown 0:$phys_gid mnt/dev/keyboard
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 26a41d11ef..cc49a0465f 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -33,7 +33,6 @@
#include <Kernel/CMOS.h>
#include <Kernel/CommandLine.h>
#include <Kernel/Devices/BXVGADevice.h>
-#include <Kernel/Devices/DebugLogDevice.h>
#include <Kernel/Devices/DiskPartition.h>
#include <Kernel/Devices/EBRPartitionTable.h>
#include <Kernel/Devices/FullDevice.h>
@@ -125,7 +124,6 @@ extern "C" [[noreturn]] void init()
new KeyboardDevice;
new PS2MouseDevice;
setup_vmmouse();
- new DebugLogDevice;
new Console;
klog() << "Starting SerenityOS...";