aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/init.c5
-rw-r--r--kernel/features/syscall.c9
-rw-r--r--libc/inc/assert.h11
-rw-r--r--libc/inc/cpu.h3
-rw-r--r--libc/inc/sys.h7
-rw-r--r--libgui/Makefile6
-rw-r--r--libgui/gui.c (renamed from kernel/features/gui.c)34
-rw-r--r--libgui/inc/gui.h (renamed from kernel/inc/gui.h)7
-rw-r--r--libgui/inc/psf.h (renamed from kernel/inc/psf.h)0
-rw-r--r--libgui/psf.c (renamed from kernel/features/psf.c)2
10 files changed, 61 insertions, 23 deletions
diff --git a/apps/init.c b/apps/init.c
index f087b41..89d446b 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -2,6 +2,7 @@
#include <conv.h>
#include <def.h>
+#include <gui.h>
#include <mem.h>
#include <print.h>
#include <sys.h>
@@ -12,8 +13,10 @@ void main(struct vbe *vbe)
print("Init loaded.\n");
printf("VBE: %dx%d\n", vbe->width, vbe->height);
- const u32 color[3] = { 0, 0xff, 0 };
+ const u32 color[3] = { 0, 0, 0 };
vesa_fill(vbe, color);
+ gui_init("/font/spleen-16x32.psfu");
+ gui_term_write(vbe, "hallo");
/* exec("/a"); */
/* exec("/b"); */
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/libc/inc/assert.h b/libc/inc/assert.h
index 91c4ccd..a553444 100644
--- a/libc/inc/assert.h
+++ b/libc/inc/assert.h
@@ -5,10 +5,21 @@
#include <print.h>
+#ifdef kernel
#define assert(exp) \
if (!(exp)) { \
printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp); \
__asm__ volatile("cli\nhlt"); \
}
+#elif defined(userspace)
+#include <sys.h>
+#define assert(exp) \
+ if (!(exp)) { \
+ printf("%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp); \
+ sys0(SYS_LOOP); \
+ }
+#else
+#error "No lib target specified. Please use -Dkernel or -Duserspace"
+#endif
#endif
diff --git a/libc/inc/cpu.h b/libc/inc/cpu.h
index 2d367cb..c25dc60 100644
--- a/libc/inc/cpu.h
+++ b/libc/inc/cpu.h
@@ -13,11 +13,14 @@ 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);
+
+#ifdef kernel
void cli();
void sti();
void hlt();
void idle();
void loop();
+#endif
static inline void spinlock(int *ptr)
{
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index 16d3c4f..d95b760 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -4,7 +4,9 @@
#ifndef SYS_H
#define SYS_H
-enum sys { SYS_LOOP, SYS_MALLOC, SYS_FREE, SYS_EXEC, SYS_EXIT };
+enum sys { SYS_LOOP, SYS_MALLOC, SYS_FREE, SYS_READ, SYS_WRITE, SYS_EXEC, SYS_EXIT };
+
+#if defined(userspace)
int sys0(enum sys num);
int sys1(enum sys num, int d1);
@@ -18,6 +20,8 @@ int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5);
*/
#define loop() sys0(SYS_LOOP)
+#define read(path) (void *)sys1(SYS_READ, (int)path)
+#define write(path, buf) sys2(SYS_WRITE, (int)path, buf)
#define exec(path) sys1(SYS_EXEC, (int)path)
#define exit() \
sys0(SYS_EXIT); \
@@ -25,3 +29,4 @@ int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5);
}
#endif
+#endif
diff --git a/libgui/Makefile b/libgui/Makefile
index 89bbb35..59254d4 100644
--- a/libgui/Makefile
+++ b/libgui/Makefile
@@ -1,6 +1,8 @@
# MIT License, Copyright (c) 2020 Marvin Borner
-COBJS = vesa.o
+COBJS = vesa.o \
+ psf.o \
+ gui.o
CC = ../cross/opt/bin/i686-elf-gcc
LD = ../cross/opt/bin/i686-elf-ld
OC = ../cross/opt/bin/i686-elf-ar
@@ -10,6 +12,8 @@ CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Iinc/ -I../libc/inc/ -Duserspace -fPIE
+all: libgui clean
+
%.o: %.c
@$(CC) -c $(CFLAGS) $< -o $@
diff --git a/kernel/features/gui.c b/libgui/gui.c
index d080cb1..460cf07 100644
--- a/kernel/features/gui.c
+++ b/libgui/gui.c
@@ -1,18 +1,20 @@
// MIT License, Copyright (c) 2020 Marvin Borner
// Some GUI functions
-#include <fs.h>
#include <gui.h>
#include <psf.h>
#include <str.h>
+#include <sys.h>
#include <vesa.h>
struct font *font;
-void gui_write_char(int x, int y, const u32 c[3], char ch)
+void gui_write_char(struct vbe *vbe, int x, int y, const u32 c[3], char ch)
{
- int pos = x * vbe_bpl + y * vbe_pitch;
- char *draw = (char *)&fb[pos];
+ int bpl = vbe->bpp >> 3;
+
+ int pos = x * bpl + y * vbe->pitch;
+ char *draw = (char *)&vbe->fb[pos];
u32 stride = font->char_size / font->height;
for (int cy = 0; cy < font->height; cy++) {
@@ -20,34 +22,34 @@ void gui_write_char(int x, int y, const u32 c[3], char ch)
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[bpl * cx] = c[2];
+ draw[bpl * cx + 1] = c[1];
+ draw[bpl * cx + 2] = c[0];
}
}
- draw += vbe_pitch;
+ draw += vbe->pitch;
}
}
-void gui_write(int x, int y, const u32 c[3], char *text)
+void gui_write(struct vbe *vbe, 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]);
+ gui_write_char(vbe, 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)
+void gui_term_write_char(struct vbe *vbe, char ch)
{
- if (x + font->width > vbe_width) {
+ if (x + font->width > vbe->width) {
x = 0;
y += font->height;
}
if (ch >= ' ' && ch <= '~') {
- gui_write_char(x, y, c, ch);
+ gui_write_char(vbe, x, y, c, ch);
x += font->width;
} else if (ch == '\n') {
x = 0;
@@ -55,14 +57,14 @@ void gui_term_write_char(char ch)
}
}
-void gui_term_write(char *text)
+void gui_term_write(struct vbe *vbe, char *text)
{
for (u32 i = 0; i < strlen(text); i++) {
- gui_term_write_char(text[i]);
+ gui_term_write_char(vbe, text[i]);
}
}
void gui_init(char *font_path)
{
- font = psf_parse(read_file(font_path));
+ font = psf_parse(read(font_path));
}
diff --git a/kernel/inc/gui.h b/libgui/inc/gui.h
index 760bcb9..52fe805 100644
--- a/kernel/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -5,6 +5,7 @@
#define GUI_H
#include <def.h>
+#include <vesa.h>
// Generalized font struct
struct font {
@@ -14,9 +15,9 @@ struct font {
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_write(struct vbe *vbe, int x, int y, const u32 c[3], char *text);
+void gui_term_write_char(struct vbe *vbe, char ch);
+void gui_term_write(struct vbe *vbe, char *text);
void gui_init(char *font_path);
#endif
diff --git a/kernel/inc/psf.h b/libgui/inc/psf.h
index 63a3d1e..63a3d1e 100644
--- a/kernel/inc/psf.h
+++ b/libgui/inc/psf.h
diff --git a/kernel/features/psf.c b/libgui/psf.c
index 004ed8f..56c673b 100644
--- a/kernel/features/psf.c
+++ b/libgui/psf.c
@@ -43,7 +43,7 @@ struct font *psf_parse(char *data)
width = ((struct psf2_header *)data)->width;
char_size = ((struct psf2_header *)data)->char_size;
} else {
- printf("Unknown font!\n");
+ print("Unknown font!\n");
return 0;
}