8 files changed, 156 insertions, 6 deletions
diff --git a/lib/Makefile b/lib/Makefile
index ad430d6..4190ec8 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,10 +1,13 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
+# TODO: Remove serial and cpu from libc?
 COBJS = str.o \
 	mem.o \
 	math.o \
 	conv.o \
-	print.o
+	print.o \
+	serial.o \
+	cpu.o
 CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-ar
diff --git a/lib/cpu.c b/lib/cpu.c
new file mode 100644
index 0000000..5c27c51
--- /dev/null
+++ b/lib/cpu.c
@@ -0,0 +1,69 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// This file is a wrapper around some CPU asm calls
+
+#include <def.h>
+
+u8 inb(u16 port)
+{
+	u8 value;
+	__asm__ volatile("inb %1, %0" : "=a"(value) : "Nd"(port));
+	return value;
+}
+
+u16 inw(u16 port)
+{
+	u16 value;
+	__asm__ volatile("inw %1, %0" : "=a"(value) : "Nd"(port));
+	return value;
+}
+
+u32 inl(u16 port)
+{
+	u32 value;
+	__asm__ volatile("inl %1, %0" : "=a"(value) : "Nd"(port));
+	return value;
+}
+
+void insl(u16 port, void *addr, int n)
+{
+	__asm__ volatile("cld; rep insl"
+			 : "=D"(addr), "=c"(n)
+			 : "d"(port), "0"(addr), "1"(n)
+			 : "memory", "cc");
+}
+
+void outb(u16 port, u8 data)
+{
+	__asm__ volatile("outb %0, %1" ::"a"(data), "Nd"(port));
+}
+
+void outw(u16 port, u16 data)
+{
+	__asm__ volatile("outw %0, %1" ::"a"(data), "Nd"(port));
+}
+
+void outl(u16 port, u32 data)
+{
+	__asm__ volatile("outl %0, %1" ::"a"(data), "Nd"(port));
+}
+
+void cli()
+{
+	__asm__ volatile("cli");
+}
+
+void sti()
+{
+	__asm__ volatile("sti");
+}
+
+void hlt()
+{
+	__asm__ volatile("hlt");
+}
+
+void idle()
+{
+	while (1)
+		hlt();
+}
diff --git a/lib/inc/cpu.h b/lib/inc/cpu.h
new file mode 100644
index 0000000..eb09291
--- /dev/null
+++ b/lib/inc/cpu.h
@@ -0,0 +1,29 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef CPU_H
+#define CPU_H
+
+#include <def.h>
+
+u8 inb(u16 port);
+u16 inw(u16 port);
+u32 inl(u16 port);
+void insl(u16 port, void *addr, int n);
+
+void outb(u16 port, u8 data);
+void outw(u16 port, u16 data);
+void outl(u16 port, u32 data);
+void cli();
+void sti();
+void hlt();
+void idle();
+
+static inline void spinlock(int *ptr)
+{
+	int prev;
+	do
+		__asm__ volatile("lock xchgl %0,%1" : "=a"(prev) : "m"(*ptr), "a"(1));
+	while (prev);
+}
+
+#endif
diff --git a/lib/inc/mem.h b/lib/inc/mem.h
index e700e42..e2d574f 100644
--- a/lib/inc/mem.h
+++ b/lib/inc/mem.h
@@ -5,12 +5,13 @@
 
 #include <def.h>
 
-u32 HEAP;
-u32 HEAP_START;
-
 #define malloc(n) ((void *)((HEAP += n) - n)) // TODO: Implement real/better malloc/free
 #define free(x)
 
+// TODO: Use malloc as syscall
+u32 HEAP;
+u32 HEAP_START;
+
 void *memcpy(void *dst, const void *src, u32 n);
 void *memset(void *dst, int c, u32 n);
 int memcmp(const void *s1, const void *s2, u32 n);
diff --git a/lib/inc/print.h b/lib/inc/print.h
index 925a5bd..04668b2 100644
--- a/lib/inc/print.h
+++ b/lib/inc/print.h
@@ -9,5 +9,6 @@
 int printf(const char *format, ...);
 int vprintf(const char *format, va_list ap);
 int vsprintf(char *str, const char *format, va_list ap);
+int print(const char *str);
 
 #endif
diff --git a/lib/inc/serial.h b/lib/inc/serial.h
new file mode 100644
index 0000000..6511952
--- /dev/null
+++ b/lib/inc/serial.h
@@ -0,0 +1,9 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef SERIAL_H
+#define SERIAL_H
+
+void serial_install();
+void serial_print(const char *data);
+
+#endif
diff --git a/lib/print.c b/lib/print.c
index 738e42f..1cbed69 100644
--- a/lib/print.c
+++ b/lib/print.c
@@ -2,7 +2,7 @@
 #include <conv.h>
 #include <def.h>
 #include <mem.h>
-/* #include <serial.h> */
+#include <serial.h>
 #include <str.h>
 
 static void append(char *dest, char *src, int index)
@@ -80,7 +80,7 @@ int vprintf(const char *format, va_list ap)
 	char buf[1024];
 	memset(buf, 0, 1024);
 	int len = vsprintf(buf, format, ap);
-	/* serial_print(buf); // TODO: Remove temporary serial print */
+	serial_print(buf); // TODO: Remove temporary serial print
 	return len;
 }
 
@@ -94,3 +94,9 @@ int printf(const char *format, ...)
 
 	return len;
 }
+
+int print(const char *str)
+{
+	serial_print(str);
+	return strlen(str);
+}
diff --git a/lib/serial.c b/lib/serial.c
new file mode 100644
index 0000000..dcee4dd
--- /dev/null
+++ b/lib/serial.c
@@ -0,0 +1,32 @@
+#include <cpu.h>
+#include <def.h>
+#include <str.h>
+
+void serial_install()
+{
+	outb(0x3f8 + 1, 0x00);
+	outb(0x3f8 + 3, 0x80);
+	outb(0x3f8 + 0, 0x03);
+	outb(0x3f8 + 1, 0x00);
+	outb(0x3f8 + 3, 0x03);
+	outb(0x3f8 + 2, 0xC7);
+	outb(0x3f8 + 4, 0x0B);
+}
+
+int is_transmit_empty()
+{
+	return inb(0x3f8 + 5) & 0x20;
+}
+
+void serial_put(char ch)
+{
+	while (is_transmit_empty() == 0)
+		;
+	outb(0x3f8, (u8)ch);
+}
+
+void serial_print(const char *data)
+{
+	for (u32 i = 0; i < strlen(data); i++)
+		serial_put(data[i]);
+}