From 544acef0986977ef9d3a05d87bb9f55163b1280a Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 9 Aug 2020 17:27:08 +0200
Subject: Temporary cpu and serial drivers in libc

---
 lib/inc/cpu.h    | 29 +++++++++++++++++++++++++++++
 lib/inc/mem.h    |  7 ++++---
 lib/inc/print.h  |  1 +
 lib/inc/serial.h |  9 +++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 lib/inc/cpu.h
 create mode 100644 lib/inc/serial.h

(limited to 'lib/inc')

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
-- 
cgit v1.2.3