From c8eca653b8a894e0f8baa15958edd3d0a30183c6 Mon Sep 17 00:00:00 2001
From: Connor Wood <connorwood71@gmail.com>
Date: Thu, 22 Jun 2017 15:09:04 +0100
Subject: [PATCH] Moved ConnectFieldNameString into namespace

---
 src/acpi/aml/namedobj.rs  | 14 +++++++++++++-
 src/acpi/aml/namespace.rs |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/acpi/aml/namedobj.rs b/src/acpi/aml/namedobj.rs
index 7b40db4..40de06f 100644
--- a/src/acpi/aml/namedobj.rs
+++ b/src/acpi/aml/namedobj.rs
@@ -7,7 +7,7 @@ use collections::btree_map::BTreeMap;
 
 use super::{AmlInternalError, AmlExecutable, AmlValue, get_namespace_string};
 use super::namespace::FieldSelector;
-use super::namestring::{parse_name_string, parse_name_seg};
+use super::namestring::{parse_name_string, parse_name_seg, SuperName};
 use super::termlist::{parse_term_arg, parse_term_list, parse_object_list, TermArg, TermObj, Object};
 use super::pkglength::parse_pkg_length;
 use super::type2opcode::{parse_def_buffer, DefBuffer};
@@ -123,6 +123,7 @@ impl AmlExecutable for NamedObj {
         match *self {
             NamedObj::DefBankField { ref region_name, ref bank_name, ref bank_value, ref flags, ref field_list } => {
                 let mut offset: usize = 0;
+                let mut connection = AmlValue::Uninitialized;
                 let bank_val = if let Some(b) = bank_value.execute(namespace, scope.clone()) {
                     Box::new(b)
                 } else {
@@ -132,6 +133,8 @@ impl AmlExecutable for NamedObj {
                 for f in field_list {
                     match *f {
                         FieldElement::ReservedField { length } => offset += length,
+                        FieldElement::ConnectFieldNameString(ref name) => connection =
+                            AmlValue::ObjectReference(SuperName::NameString(name.clone())),
                         FieldElement::NamedField { name: ref field_name, length } => {
                             let local_scope_string = get_namespace_string(scope.clone(),
                                                                           field_name.clone());
@@ -140,6 +143,7 @@ impl AmlExecutable for NamedObj {
                                     region: region_name.clone(),
                                     bank_selector: bank_val.clone()
                                 },
+                                connection: Box::new(connection.clone()),
                                 flags: flags.clone(),
                                 offset: offset.clone(),
                                 length: length.clone()
@@ -153,10 +157,13 @@ impl AmlExecutable for NamedObj {
             },
             NamedObj::DefIndexField { ref idx_name, ref data_name, ref flags, ref field_list } => {
                 let mut offset: usize = 0;
+                let mut connection = AmlValue::Uninitialized;
 
                 for f in field_list {
                     match *f {
                         FieldElement::ReservedField { length } => offset += length,
+                        FieldElement::ConnectFieldNameString(ref name) => connection =
+                            AmlValue::ObjectReference(SuperName::NameString(name.clone())),
                         FieldElement::NamedField { name: ref field_name, length } => {
                             let local_scope_string = get_namespace_string(scope.clone(),
                                                                           field_name.clone());
@@ -165,6 +172,7 @@ impl AmlExecutable for NamedObj {
                                     index_selector: idx_name.clone(),
                                     data_selector: data_name.clone()
                                 },
+                                connection: Box::new(connection.clone()),
                                 flags: flags.clone(),
                                 offset: offset.clone(),
                                 length: length.clone()
@@ -318,15 +326,19 @@ impl AmlExecutable for NamedObj {
             },
             NamedObj::DefField { ref name, ref flags, ref field_list } => {
                 let mut offset: usize = 0;
+                let mut connection = AmlValue::Uninitialized;
 
                 for f in field_list {
                     match *f {
                         FieldElement::ReservedField { length } => offset += length,
+                        FieldElement::ConnectFieldNameString(ref name) => connection =
+                            AmlValue::ObjectReference(SuperName::NameString(name.clone())),
                         FieldElement::NamedField { name: ref field_name, length } => {
                             let local_scope_string = get_namespace_string(scope.clone(),
                                                                           field_name.clone());
                             namespace.insert(local_scope_string, AmlValue::FieldUnit {
                                 selector: FieldSelector::Region(name.clone()),
+                                connection: Box::new(connection.clone()),
                                 flags: flags.clone(),
                                 offset: offset.clone(),
                                 length: length.clone()
diff --git a/src/acpi/aml/namespace.rs b/src/acpi/aml/namespace.rs
index 7d16ec0..375057e 100644
--- a/src/acpi/aml/namespace.rs
+++ b/src/acpi/aml/namespace.rs
@@ -37,6 +37,7 @@ pub enum AmlValue {
     Event,
     FieldUnit {
         selector: FieldSelector,
+        connection: Box<AmlValue>,
         flags: FieldFlags,
         offset: usize,
         length: usize