JohnyTheCarrot/ableos
1
0
Fork 0
forked from AbleOS/ableos
Code Issues Pull requests Packages Projects Releases Wiki Activity

removed module that I forgot to remove + 1.65 stuff

Browse source
This commit is contained in:
Erin 2022-11-05 01:40:38 +01:00 committed by ondra05
parent 56700a7986
commit 4e6bed0b57
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ableos/src/lib.rs
View file

@ -97,7 +97,6 @@ pub use driver_traits::*;
pub use experiments::*; pub use experiments::*;
pub use graphics::*; pub use graphics::*;
pub use kernel; pub use kernel;
pub use kernel::messaging;
// pub use kernel::panic; // pub use kernel::panic;
pub use kernel_state::*; pub use kernel_state::*;
pub use keyboard::*; pub use keyboard::*;

4
ableos/src/scratchpad.rs
View file

@ -133,7 +133,9 @@ pub fn scratchpad() {
let mut pci_ide_device = pci_ide_device.lock(); let mut pci_ide_device = pci_ide_device.lock();
if let PciDevice::Ide(device) = &mut *pci_ide_device { if let PciDevice::Ide(device) = &mut *pci_ide_device {
let mut first_sector = Vec::with_capacity(512); let mut first_sector = Vec::with_capacity(512);
device.read(Channel::Primary, Drive::Master, 0, 1, &mut first_sector).unwrap(); device
.read(Channel::Primary, Drive::Master, 0, 1, &mut first_sector)
.unwrap();
trace!("IDE Primary/Master sector 0: {first_sector:?}"); trace!("IDE Primary/Master sector 0: {first_sector:?}");
} }
} }

2
ableos/src/tests/mod.rs
View file

@ -66,5 +66,3 @@ pub fn test_kernel_main(boot_info: &'static BootInfo) -> ! {
loop {} loop {}
} }
use bootloader::{entry_point, BootInfo}; use bootloader::{entry_point, BootInfo};
use crate::test_main;

5
kernel/src/task.rs
View file

@ -87,9 +87,8 @@ impl Executor {
.map(|t| TaskId(self.tasks.insert(t))) .map(|t| TaskId(self.tasks.insert(t)))
.or_else(|| self.queue.pop()) .or_else(|| self.queue.pop())
{ {
let task = match self.tasks.get_mut(id.0) { let Some(task) = self.tasks.get_mut(id.0) else {
Some(t) => t, panic!("attempted to get non-extant task with id {}", id.0)
None => panic!("attempted to get non-extant task with id {}", id.0),
}; };
let mut cx = Context::from_waker( let mut cx = Context::from_waker(