aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/init.c3
-rw-r--r--kernel/Makefile3
-rw-r--r--kernel/drivers/keyboard.c3
-rw-r--r--kernel/drivers/vesa.c42
-rw-r--r--kernel/features/proc.c4
-rw-r--r--kernel/features/psf.c1
-rw-r--r--kernel/inc/boot.h4
-rw-r--r--kernel/inc/vesa.h57
-rw-r--r--kernel/main.c9
-rw-r--r--libgui/inc/vesa.h15
-rw-r--r--libgui/vesa.c36
11 files changed, 27 insertions, 150 deletions
diff --git a/apps/init.c b/apps/init.c
index 0ae4fd9..f087b41 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -12,6 +12,9 @@ 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 };
+ vesa_fill(vbe, color);
+
/* exec("/a"); */
/* exec("/b"); */
exit();
diff --git a/kernel/Makefile b/kernel/Makefile
index 8544be4..50e3ab8 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -1,15 +1,12 @@
# MIT License, Copyright (c) 2020 Marvin Borner
COBJS = main.o \
- drivers/vesa.o \
drivers/interrupts.o \
drivers/interrupts_asm.o \
drivers/keyboard.o \
drivers/ide.o \
drivers/timer.o \
features/fs.o \
- features/psf.o \
- features/gui.o \
features/load.o \
features/proc.o \
features/proc_asm.o \
diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c
index d9ac5bb..16809b6 100644
--- a/kernel/drivers/keyboard.c
+++ b/kernel/drivers/keyboard.c
@@ -2,7 +2,6 @@
#include <cpu.h>
#include <def.h>
-#include <gui.h>
#include <interrupts.h>
char keymap[128];
@@ -16,7 +15,7 @@ void keyboard_handler()
return;
if ((scan_code & 0x80) == 0) { // PRESS
- gui_term_write_char(keymap[scan_code]);
+ /* gui_term_write_char(keymap[scan_code]); */
}
}
diff --git a/kernel/drivers/vesa.c b/kernel/drivers/vesa.c
deleted file mode 100644
index 2d3e107..0000000
--- a/kernel/drivers/vesa.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <def.h>
-#include <vesa.h>
-
-void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const u32 color[3])
-{
- int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
- u8 *draw = &fb[pos1];
- for (int i = 0; i <= y2 - y1; i++) {
- for (int j = 0; j <= x2 - x1; j++) {
- draw[vbe_bpl * j] = color[2];
- draw[vbe_bpl * j + 1] = color[1];
- draw[vbe_bpl * j + 2] = color[0];
- }
- draw += vbe_pitch;
- }
-}
-
-void vesa_set_pixel(u16 x, u16 y, const u32 color[3])
-{
- u8 pos = x * vbe_bpl + y * vbe_pitch;
- u8 *draw = &fb[pos];
- draw[pos] = (char)color[2];
- draw[pos + 1] = (char)color[1];
- draw[pos + 2] = (char)color[0];
-}
-
-void vesa_fill(const u32 color[3])
-{
- vesa_draw_rectangle(0, 0, vbe->width - 1, vbe->height - 1, color);
-}
-
-void vesa_init(struct vbe *info)
-{
- vbe = info;
- vbe_height = vbe->height;
- vbe_width = vbe->width;
- vbe_bpl = vbe->bpp >> 3;
- vbe_pitch = vbe->pitch;
- fb = (u8 *)vbe->framebuffer;
-}
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 76ec16e..f59ff32 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -1,6 +1,7 @@
// MIT License, Copyright (c) 2020 Marvin Borner
#include <assert.h>
+#include <boot.h>
#include <cpu.h>
#include <interrupts.h>
#include <load.h>
@@ -9,7 +10,6 @@
#include <proc.h>
#include <str.h>
#include <timer.h>
-#include <vesa.h>
u32 pid = 0;
struct proc *root;
@@ -109,7 +109,7 @@ void proc_init()
_eip = root->regs.eip;
_esp = root->regs.esp;
- ((u32 *)_esp)[1] = (u32)vbe; // First argument
+ ((u32 *)_esp)[1] = (u32)boot_passed->vbe; // First argument
proc_jump_userspace();
}
diff --git a/kernel/features/psf.c b/kernel/features/psf.c
index adf2aa2..004ed8f 100644
--- a/kernel/features/psf.c
+++ b/kernel/features/psf.c
@@ -6,7 +6,6 @@
#include <mem.h>
#include <print.h>
#include <psf.h>
-#include <vesa.h>
// Verifies the PSF magics
// Returns the PSF version or 0
diff --git a/kernel/inc/boot.h b/kernel/inc/boot.h
index 1a41c32..c1d9288 100644
--- a/kernel/inc/boot.h
+++ b/kernel/inc/boot.h
@@ -2,9 +2,9 @@
// This file specifies the structs passed by the bootloader
#include <def.h>
-#include <vesa.h>
+struct vid_info *boot_passed;
struct vid_info {
u32 mode;
- struct vbe *info;
+ u32 *vbe;
};
diff --git a/kernel/inc/vesa.h b/kernel/inc/vesa.h
deleted file mode 100644
index e34cdc0..0000000
--- a/kernel/inc/vesa.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#ifndef VBE_H
-#define VBE_H
-
-#include <def.h>
-
-struct vbe {
- u16 attributes;
- u8 window_a;
- u8 window_b;
- u16 granularity;
- u16 window_size;
- u16 segment_a;
- u16 segment_b;
- u32 win_func_ptr;
- u16 pitch;
- u16 width;
- u16 height;
- u8 w_char;
- u8 y_char;
- u8 planes;
- u8 bpp;
- u8 banks;
- u8 memory_model;
- u8 bank_size;
- u8 image_pages;
- u8 reserved0;
-
- u8 red_mask;
- u8 red_position;
- u8 green_mask;
- u8 green_position;
- u8 blue_mask;
- u8 blue_position;
- u8 reserved_mask;
- u8 reserved_position;
- u8 direct_color_attributes;
-
- u32 framebuffer;
- u32 off_screen_mem_off;
- u16 off_screen_mem_size;
- u8 reserved1[206];
-};
-
-struct vbe *vbe;
-int vbe_width;
-int vbe_height;
-int vbe_bpl;
-int vbe_pitch;
-u8 *fb;
-
-void vesa_fill(const u32 color[3]);
-void vesa_set_pixel(u16 x, u16 y, const u32 color[3]);
-void vesa_init(struct vbe *info);
-
-#endif
diff --git a/kernel/main.c b/kernel/main.c
index 85c1103..d431cf6 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -5,7 +5,6 @@
#include <cpu.h>
#include <def.h>
#include <fs.h>
-#include <gui.h>
#include <interrupts.h>
#include <keyboard.h>
#include <load.h>
@@ -20,10 +19,7 @@ void kernel_main(struct vid_info *vid_info)
HEAP = 0x00200000;
HEAP_START = HEAP; // For malloc function
- // Initialize VESA video
- vesa_init(vid_info->info);
- u32 terminal_background[3] = { 0, 0, 0 };
- vesa_fill(terminal_background);
+ boot_passed = vid_info;
// Serial connection
serial_install();
@@ -38,9 +34,6 @@ void kernel_main(struct vid_info *vid_info)
sti();
ls_root();
- gui_init(FONT_PATH);
-
- gui_term_write("Wake up, " USERNAME "...\n");
syscall_init();
proc_init();
diff --git a/libgui/inc/vesa.h b/libgui/inc/vesa.h
index e34cdc0..bd758a5 100644
--- a/libgui/inc/vesa.h
+++ b/libgui/inc/vesa.h
@@ -37,21 +37,14 @@ struct vbe {
u8 reserved_position;
u8 direct_color_attributes;
- u32 framebuffer;
+ u8 *fb;
u32 off_screen_mem_off;
u16 off_screen_mem_size;
u8 reserved1[206];
};
-struct vbe *vbe;
-int vbe_width;
-int vbe_height;
-int vbe_bpl;
-int vbe_pitch;
-u8 *fb;
-
-void vesa_fill(const u32 color[3]);
-void vesa_set_pixel(u16 x, u16 y, const u32 color[3]);
-void vesa_init(struct vbe *info);
+void vesa_draw_rectangle(struct vbe *vbe, int x1, int y1, int x2, int y2, const u32 color[3]);
+void vesa_fill(struct vbe *vbe, const u32 color[3]);
+void vesa_set_pixel(struct vbe *vbe, u16 x, u16 y, const u32 color[3]);
#endif
diff --git a/libgui/vesa.c b/libgui/vesa.c
index 2d3e107..df2c692 100644
--- a/libgui/vesa.c
+++ b/libgui/vesa.c
@@ -3,40 +3,32 @@
#include <def.h>
#include <vesa.h>
-void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const u32 color[3])
+void vesa_draw_rectangle(struct vbe *vbe, int x1, int y1, int x2, int y2, const u32 color[3])
{
- int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
- u8 *draw = &fb[pos1];
+ int bpl = vbe->bpp >> 3;
+
+ int pos1 = x1 * bpl + y1 * vbe->pitch;
+ u8 *draw = &vbe->fb[pos1];
for (int i = 0; i <= y2 - y1; i++) {
for (int j = 0; j <= x2 - x1; j++) {
- draw[vbe_bpl * j] = color[2];
- draw[vbe_bpl * j + 1] = color[1];
- draw[vbe_bpl * j + 2] = color[0];
+ draw[bpl * j] = color[2];
+ draw[bpl * j + 1] = color[1];
+ draw[bpl * j + 2] = color[0];
}
- draw += vbe_pitch;
+ draw += vbe->pitch;
}
}
-void vesa_set_pixel(u16 x, u16 y, const u32 color[3])
+void vesa_set_pixel(struct vbe *vbe, u16 x, u16 y, const u32 color[3])
{
- u8 pos = x * vbe_bpl + y * vbe_pitch;
- u8 *draw = &fb[pos];
+ u8 pos = x * (vbe->bpp >> 3) + y * vbe->pitch;
+ u8 *draw = &vbe->fb[pos];
draw[pos] = (char)color[2];
draw[pos + 1] = (char)color[1];
draw[pos + 2] = (char)color[0];
}
-void vesa_fill(const u32 color[3])
-{
- vesa_draw_rectangle(0, 0, vbe->width - 1, vbe->height - 1, color);
-}
-
-void vesa_init(struct vbe *info)
+void vesa_fill(struct vbe *vbe, const u32 color[3])
{
- vbe = info;
- vbe_height = vbe->height;
- vbe_width = vbe->width;
- vbe_bpl = vbe->bpp >> 3;
- vbe_pitch = vbe->pitch;
- fb = (u8 *)vbe->framebuffer;
+ vesa_draw_rectangle(vbe, 0, 0, vbe->width - 1, vbe->height - 1, color);
}