karx/KarxOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixup! Format Rust code with rustfmt

Browse source
This commit is contained in:
github-actions 2021-09-27 13:39:52 +00:00
parent bf71cdae5b
commit 7652cc223e
2 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ata.rs
View file

@ -208,10 +208,10 @@ fn disk_size(sectors: u32) -> (u32, String) {
}
pub fn info() -> Vec<(u8, String, String, u32, String)> {
use x86_64::registers::control::{Cr0Flags, Cr0};
use x86_64::registers::control::{Cr0, Cr0Flags};
let mut flags = Cr0::read();
flags.set(Cr0Flags::WRITE_PROTECT, false);
unsafe {Cr0::write(flags)};
unsafe { Cr0::write(flags) };
let mut bus = BUS.lock();
let mut res = Vec::new();
for drive in 0..2 {

30
src/interrupts.rs
View file

@ -18,9 +18,12 @@ lazy_static! {
idt.page_fault.set_handler_fn(page_fault_handler);
idt[InterruptIndex::Timer.as_usize()].set_handler_fn(timer_interrupt_handler);
idt[InterruptIndex::Keyboard.as_usize()].set_handler_fn(keyboard_interrupt_handler);
idt.stack_segment_fault.set_handler_fn(stack_segment_fault_handler);
idt.segment_not_present.set_handler_fn(segment_not_present_handler);
idt.general_protection_fault.set_handler_fn(general_protection_fault_handler);
idt.stack_segment_fault
.set_handler_fn(stack_segment_fault_handler);
idt.segment_not_present
.set_handler_fn(segment_not_present_handler);
idt.general_protection_fault
.set_handler_fn(general_protection_fault_handler);
idt
};
}
@ -152,16 +155,25 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
}
}
extern "x86-interrupt" fn general_protection_fault_handler(stack_frame: InterruptStackFrame, _error_code: u64) {
panic!("EXCEPTION: GENERAL PROTECTION FAULT\n{:#?}", stack_frame);
extern "x86-interrupt" fn general_protection_fault_handler(
stack_frame: InterruptStackFrame,
_error_code: u64,
) {
panic!("EXCEPTION: GENERAL PROTECTION FAULT\n{:#?}", stack_frame);
}
extern "x86-interrupt" fn stack_segment_fault_handler(stack_frame: InterruptStackFrame, _error_code: u64) {
panic!("EXCEPTION: STACK SEGMENT FAULT\n{:#?}", stack_frame);
extern "x86-interrupt" fn stack_segment_fault_handler(
stack_frame: InterruptStackFrame,
_error_code: u64,
) {
panic!("EXCEPTION: STACK SEGMENT FAULT\n{:#?}", stack_frame);
}
extern "x86-interrupt" fn segment_not_present_handler(stack_frame: InterruptStackFrame, _error_code: u64) {
panic!("EXCEPTION: SEGMENT NOT PRESENT\n{:#?}", stack_frame);
extern "x86-interrupt" fn segment_not_present_handler(
stack_frame: InterruptStackFrame,
_error_code: u64,
) {
panic!("EXCEPTION: SEGMENT NOT PRESENT\n{:#?}", stack_frame);
}
pub const PIC_1_OFFSET: u8 = 32;