From e7d88df7a5a7e11677b68303a0d05455bf9a60d6 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 11 Dec 2019 21:22:15 +0100
Subject: Some user-side graphics

---
 src/kernel/graphics/font.c                    |  3 ++-
 src/kernel/graphics/vesa.c                    |  6 +++---
 src/kernel/syscall/actions/sys_get_pointers.c | 18 ++++++++++++++++++
 src/kernel/syscall/syscall.c                  |  5 +++--
 src/kernel/syscall/syscall.h                  |  2 ++
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 src/kernel/syscall/actions/sys_get_pointers.c

(limited to 'src/kernel')

diff --git a/src/kernel/graphics/font.c b/src/kernel/graphics/font.c
index 147eaff..3f55d01 100644
--- a/src/kernel/graphics/font.c
+++ b/src/kernel/graphics/font.c
@@ -10,7 +10,8 @@
 
 void font_install()
 {
-    font = (struct font *) kmalloc(100000);; // High quality shit
+    font = (struct font *) paging_alloc_pages(25);; // High quality shit
+    paging_set_user((uint32_t) font, 25);
 
     uint8_t boot_drive_id = (uint8_t) (*((uint8_t *) 0x9000));
     if (boot_drive_id != 0xE0) {
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index d673bde..c74b34b 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -190,11 +190,11 @@ void set_optimal_resolution()
 
     uint32_t fb_size = vbe_width * vbe_height * vbe_bpl;
     cursor_buffer = kmalloc(fb_size);
+    paging_set_user((uint32_t) fb, fb_size / 4096);
     for (uint32_t z = 0; z < fb_size; z += 4096) {
-        paging_map((uint32_t) fb + z, (uint32_t) fb + z, PT_PRESENT | PT_RW | PT_USED);
+        paging_map((uint32_t) fb + z, (uint32_t) fb + z, PT_PRESENT | PT_RW | PT_USED | PT_ALL_PRIV);
         paging_map((uint32_t) cursor_buffer + z, (uint32_t) cursor_buffer + z, PT_PRESENT | PT_RW | PT_USED);
     }
-    paging_set_user((uint32_t) fb, fb_size);
     serial_write_hex((int) &fb);
     serial_write("\n");
 
@@ -399,4 +399,4 @@ void vesa_set_color(uint32_t color)
 {
     vesa_convert_color(terminal_color, color);
     vesa_convert_color(terminal_background, default_background_color);
-}
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/actions/sys_get_pointers.c b/src/kernel/syscall/actions/sys_get_pointers.c
new file mode 100644
index 0000000..adbdd36
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_get_pointers.c
@@ -0,0 +1,18 @@
+#include <stdint.h>
+#include <kernel/graphics/vesa.h>
+#include <kernel/graphics/font.h>
+#include <kernel/paging/paging.h>
+
+struct userspace_pointers {
+    unsigned char *fb;
+    struct font *font;
+};
+
+uint32_t sys_get_pointers()
+{
+    struct userspace_pointers *pointers = (struct userspace_pointers *) paging_alloc_pages(1);
+    pointers->fb = fb;
+    pointers->font = font;
+    paging_set_user((uint32_t) pointers, 1);
+    return (uint32_t) pointers;
+}
\ No newline at end of file
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index 3a1b011..24f2445 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -13,8 +13,9 @@ uint32_t (*syscalls[])() = {
         [2] = sys_read,
         [3] = sys_writec,
         [4] = sys_readc,
-        [5] = sys_paging_alloc,
-        [6] = sys_paging_free
+        [5] = sys_get_pointers,
+        [6] = sys_paging_alloc,
+        [7] = sys_paging_free
 };
 
 void syscall_handler(struct regs *r)
diff --git a/src/kernel/syscall/syscall.h b/src/kernel/syscall/syscall.h
index a037d7f..378b5e3 100644
--- a/src/kernel/syscall/syscall.h
+++ b/src/kernel/syscall/syscall.h
@@ -13,6 +13,8 @@ uint32_t sys_read(char *buf);
 
 uint32_t sys_readc(char *ch);
 
+uint32_t sys_get_pointers();
+
 uint32_t sys_paging_alloc(uint32_t count);
 
 uint32_t sys_paging_free(uint32_t virt, uint32_t count);
-- 
cgit v1.2.3