From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCWx-00045V-No for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:51:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOCWr-0005U5-KU for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:51:39 -0500 Received: from mail.kernel.org ([198.145.29.136]:52377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCWr-0005T3-BZ for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:51:33 -0500 Date: Wed, 18 Feb 2015 22:51:27 +0100 From: "Michael S. Tsirkin" Message-ID: <1424295164-4774-79-git-send-email-mst@redhat.com> References: <1424295164-4774-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424295164-4774-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 78/96] acpi: add aml_field() & aml_named_field() terms List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , dgilbert@redhat.com, Juan Quintela From: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/acpi/aml-build.h | 6 ++++++ hw/acpi/aml-build.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 57926e5..2bb5f39 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -29,6 +29,10 @@ typedef enum { } AmlIODecode; typedef enum { + aml_byte_acc = 1, +} AmlFieldFlags; + +typedef enum { aml_system_memory = 0x00, aml_system_io = 0x01, } AmlRegionSpace; @@ -86,6 +90,7 @@ Aml *aml_io(AmlIODecode dec, uint16_t min_base, uint16_t max_base, uint8_t aln, uint8_t len); Aml *aml_operation_region(const char *name, AmlRegionSpace rs, uint32_t offset, uint32_t len); +Aml *aml_named_field(const char *name, unsigned length); /* Block AML object primitives */ Aml *aml_scope(const char *name_format, ...) GCC_FMT_ATTR(1, 2); @@ -95,6 +100,7 @@ Aml *aml_if(Aml *predicate); Aml *aml_package(uint8_t num_elements); Aml *aml_buffer(void); Aml *aml_resource_template(void); +Aml *aml_field(const char *name, AmlFieldFlags flags); /* other helpers */ GArray *build_alloc_array(void); diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index d72d5b4..b91141e 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -216,6 +216,16 @@ build_prepend_package_length(GArray *package, unsigned length, bool incl_self) build_prepend_byte(package, byte); } +static void +build_append_pkg_length(GArray *array, unsigned length, bool incl_self) +{ + GArray *tmp = build_alloc_array(); + + build_prepend_package_length(tmp, length, incl_self); + build_append_array(array, tmp); + build_free_array(tmp); +} + void build_package(GArray *package, uint8_t op) { build_prepend_package_length(package, package->len, true); @@ -568,3 +578,21 @@ Aml *aml_operation_region(const char *name, AmlRegionSpace rs, build_append_int(var->buf, len); return var; } + +/* ACPI 1.0b: 16.2.5.2 Named Objects Encoding: NamedField */ +Aml *aml_named_field(const char *name, unsigned length) +{ + Aml *var = aml_alloc(); + build_append_nameseg(var->buf, name); + build_append_pkg_length(var->buf, length, false); + return var; +} + +/* ACPI 1.0b: 16.2.5.2 Named Objects Encoding: DefField */ +Aml *aml_field(const char *name, AmlFieldFlags flags) +{ + Aml *var = aml_bundle(0x81 /* FieldOp */, AML_EXT_PACKAGE); + build_append_namestring(var->buf, "%s", name); + build_append_byte(var->buf, flags); + return var; +} -- MST