aboutsummaryrefslogtreecommitdiff
path: root/kernel/drivers
diff options
context:
space:
mode:
authorMarvin Borner2021-04-28 23:12:17 +0200
committerMarvin Borner2021-04-28 23:12:17 +0200
commit04104fc051d44f4f9b3328f29b4be91fa4060f34 (patch)
tree1677c1739c44bd7c7e8722ea00ca3c6b45158c85 /kernel/drivers
parent895a58b1b57a0ae8028576404a90f12e0133cf5f (diff)
Started conversion to Grub (#17)
Yes, the CI won't like this.
Diffstat (limited to 'kernel/drivers')
-rw-r--r--kernel/drivers/cpu.c20
-rw-r--r--kernel/drivers/fb.c4
2 files changed, 13 insertions, 11 deletions
diff --git a/kernel/drivers/cpu.c b/kernel/drivers/cpu.c
index 62b0328..2c86008 100644
--- a/kernel/drivers/cpu.c
+++ b/kernel/drivers/cpu.c
@@ -91,17 +91,19 @@ void fpu_restore(void)
__asm__ volatile("fxrstor (%0)" ::"r"(fpu_state));
}
-PROTECTED extern u32 tss_entry;
void tss_set_stack(u32 ss, u32 esp)
{
- assert(tss_entry && ss && esp);
- struct {
- u32 prev;
- u32 esp0;
- u32 ss0;
- } *tss = (void *)tss_entry;
- tss->esp0 = esp;
- tss->ss0 = ss;
+ UNUSED(ss);
+ UNUSED(esp);
+ return;
+ /* assert(tss_entry && ss && esp); */
+ /* struct { */
+ /* u32 prev; */
+ /* u32 esp0; */
+ /* u32 ss0; */
+ /* } *tss = (void *)tss_entry; */
+ /* tss->esp0 = esp; */
+ /* tss->ss0 = ss; */
}
CLEAR static struct cpuid cpuid(u32 code)
diff --git a/kernel/drivers/fb.c b/kernel/drivers/fb.c
index f62c486..7c02919 100644
--- a/kernel/drivers/fb.c
+++ b/kernel/drivers/fb.c
@@ -60,9 +60,9 @@ void fb_map_buffer(struct page_dir *dir, struct vid_info *boot)
memory_map_identity(dir, memory_range_around((u32)vbe->fb, size), MEMORY_USER);
}
-CLEAR void fb_install(struct vid_info *boot)
+CLEAR void fb_install(void)
{
- info = boot;
+ //info = boot;
struct io_dev *dev = zalloc(sizeof(*dev));
dev->control = fb_ioctl;