From 7095219316eb800c7779f7a463c442dc67af936c Mon Sep 17 00:00:00 2001 From: Connor Wood Date: Mon, 19 Jun 2017 14:12:26 +0100 Subject: [PATCH] Moved ComputationalData::String into namespace --- src/acpi/aml/dataobj.rs | 1 + src/acpi/aml/namespace.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/acpi/aml/dataobj.rs b/src/acpi/aml/dataobj.rs index 4400c8d..042b9d5 100644 --- a/src/acpi/aml/dataobj.rs +++ b/src/acpi/aml/dataobj.rs @@ -71,6 +71,7 @@ impl AmlExecutable for ComputationalData { ComputationalData::Zero => Some(AmlValue::IntegerConstant(0)), ComputationalData::One => Some(AmlValue::IntegerConstant(1)), ComputationalData::Ones => Some(AmlValue::IntegerConstant(0xFFFFFFFFFFFFFFFF)), + ComputationalData::String(ref s) => Some(AmlValue::String(s.clone())), _ => Some(AmlValue::Integer) } } diff --git a/src/acpi/aml/namespace.rs b/src/acpi/aml/namespace.rs index f869cea..3e12e55 100644 --- a/src/acpi/aml/namespace.rs +++ b/src/acpi/aml/namespace.rs @@ -49,7 +49,7 @@ pub enum AmlValue { ObjectReference, OperationRegion, Package(Vec), - String, + String(String), PowerResource, Processor, RawDataBuffer,