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

rustfmt

Browse source
This commit is contained in:
Jack Halford 2018-04-15 11:50:13 +02:00
parent 5befd11f8d
commit 700b8a4e00
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel-rs/src/acpi/dsdt.rs
View file

@ -1,6 +1,6 @@
use super::{check_signature, ACPISDTHeader}; use super::{check_signature, ACPISDTHeader};
use core::mem; use core::mem;
use io::{Pio,Io}; use io::{Io, Pio};
static mut DSDT: DSDT = DSDT { static mut DSDT: DSDT = DSDT {
valid: false, valid: false,

5
kernel-rs/src/acpi/fadt.rs
View file

@ -153,7 +153,10 @@ pub fn reboot() -> Result<(), &'static str> {
Err("ACPI is not enabled") Err("ACPI is not enabled")
} else { } else {
let fadt = is_init()?; let fadt = is_init()?;
println!("fadt on {} ({}), value is {}", fadt.resetreg.address as u32, fadt.resetreg.address as u16, fadt.resetvalue); println!(
"fadt on {} ({}), value is {}",
fadt.resetreg.address as u32, fadt.resetreg.address as u16, fadt.resetvalue
);
let mut pin: Pio<u8> = Pio::new(fadt.resetreg.address as u16); let mut pin: Pio<u8> = Pio::new(fadt.resetreg.address as u16);
pin.write(fadt.resetvalue); pin.write(fadt.resetvalue);
// cpuio::outb(fadt.resetreg.address as u16, fadt.resetvalue); //TODO do it work // cpuio::outb(fadt.resetreg.address as u16, fadt.resetvalue); //TODO do it work

3
kernel-rs/src/keyboard.rs
View file

@ -1,7 +1,7 @@
extern crate core; extern crate core;
use vga; use vga;
use io::{self,Pio,Io}; use io::{self, Io, Pio};
const MAX_KEYS: usize = 59; const MAX_KEYS: usize = 59;
const KEYMAP_US: [[u8; 2]; MAX_KEYS] = [ const KEYMAP_US: [[u8; 2]; MAX_KEYS] = [
@ -66,7 +66,6 @@ const KEYMAP_US: [[u8; 2]; MAX_KEYS] = [
*b"\0\0",//capslock *b"\0\0",//capslock
]; ];
pub static mut PS2: Ps2 = Ps2::new(); pub static mut PS2: Ps2 = Ps2::new();
pub struct Ps2 { pub struct Ps2 {

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

@ -61,8 +61,6 @@ pub fn kmain() -> ! {
// *(0xdead as *mut u32) = 42; // *(0xdead as *mut u32) = 42;
// }; // };
println!("tss: {:?}");
// vga is *not* cpu specific // vga is *not* cpu specific
vga::init(); vga::init();