MUCH work in libc

Also cleaned up some syscalls etc

2 files changed, 8 insertions, 67 deletions

diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index b92f171..8213c12 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -6,32 +6,11 @@
 #include <kernel/memory/alloc.h>
 #include <kernel/memory/paging.h>
 
-void switch_to_vga()
+void vbe_error()
 {
-	log("Force switch to VGA!");
-	uint16_t *terminal_buffer = (uint16_t *)0xB8000;
-	char *error = "Melvix does not support this graphics hardware!";
-	for (size_t i = 0; i < strlen(error); i++)
-		terminal_buffer[24 * 80 + i] = (uint16_t)error[i] | (uint16_t)0x700;
-	panic("No VESA support!");
-}
-
-struct edid_data get_edid()
-{
-	regs16_t regs;
-	regs.ax = 0x4F15;
-	regs.bx = 0x1; // BL
-	regs.es = 0;
-	regs.di = 0x7E00;
-	v86(0x10, &regs);
-
-	if ((regs.ax & 0xFF) != 0x4F) {
-		warn("No EDID available!");
-	}
-
-	struct edid_data *edid = (struct edid_data *)0x7E00;
-
-	return *edid;
+	log("Error in VESA detection script!");
+	warn(RED "Melvix can't work without VESA Support!" RES);
+	halt_loop();
 }
 
 void vbe_set_mode(unsigned short mode)
@@ -43,7 +22,7 @@ void vbe_set_mode(unsigned short mode)
 	v86(0x10, &regs);
 
 	if (regs.ax != 0x004F)
-		switch_to_vga();
+		vbe_error();
 }
 
 uint16_t *vbe_get_modes()
@@ -62,7 +41,7 @@ uint16_t *vbe_get_modes()
 	struct vbe_info *info = (struct vbe_info *)info_address;
 
 	if (regs.ax != 0x004F || strcmp(info->signature, "VESA") != 0)
-		switch_to_vga();
+		vbe_error();
 
 	// Get number of modes
 	uint16_t *mode_ptr = (uint16_t *)info->video_modes;
@@ -178,7 +157,7 @@ void set_optimal_resolution()
 
 		// Everything else failed :(
 		if (highest == 0)
-			switch_to_vga();
+			vbe_error();
 	} else {
 		log("Mode detection succeeded");
 	}
@@ -248,6 +227,7 @@ void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3]
 
 void vesa_clear()
 {
+	log("%dx%dx%d at %x", vbe_width, vbe_height, vbe_bpl << 3, fb);
 	vesa_draw_rectangle(0, 0, vbe_width - 1, vbe_height - 1, terminal_background);
 	terminal_x = 0;
 	terminal_y = 0;
diff --git a/src/kernel/graphics/vesa.h b/src/kernel/graphics/vesa.h
index bbe5aaf..cdbd45a 100644
--- a/src/kernel/graphics/vesa.h
+++ b/src/kernel/graphics/vesa.h
@@ -4,33 +4,6 @@
 #include <stdint.h>
 #include <kernel/system.h>
 
-struct edid_data {
-	uint8_t padding[8];
-	uint16_t manufacture_id;
-	uint16_t product_code;
-	uint32_t serial_number;
-	uint8_t manufacture_week;
-	uint8_t manufacture_year;
-	uint8_t edid_version;
-	uint8_t edid_revision;
-	uint8_t video_input_type;
-	uint8_t max_horizontal_size;
-	uint8_t max_vertical_size;
-	uint8_t gamma_factor;
-	uint8_t dpms_flags; // power management features
-	uint8_t chroma_information[10];
-	uint8_t timings_1;
-	uint8_t timings_2;
-	uint8_t reserved_timings;
-	uint32_t timing_identification[8];
-	uint8_t timing_description_1[18];
-	uint8_t timing_description_2[18];
-	uint8_t timing_description_3[18];
-	uint8_t timing_description_4[18];
-	uint8_t unused;
-	uint8_t checksum;
-};
-
 /**
  * The CPUs response to the 0x4F00 call
  * Used to receive the supported video modes
@@ -103,18 +76,6 @@ struct vbe_mode_info {
 } __attribute__((packed));
 
 /**
- * Get the monitors EDID information
- * TODO: Add EDID/VBE resolution mode verification
- * @return The EDID information
- */
-struct edid_data get_edid();
-
-/**
- * Forces switch to VGA, displays an error and halts the CPU
- */
-void switch_to_vga();
-
-/**
  * Set the video mode to a specified resolution using
  * a video mode code
  * @param mode The requested video mode code from 0x4F00 call