diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/kernel/graphics/vesa.c | 17 |
2 files changed, 13 insertions, 6 deletions
@@ -75,7 +75,7 @@ debug: @rm -f qemu.log @echo "Starting simulation" @echo "[SERIAL OUTPUT]" - @qemu-system-x86_64 -no-reboot -soundhw pcspk -M accel=kvm:tcg -vga vmware -serial stdio -d cpu_reset -D qemu.log -m 512M -cdrom ./build/melvix.iso + @qemu-system-x86_64 -no-reboot -soundhw pcspk -M accel=kvm:tcg -vga std -serial stdio -d cpu_reset -D qemu.log -m 512M -cdrom ./build/melvix.iso @echo "[END OF CONNECTION]" .PHONY: build clean cross test debug
\ No newline at end of file diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c index 3cce570..8f7a609 100644 --- a/src/kernel/graphics/vesa.c +++ b/src/kernel/graphics/vesa.c @@ -115,10 +115,7 @@ struct vbe_mode_info *vbe_get_mode_info(uint16_t mode) { void set_optimal_resolution() { uint16_t *video_modes = vbe_get_modes(); - uint16_t highest = 0x11; - vbe_width = 640; // Default if detecting fails - vbe_height = 480; - vbe_bpp = 1; + uint16_t highest = 0; for (uint16_t *mode = video_modes; *mode != 0xFFFF; mode++) { struct vbe_mode_info *mode_info = vbe_get_mode_info(*mode); @@ -143,7 +140,7 @@ void set_optimal_resolution() { vbe_width = mode_info->width; vbe_height = mode_info->height; vbe_pitch = mode_info->pitch; - vbe_bpp = mode_info->bpp / 8; + vbe_bpp = mode_info->bpp >> 3; fb = (unsigned char *) mode_info->framebuffer; kfree(mode_info); } @@ -151,6 +148,16 @@ void set_optimal_resolution() { } kfree(video_modes); + if (highest == 0) { + struct vbe_mode_info *mode_info = vbe_get_mode_info(0x010e); + highest = 0x010e; + vbe_width = mode_info->width; + vbe_height = mode_info->height; + vbe_pitch = mode_info->pitch; + vbe_bpp = mode_info->bpp >> 3; + fb = (unsigned char *) mode_info->framebuffer; + } + serial_write("Using mode: ("); serial_write_hex(highest); serial_write(") "); |