Skip to content
Snippets Groups Projects
Verified Commit 5de0a907 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Fix vga=no mode

parent 79a32a3b
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,7 @@ use core::{ ...@@ -19,6 +19,7 @@ use core::{
slice, slice,
}; };
use linked_list_allocator::LockedHeap; use linked_list_allocator::LockedHeap;
use log::error;
use spin::Mutex; use spin::Mutex;
use self::disk::DiskBios; use self::disk::DiskBios;
...@@ -115,7 +116,8 @@ pub unsafe extern "C" fn kstart( ...@@ -115,7 +116,8 @@ pub unsafe extern "C" fn kstart(
// Set logger // Set logger
LOGGER.init(); LOGGER.init();
let (heap_start, heap_size) = memory_map(thunk15).expect("no memory for heap"); let (heap_start, heap_size) = memory_map(thunk15)
.expect("No memory for heap");
ALLOCATOR.lock().init(heap_start, heap_size); ALLOCATOR.lock().init(heap_start, heap_size);
...@@ -194,11 +196,11 @@ pub unsafe extern "C" fn kstart( ...@@ -194,11 +196,11 @@ pub unsafe extern "C" fn kstart(
format!("{:>4}x{:<4} {:>3}:{:<3}", w, h, aspect_w, aspect_h) format!("{:>4}x{:<4} {:>3}:{:<3}", w, h, aspect_w, aspect_h)
)); ));
} else { } else {
panic!("Failed to read VBE mode 0x{:04X} info: 0x{:04X}", mode, data.eax); error!("Failed to read VBE mode 0x{:04X} info: 0x{:04X}", mode, data.eax);
} }
} }
} else { } else {
panic!("Failed to read VBE card info: 0x{:04X}", data.eax); error!("Failed to read VBE card info: 0x{:04X}", data.eax);
} }
} }
...@@ -215,7 +217,7 @@ pub unsafe extern "C" fn kstart( ...@@ -215,7 +217,7 @@ pub unsafe extern "C" fn kstart(
let off_y = VGA.lock().y; let off_y = VGA.lock().y;
let rows = 12; let rows = 12;
let mut selected = modes.get(0).map_or(0, |x| x.0); let mut selected = modes.get(0).map_or(0, |x| x.0);
loop { while ! modes.is_empty() {
let mut row = 0; let mut row = 0;
let mut col = 0; let mut col = 0;
for (mode, w, h, ptr, text) in modes.iter() { for (mode, w, h, ptr, text) in modes.iter() {
...@@ -311,10 +313,10 @@ pub unsafe extern "C" fn kstart( ...@@ -311,10 +313,10 @@ pub unsafe extern "C" fn kstart(
let kernel = { let kernel = {
let node = fs.find_node("kernel", fs.header.1.root) let node = fs.find_node("kernel", fs.header.1.root)
.expect("failed to find kernel file"); .expect("Failed to find kernel file");
let size = fs.node_len(node.0) let size = fs.node_len(node.0)
.expect("failed to read kernel size"); .expect("Failed to read kernel size");
print!("Kernel: 0/{} MiB", size / 1024 / 1024); print!("Kernel: 0/{} MiB", size / 1024 / 1024);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment