Przeglądaj źródła

Kernel: Remove kprintf()

There are no remaining users of this API.
Andreas Kling 4 lat temu
rodzic
commit
5f610417d0
3 zmienionych plików z 0 dodań i 42 usunięć
  1. 0 7
      Kernel/Arch/i386/Boot/boot.S
  2. 0 34
      Kernel/kprintf.cpp
  3. 0 1
      Kernel/kstdio.h

+ 0 - 7
Kernel/Arch/i386/Boot/boot.S

@@ -222,18 +222,11 @@ start:
     call init
     add $4, %esp
 
-    pushl $exit_message
-    call kprintf
-    add $4, %esp
     cli
-
 loop:
     hlt
     jmp loop
 
-exit_message:
-    .asciz "Kernel exited."
-
 .extern init_ap
 .type init_ap, @function
 

+ 0 - 34
Kernel/kprintf.cpp

@@ -49,23 +49,6 @@ int get_serial_debug()
     return serial_debug;
 }
 
-static void color_on()
-{
-    IO::out8(0xe9, 0x1b);
-    IO::out8(0xe9, '[');
-    IO::out8(0xe9, '3');
-    IO::out8(0xe9, '6');
-    IO::out8(0xe9, 'm');
-}
-
-static void color_off()
-{
-    IO::out8(0xe9, 0x1b);
-    IO::out8(0xe9, '[');
-    IO::out8(0xe9, '0');
-    IO::out8(0xe9, 'm');
-}
-
 static void serial_putch(char ch)
 {
     static bool serial_ready = false;
@@ -111,23 +94,6 @@ static void console_out(char ch)
     }
 }
 
-static void console_putch(char*&, char ch)
-{
-    console_out(ch);
-}
-
-int kprintf(const char* fmt, ...)
-{
-    ScopedSpinLock lock(s_log_lock);
-    color_on();
-    va_list ap;
-    va_start(ap, fmt);
-    int ret = printf_internal(console_putch, nullptr, fmt, ap);
-    va_end(ap);
-    color_off();
-    return ret;
-}
-
 static void buffer_putch(char*& bufptr, char ch)
 {
     *bufptr++ = ch;

+ 0 - 1
Kernel/kstdio.h

@@ -31,7 +31,6 @@
 extern "C" {
 int dbgputstr(const char*, int);
 int kernelputstr(const char*, int);
-int kprintf(const char* fmt, ...) __attribute__((format(printf, 1, 2)));
 int snprintf(char* buf, size_t, const char* fmt, ...) __attribute__((format(printf, 3, 4)));
 void set_serial_debug(bool on_or_off);
 int get_serial_debug();