From 0cbdb2d0c020d2285babb67ae8cae174d48c2295 Mon Sep 17 00:00:00 2001 From: Connor Wood Date: Fri, 14 Jul 2017 10:39:50 +0100 Subject: [PATCH] Saved HPET table for global access --- src/acpi/mod.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/acpi/mod.rs b/src/acpi/mod.rs index 7a564af..e67715d 100644 --- a/src/acpi/mod.rs +++ b/src/acpi/mod.rs @@ -198,7 +198,8 @@ fn parse_sdt(sdt: &'static Sdt, active_table: &mut ActivePageTable) { } } } else if let Some(hpet) = Hpet::new(sdt) { - println!(": {:#?}", hpet); + println!(": {}", hpet.hpet_number); + ACPI_TABLE.lock().hpet = Some(hpet); } else if is_aml_table(sdt) { ACPI_TABLE.lock().namespace = match parse_aml_table(sdt) { Ok(res) => { @@ -273,9 +274,10 @@ pub unsafe fn init(active_table: &mut ActivePageTable) { pub struct Acpi { pub fadt: Option, pub namespace: Option, + pub hpet: Option } -pub static ACPI_TABLE: Mutex = Mutex::new(Acpi { fadt: None, namespace: None }); +pub static ACPI_TABLE: Mutex = Mutex::new(Acpi { fadt: None, namespace: None, hpet: None }); /// RSDP #[derive(Copy, Clone, Debug)]