Kernel: Move TYPEDEF_* TTY macros to API/ttydefaults.h file

This allows us to get rid of an include to LibC/sys/ttydefaults.h in the
Kernel TTY implementation.

Also, move ttydefchars static const struct to another file called
Kernel/API/ttydefaultschars.h, so it could be used too in the Kernel TTY
implementation without the need to include anything from LibC.

Kernel/API/ttydefaults.h

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2021, Daniel Bertalan <dani@danielbertalan.dev>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#define TTYDEF_IFLAG (ICRNL)
+#define TTYDEF_OFLAG (OPOST | ONLCR)
+#define TTYDEF_LFLAG_NOECHO (ISIG | ICANON)
+#define TTYDEF_LFLAG_ECHO (TTYDEF_LFLAG_NOECHO | ECHO | ECHOE | ECHOK | ECHONL)
+#define TTYDEF_LFLAG TTYDEF_LFLAG_ECHO
+#define TTYDEF_CFLAG (CS8)
+#define TTYDEF_SPEED (B9600)
+
+#define CTRL(c) (c & 0x1F)
+#define CINTR CTRL('c')
+#define CQUIT 034
+#define CERASE 010
+#define CKILL CTRL('u')
+#define CEOF CTRL('d')
+#define CTIME 0
+#define CMIN 1
+#define CSWTC 0
+#define CSTART CTRL('q')
+#define CSTOP CTRL('s')
+#define CSUSP CTRL('z')
+#define CEOL 0
+#define CREPRINT CTRL('r')
+#define CDISCARD CTRL('o')
+#define CWERASE CTRL('w')
+#define CLNEXT CTRL('v')
+#define CEOL2 CEOL
+
+#define CEOT CEOF
+#define CBRK CEOL
+#define CRPRNT CREPRINT
+#define CFLUSH CDISCARD

Kernel/API/ttydefaultschars.h

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2021, Daniel Bertalan <dani@danielbertalan.dev>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <Kernel/API/POSIX/termios.h>
+#include <Kernel/API/ttydefaults.h>
+
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wc99-designator"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static const cc_t ttydefchars[NCCS] = {
+    [VINTR] = CINTR,
+    [VQUIT] = CQUIT,
+    [VERASE] = CERASE,
+    [VKILL] = CKILL,
+    [VEOF] = CEOF,
+    [VTIME] = CTIME,
+    [VMIN] = CMIN,
+    [VSWTC] = CSWTC,
+    [VSTART] = CSTART,
+    [VSTOP] = CSTOP,
+    [VSUSP] = CSUSP,
+    [VEOL] = CEOL,
+    [VREPRINT] = CREPRINT,
+    [VDISCARD] = CDISCARD,
+    [VWERASE] = CWERASE,
+    [VLNEXT] = CLNEXT,
+    [VEOL2] = CEOL2
+};
+
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
+
+#ifdef __cplusplus
+}
+#endif

Kernel/TTY/TTY.cpp

@@ -10,13 +10,13 @@
 #include <Kernel/API/Ioctl.h>
 #include <Kernel/API/POSIX/errno.h>
 #include <Kernel/API/POSIX/signal_numbers.h>
+#include <Kernel/API/ttydefaults.h>
+#include <Kernel/API/ttydefaultschars.h>
 #include <Kernel/Debug.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/Process.h>
 #include <Kernel/TTY/TTY.h>
-#define TTYDEFCHARS
-#include <LibC/sys/ttydefaults.h>
-#undef TTYDEFCHARS
+#include <Kernel/UnixTypes.h>
 
 namespace Kernel {
 

Userland/Libraries/LibC/sys/ttydefaults.h

@@ -6,80 +6,10 @@
 
 #pragma once
 
-#define TTYDEF_IFLAG (ICRNL)
-#define TTYDEF_OFLAG (OPOST | ONLCR)
-#define TTYDEF_LFLAG_NOECHO (ISIG | ICANON)
-#define TTYDEF_LFLAG_ECHO (TTYDEF_LFLAG_NOECHO | ECHO | ECHOE | ECHOK | ECHONL)
-#define TTYDEF_LFLAG TTYDEF_LFLAG_ECHO
-#define TTYDEF_CFLAG (CS8)
-#define TTYDEF_SPEED (B9600)
-
-#define CTRL(c) (c & 0x1F)
-#define CINTR CTRL('c')
-#define CQUIT 034
-#define CERASE 010
-#define CKILL CTRL('u')
-#define CEOF CTRL('d')
-#define CTIME 0
-#define CMIN 1
-#define CSWTC 0
-#define CSTART CTRL('q')
-#define CSTOP CTRL('s')
-#define CSUSP CTRL('z')
-#define CEOL 0
-#define CREPRINT CTRL('r')
-#define CDISCARD CTRL('o')
-#define CWERASE CTRL('w')
-#define CLNEXT CTRL('v')
-#define CEOL2 CEOL
-
-#define CEOT CEOF
-#define CBRK CEOL
-#define CRPRNT CREPRINT
-#define CFLUSH CDISCARD
+#include <Kernel/API/ttydefaults.h>
 
 #ifdef TTYDEFCHARS
-#    ifdef KERNEL
-#        include <Kernel/UnixTypes.h>
-#    else
-#        include <termios.h>
-#    endif
-
-#    ifdef __clang__
-#        pragma clang diagnostic push
-#        pragma clang diagnostic ignored "-Wc99-designator"
-#    endif
-
-#    ifdef __cplusplus
-extern "C" {
-#    endif
-
-static const cc_t ttydefchars[NCCS] = {
-    [VINTR] = CINTR,
-    [VQUIT] = CQUIT,
-    [VERASE] = CERASE,
-    [VKILL] = CKILL,
-    [VEOF] = CEOF,
-    [VTIME] = CTIME,
-    [VMIN] = CMIN,
-    [VSWTC] = CSWTC,
-    [VSTART] = CSTART,
-    [VSTOP] = CSTOP,
-    [VSUSP] = CSUSP,
-    [VEOL] = CEOL,
-    [VREPRINT] = CREPRINT,
-    [VDISCARD] = CDISCARD,
-    [VWERASE] = CWERASE,
-    [VLNEXT] = CLNEXT,
-    [VEOL2] = CEOL2
-};
-
-#    ifdef __clang__
-#        pragma clang diagnostic pop
-#    endif
-
-#    ifdef __cplusplus
-}
-#    endif
+#    include <termios.h>
 
+#    include <Kernel/API/ttydefaultschars.h>
 #endif