From 1ca57fdcddbc87cd48b702b6bbd4f4d0351cbbc4 Mon Sep 17 00:00:00 2001 From: Julien CLEMENT Date: Sat, 17 Dec 2022 19:57:49 +0100 Subject: [PATCH] Start iso structs, with rust black magic Signed-off-by: Julien CLEMENT --- src/drivers/atapi/interrupt.rs | 2 -- src/fs/mod.rs | 1 + src/interrupts/pic/disk.rs | 5 +---- src/lib.rs | 1 + 4 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 src/fs/mod.rs diff --git a/src/drivers/atapi/interrupt.rs b/src/drivers/atapi/interrupt.rs index 3c8768d..80ea515 100644 --- a/src/drivers/atapi/interrupt.rs +++ b/src/drivers/atapi/interrupt.rs @@ -1,5 +1,3 @@ -use crate::println; - use core::future::Future; use core::pin::Pin; use core::sync::atomic::{AtomicBool, Ordering}; diff --git a/src/fs/mod.rs b/src/fs/mod.rs new file mode 100644 index 0000000..449802c --- /dev/null +++ b/src/fs/mod.rs @@ -0,0 +1 @@ +mod iso; \ No newline at end of file diff --git a/src/interrupts/pic/disk.rs b/src/interrupts/pic/disk.rs index f2d91dc..3e08dd2 100644 --- a/src/interrupts/pic/disk.rs +++ b/src/interrupts/pic/disk.rs @@ -1,11 +1,8 @@ -use crate::println; - use super::{InterruptIndex, PICS}; use x86_64::structures::idt::InterruptStackFrame; -fn disk_interrupt_handler(disk: u16) { +fn disk_interrupt_handler(_disk: u16) { crate::drivers::atapi::interrupt::mark_interrupt(); - // println!("Received disk {} interrupt", disk); } pub extern "x86-interrupt" fn disk1_interrupt_handler(_stack_frame: InterruptStackFrame) { diff --git a/src/lib.rs b/src/lib.rs index 018ee6e..7f0aea7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,6 +7,7 @@ mod drivers; mod interrupts; mod memory; mod task; +mod fs; //#[macro_use] extern crate alloc;