jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86lib update

Browse source
This commit is contained in:
Jack Halford 2018-03-29 20:32:23 +02:00
parent c24ac47698
commit 42e06809ac
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kernel-rs/src/arch/x86/mod.rs
View file

@ -26,8 +26,6 @@ pub unsafe extern fn x86_rust_start(multiboot_info_addr: usize) {
// set up physical allocator // set up physical allocator
::memory::init(&boot_info); ::memory::init(&boot_info);
// pic
self::device::init();
// set up interrupts // set up interrupts
self::interrupt::init(); self::interrupt::init();
@ -38,6 +36,9 @@ pub unsafe extern fn x86_rust_start(multiboot_info_addr: usize) {
// set up heap // set up heap
::allocator::init(&mut active_table); ::allocator::init(&mut active_table);
// pic
self::device::init();
// after core has loaded // after core has loaded
::memory::init_noncore(); ::memory::init_noncore();

2
kernel-rs/src/lib.rs
View file

@ -29,7 +29,7 @@ extern crate x86;
pub mod keyboard; pub mod keyboard;
/// simplisitc kernel commands /// simplisitc kernel commands
pub mod console; pub mod console;
/// rust wrappers around cpu I/O instructions. /// rust wrappers around cpu I/O instructions., cpuio.rs needs to go in favour of io module
pub mod cpuio; pub mod cpuio;
pub mod io; pub mod io;
/// ACPI self contained module /// ACPI self contained module

2
kernel-rs/x86

@ -1 +1 @@
Subproject commit 3cef2945c884857a6ef44c942a3d949790792db7 Subproject commit ea8512f4c21c6c84578e04eff1f0b4662f089cd9