From 4ee3940807c365b66c3d6655c777b7e454888838 Mon Sep 17 00:00:00 2001
From: Tom-on64 <kubecekt@gmail.com>
Date: Wed, 9 Oct 2024 16:50:56 +0200
Subject: [PATCH] Added ports/serial.h header for serial console stuff

---
 include/ports/serial.h |  24 +++++++++++++++++++++
 kern.iso               | Bin 1470464 -> 1470464 bytes
 libk/ports/serial.c    |  46 +++++++++++++++++++++++++++++++++++++++++
 src/kernel.c           |   6 ++++++
 todo.txt               |   8 +++----
 5 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 include/ports/serial.h
 create mode 100644 libk/ports/serial.c

diff --git a/include/ports/serial.h b/include/ports/serial.h
new file mode 100644
index 0000000..4a59557
--- /dev/null
+++ b/include/ports/serial.h
@@ -0,0 +1,24 @@
+#ifndef PORTS_SERIAL_H
+#define PORTS_SERIAL_H
+
+#include <stdint.h>
+
+#define PORT_COM1   0x3f8
+#define PORT_COM2   0x2f8
+#define PORT_COM3   0x3e8
+#define PORT_COM4   0x2e8
+#define PORT_COM5   0x5f8
+#define PORT_COM6   0x4f8
+#define PORT_COM7   0x5e8
+#define PORT_COM8   0x4e8
+
+int setupSerial(uint32_t port);
+
+int serialTransmitEmpty(uint32_t port);
+int serialRecieved(uint32_t port);
+
+void serialWrite(uint32_t port, char c);
+void serialPrint(uint32_t port, char* s);
+char serialRead(uint32_t port);
+
+#endif
diff --git a/kern.iso b/kern.iso
index 12bc63e2590c3a23128965845663a9dd54506678..209d78cacca2831f472dd1d427e082e2b71feb59 100644
GIT binary patch
delta 1549
zcmYjReN2^A7=K>*zT6KA<s(R-)XX`g{7NQGCoLELapA(13kg;-&o0)C#j>pi1y{tz
zkdEtPlaP<3#9H%Rp_S`JaYP^H#)gix?q-|khC|kDnHPNfo%3FiKYq`C&+qv?&wI|f
z=iJ7iuQBNR^3fK}!M9zk)8B77p4M<Zi%48bBXYATB4W3nAcHl6iT7m1`53|w!btRz
z1ybDu9v1G$LF;l6hI3Tyb`*FUgr?!7fbp8E>4u#}ZzMz1I*BG9@p#y3WK7u(t|F?c
zX8BUcRmvMs(1<2~lK6coQR_Jvi1NrSYS*g|$V7a{M~`kP{0$4kawr;~3}bxn&dp?0
z_}KFp=oW)6qVB?cGDbGpZ(W_FkxlWbi5iJYIMG!l7xj^YztElPYIG2_b&9*D*_ydT
z6!4br%JjWxS9@?ZpTUORZnhsC9#PK2-Fw&Fgcnk~k|r=QVqFxgtcR6;c1{nZV}x+>
z?w%B_l%MKZt99_Ho@}jxyLz*=4LlDqjTiT3H~gC-XDwu={0)APp&2L2R%!@Bp6&R2
zgOanQVa_VPiWsPCiu}7+pX{uX;ShrOKvgp_-y~L!Rau>i!N8|`?b?1m+q**hg)i@0
zk(HNftta0Wj4VZc?jSn-yTnocYF|dfOYpG&#(T(L#HQrPujN8-JtRA`#m_b*CPL_o
z8PnXpoqebdr^9~l&;lLUro1PeD2OaL@$;ONJlW!7lE+zmR`PIy@}w1j-%Myw$wrx6
zvkKLcU$S_+<Ud*bjO5>2{13@>i^n_--f!{s;Gx;DX?nfP3+@pjF|yKnn|KO43tdOG
zxS07=^~b~)@0UNvRSb=yTvEbzs`81s=49NLyVxm??OFzGU9dsgt!#lgn@tSJZ!}xg
zJ*v8!-}q#)c7i7!OV7KEa|^Ars&%TGd9T+M_$zXfZ=xWM$K&8rc<Hfa4Nop6DzEVG
z^NQtQzA82?Z&ne0E0GGJx|}h2Lr%#X605wHqe}|^Jbb_9fE50OfEG1lhZM#j$nk8c
z%+4!6GF2NyR$5(-RP}y_wCP+lo=aQ6z$4ml*%f%kG)?*B_lc9JiW-E_nmg*Q98f!)
z#EG<ys3%tM@OnM$UC4S#f03q*=pTRjPLejmb55rh1k%Xxljy`FY#O$+cDc!Zsl|)d
z`Pv1kIYs?^ZAO3n^sn*SRsGqsZ^vn2eROnLjJ89czEG)Y4t?9j{scaBC@bfD9vOYW
z9bf|R;%{;cumgp_kiL21Z!IpPa%)EAbHuk?$+6KYs;#MeCD&%tYp#47wf5!JWV{8m
z0Y`uV;2U5V7zZXJ;A_Z`m_@#_sVvx17Sw<RKok%S!~n5C91ssA05%{IumcXj3AlhH
S-~r%4AQ@OVSQcC~(EdMd{x`w^

delta 1469
zcmYjRZA_C_6uwuAKq<6}jw14vp^Icwj8+mAGc-$#Zm~!xlm^NVoOhksCYjlOEGdq5
zh-O1`7qTrQeiUKZh+l6aGUw7c7Gz&A_hVl;`)Ap$0p=EeZ0dOTocmVhkLUC`&pG$p
zbI-kRI}-kmg#X;5UA#s%O|~1oT_3u`Kb0`1#@&oHh*`#%xV4tWMF*IQP=q}OW5A5r
z$`_E@0)9_zT?N{<8s=h|j{Thm9){34>Wao+c6ClWgl#j6tL9v-!4J9AofV9Af8G)l
zj8!tPI#|W*RG2(<UCx}?R`Mq{CB=qvi=2$bT5DLm$uHKSmREfvcb&|CYClRM$3x}M
z<}em$5!K*A_b_SoP%EB=WO``1c#blo$b7R;&6#HR@^ZCRzIQTEZ~!~#hMkcsIGxuk
z-au-dYL>aDUV7$NGy$ncOE;}^MB~oLvV~fITkB)<db9u~R35hZ^cp60nT%I3ld(FV
z^2@JId3dknvC?h9eA;yhhF~)BB*)Mx)iUI&EvW=7W#T9$L@-|QII&V1bdhX}mGb*C
z3j2#3fc;pG#ftd*^0!z8KO$ZI75uu~)L*g5lPa~*o=8=p0^%@Q4YjG$k5DJ2!Zgu|
zF5ifNm`cYULZ0Yf8vbXQ&QRakA=$DSOP;xJnhg!&9ew&<$AbYzkD*z*^*#htInr@O
z7l^wp{ylMr#s4LayQds?HTaz@%{LQQ77r2+Pgzb6Ig=K@LVVQXH;G@ec={IbA&Xam
zC#NwlpHKL}>(mT-*H?YOuBtJD<nQ-Pv$j_Fb#&sP=mlJRavag!yT#M3I(&XUoQDT7
zhm&G>st|d{kq2q7PCGoGW>@EEkBAlBr=$C%dAgXNm&F4Gl{YZA<OVC+uA^lS);goN
zQj>fQ0d+PLgD;eO2UdowiWzHc3cc!6Pk{Mb#BF*XJL%OehY)NOf?mia7?rJat&HO&
z+%5Wl$srPw5U@noXeQxD2vlCIAn!|^4^PKFftMX@gsaz{k@<r~Ylk7K5KMCYUHv8w
z>66^X$-Bp_Sugha>ckO!jts_(*1?^eUp0n4c-_Tk<(iR#Rj;^NJj7HVKB>-8hv=ab
zy-QlA>V8;@%l#vHeAbALOl0y2qyFl_3_fH0FupRK?=t4T4RBs#G))d>9ZTfO&yJRq
z4Og;wFE9;!4Q$8X+84ka_y+tMM$ONEan~C5{GRp~R@?2YFtEKautRQ~D&slEo~g@e
zp5Qtbe-Q`+ZvlP45O5K=2HZ#?x}L=ef50#9tWR{+CpfSGNCRv@I<OGP05X9rzz$>s
a4j>1}1)P8jSOhEv@_;47^@*h)_525D#uA|b

diff --git a/libk/ports/serial.c b/libk/ports/serial.c
new file mode 100644
index 0000000..ce1776e
--- /dev/null
+++ b/libk/ports/serial.c
@@ -0,0 +1,46 @@
+#include <ports/serial.h>
+#include <ports/io.h>
+#include <stdint.h>
+
+int setupSerial(uint32_t port) {
+    outb(port + 1, 0x00);   // Disable all interrupts
+    outb(port + 3, 0x80);   // Enable DLAB (set baud rate divisor)
+    outb(port + 0, 0x03);   // Set divisor to 3 (low byte) 38400 baud
+    outb(port + 1, 0x00);   //                  (high byte)
+    outb(port + 3, 0x03);   // 8 bits, no parity, one stop bit
+    outb(port + 2, 0xC7);   // Enable FIFO, clear them, with 14 byte threshold
+    outb(port + 4, 0x0B);   // IRQs enabled, RTS/DSR set
+    outb(port + 4, 0x1E);   // Set in loopback mode, test the serial chip
+    outb(port + 0, 0xAE);   // Test serial chip (send byte 0xAE and check if it returns)
+
+    if (inb(port + 0) != 0xAE) return 1;
+    outb(port + 4, 0x0F);   // non-loopback, IRQs enabled, OUT#1 and OUT#2 bits enabled
+
+    return 0;
+}
+
+int serialTransmitEmpty(uint32_t port) {
+    return inb(port + 5) & 0x20;
+}
+
+int serialRecieved(uint32_t port) {
+    return inb(port + 5) & 0x01;
+}
+
+void serialWrite(uint32_t port, char c) {
+    while (serialTransmitEmpty(port) == 0);
+    outb(port, c);
+}
+
+void serialPrint(uint32_t port, char* s) {
+    while (*s != '\0') {
+        if (*s == '\n') serialWrite(port, '\r');
+        serialWrite(port, *s++);
+    }
+}
+
+char serialRead(uint32_t port) {
+    while (serialRecieved(port));
+    return inb(port);
+}
+
diff --git a/src/kernel.c b/src/kernel.c
index 1f86fbf..e0e0a80 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -19,6 +19,7 @@
 #include <sound/pcspk.h>
 #include <sound/notes.h>
 #include <ports/io.h>
+#include <ports/serial.h>
 #include <stdio.h> 
 #include <stdlib.h>
 #include <string.h>
@@ -56,6 +57,11 @@ void main() {
     setupTimer();
     setupRtc();
     setupKeyboard();
+    if (setupSerial(PORT_COM1) != 0) { printf("\e[1MFailed to initialize serial interface\e[8M\n"); }
+    else {
+        serialPrint(PORT_COM1, "\x1b[H\x1b[J");
+        serialPrint(PORT_COM1, "kern. \x1b[36m(Serial console)\x1b[0m\n\n");
+    }
 
     // Setup kernel malloc variables
     mallocNode_t* kernelMallocListHead = 0;
diff --git a/todo.txt b/todo.txt
index 87ef274..49637e8 100644
--- a/todo.txt
+++ b/todo.txt
@@ -15,12 +15,12 @@ Legend:
         - [ ] system root
         - [ ] arch/
         - [ ] lib/
-        - [ ] include/
+        - [x] include/
         - [ ] cross compiler setup
-    - [ ] libc - User space
-    - [ ] libk - Kernel libc
+    - [x] libc - User space
+    - [x] libk - Kernel libc
     - [ ] kernel
-        - [ ] use libk
+        - [x] use libk
         - [ ] makefile
         - [ ] probably a full rewrite
     - [ ] userspace