Added psf/gui to libgui

...and some other things

5 files changed, 9 insertions, 195 deletions

diff --git a/kernel/features/gui.c b/kernel/features/gui.c
deleted file mode 100644
index d080cb1..0000000
--- a/kernel/features/gui.c
+++ /dev/null
@@ -1,68 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-// Some GUI functions
-
-#include <fs.h>
-#include <gui.h>
-#include <psf.h>
-#include <str.h>
-#include <vesa.h>
-
-struct font *font;
-
-void gui_write_char(int x, int y, const u32 c[3], char ch)
-{
-	int pos = x * vbe_bpl + y * vbe_pitch;
-	char *draw = (char *)&fb[pos];
-
-	u32 stride = font->char_size / font->height;
-	for (int cy = 0; cy < font->height; cy++) {
-		for (int cx = 0; cx < font->width; cx++) {
-			u8 bits = font->chars[ch * font->char_size + cy * stride + cx / 8];
-			u8 bit = bits >> (7 - cx % 8) & 1;
-			if (bit) {
-				draw[vbe_bpl * cx] = c[2];
-				draw[vbe_bpl * cx + 1] = c[1];
-				draw[vbe_bpl * cx + 2] = c[0];
-			}
-		}
-		draw += vbe_pitch;
-	}
-}
-
-void gui_write(int x, int y, const u32 c[3], char *text)
-{
-	for (u32 i = 0; i < strlen(text); i++) {
-		gui_write_char(x + i * font->width, y, c, text[i]);
-	}
-}
-
-// Abstraction
-int x, y = 0;
-const u32 c[3] = { 0xff, 0xff, 0xff };
-void gui_term_write_char(char ch)
-{
-	if (x + font->width > vbe_width) {
-		x = 0;
-		y += font->height;
-	}
-
-	if (ch >= ' ' && ch <= '~') {
-		gui_write_char(x, y, c, ch);
-		x += font->width;
-	} else if (ch == '\n') {
-		x = 0;
-		y += font->height;
-	}
-}
-
-void gui_term_write(char *text)
-{
-	for (u32 i = 0; i < strlen(text); i++) {
-		gui_term_write_char(text[i]);
-	}
-}
-
-void gui_init(char *font_path)
-{
-	font = psf_parse(read_file(font_path));
-}
diff --git a/kernel/features/psf.c b/kernel/features/psf.c
deleted file mode 100644
index 004ed8f..0000000
--- a/kernel/features/psf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-// PSF parser
-
-#include <def.h>
-#include <gui.h>
-#include <mem.h>
-#include <print.h>
-#include <psf.h>
-
-// Verifies the PSF magics
-// Returns the PSF version or 0
-int psf_verify(char *data)
-{
-	struct psf1_header *header1 = (struct psf1_header *)data;
-	struct psf2_header *header2 = (struct psf2_header *)data;
-
-	if (header1->magic[0] == PSF1_MAGIC_0 && header1->magic[1] == PSF1_MAGIC_1)
-		return 1;
-	else if (header2->magic[0] == PSF2_MAGIC_0 && header2->magic[1] == PSF2_MAGIC_1 &&
-		 header2->magic[2] == PSF2_MAGIC_2 && header2->magic[3] == PSF2_MAGIC_3)
-		return 2;
-	else
-		return 0;
-}
-
-struct font *psf_parse(char *data)
-{
-	int version = psf_verify(data);
-
-	char *chars;
-	int height;
-	int width;
-	int char_size;
-
-	if (version == 1) {
-		chars = data + sizeof(struct psf1_header);
-		height = ((struct psf1_header *)data)->char_size;
-		width = 8;
-		char_size = ((struct psf1_header *)data)->char_size;
-	} else if (version == 2) {
-		chars = data + ((struct psf2_header *)data)->size;
-		height = ((struct psf2_header *)data)->height;
-		width = ((struct psf2_header *)data)->width;
-		char_size = ((struct psf2_header *)data)->char_size;
-	} else {
-		printf("Unknown font!\n");
-		return 0;
-	}
-
-	struct font *font = malloc(sizeof(*font));
-	font->chars = chars;
-	font->height = height;
-	font->width = width;
-	font->char_size = char_size;
-
-	return font;
-}
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index fd57f3b..b486deb 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -1,6 +1,7 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 
 #include <cpu.h>
+#include <fs.h>
 #include <interrupts.h>
 #include <load.h>
 #include <mem.h>
@@ -27,6 +28,14 @@ void syscall_handler(struct regs *r)
 		free(r->eax);
 		break;
 	}
+	case SYS_READ: {
+		r->eax = (u32)read_file((char *)r->ebx);
+		break;
+	}
+	case SYS_WRITE: {
+		// TODO: Write ext2 support
+		break;
+	}
 	case SYS_EXEC: {
 		char *path = (char *)r->ebx;
 		struct proc *proc = proc_make();
diff --git a/kernel/inc/gui.h b/kernel/inc/gui.h
deleted file mode 100644
index 760bcb9..0000000
--- a/kernel/inc/gui.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-// Some GUI functions
-
-#ifndef GUI_H
-#define GUI_H
-
-#include <def.h>
-
-// Generalized font struct
-struct font {
-	char *chars;
-	int height;
-	int width;
-	int char_size;
-};
-
-void gui_write(int x, int y, const u32 c[3], char *text);
-void gui_term_write_char(char ch);
-void gui_term_write(char *text);
-void gui_init(char *font_path);
-
-#endif
diff --git a/kernel/inc/psf.h b/kernel/inc/psf.h
deleted file mode 100644
index 63a3d1e..0000000
--- a/kernel/inc/psf.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-// PSF parser
-
-#ifndef PSF_H
-#define PSF_H
-
-#include <def.h>
-
-/**
- * PSF version 1
- */
-
-#define PSF1_MAGIC_0 0x36
-#define PSF1_MAGIC_1 0x04
-#define PSF1_MODE_256 0
-#define PSF1_MODE_512 1
-#define PSF1_MODE_256_UNICODE 2
-#define PSF1_MODE_512_UNICODE 3
-
-struct psf1_header {
-	u8 magic[2];
-	u8 mode;
-	u8 char_size;
-};
-
-/**
- * PSF version 2
- */
-
-#define PSF2_MAGIC_0 0x72
-#define PSF2_MAGIC_1 0xb5
-#define PSF2_MAGIC_2 0x4a
-#define PSF2_MAGIC_3 0x86
-
-struct psf2_header {
-	u8 magic[4];
-	u32 version;
-	u32 size;
-	u32 flags;
-	u32 glyph_count;
-	u32 char_size;
-	u32 height;
-	u32 width;
-};
-
-struct font *psf_parse(char *data);
-
-#endif