From 72d4d2c6f0d71a6dad37d96d1bad6190b236fe85 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 3 Nov 2021 14:29:05 +0000 Subject: [PATCH] acpi_tables: aml: Implement Aml::append_aml_bytes() for Buffer For now it still relies on Aml::to_aml_bytes() for the children as not all structures have been ported. Signed-off-by: Rob Bradford --- acpi_tables/src/aml.rs | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/acpi_tables/src/aml.rs b/acpi_tables/src/aml.rs index 3d98a1a44..a2e8d45d1 100644 --- a/acpi_tables/src/aml.rs +++ b/acpi_tables/src/aml.rs @@ -1056,20 +1056,16 @@ impl Buffer { } impl Aml for Buffer { - fn to_aml_bytes(&self) -> Vec { - let mut bytes = Vec::new(); - bytes.extend_from_slice(&self.data.len().to_aml_bytes()); - bytes.extend_from_slice(&self.data); + fn append_aml_bytes(&self, bytes: &mut Vec) { + let mut tmp = Vec::new(); + tmp.extend_from_slice(&self.data.len().to_aml_bytes()); + tmp.extend_from_slice(&self.data); - let mut pkg_length = create_pkg_length(&bytes, true); - pkg_length.reverse(); - for byte in pkg_length { - bytes.insert(0, byte); - } + let mut pkg_length = create_pkg_length(&tmp, true); - bytes.insert(0, 0x11); /* BufferOp */ - - bytes + bytes.push(0x11); /* BufferOp */ + bytes.append(&mut pkg_length); + bytes.append(&mut tmp); } }