From 04104fc051d44f4f9b3328f29b4be91fa4060f34 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 28 Apr 2021 23:12:17 +0200
Subject: Started conversion to Grub (#17)

Yes, the CI won't like this.
---
 kernel/drivers/cpu.c | 20 +++++++++++---------
 kernel/drivers/fb.c  |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'kernel/drivers')

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;
-- 
cgit v1.2.3