Signed-off-by: Igor Mammedov <imamm...@redhat.com> --- hw/acpi/aml-build.c | 28 ++++++++++++++++++++++++++++ include/hw/acpi/aml-build.h | 6 ++++++ 2 files changed, 34 insertions(+)
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 05d4a3d..10995a9 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -217,6 +217,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); @@ -619,3 +629,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; +} diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 6db9d42..8b954d9 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -37,6 +37,10 @@ typedef enum { } AmlIODecode; typedef enum { + aml_byte_acc = 1, +} AmlFieldFlags; + +typedef enum { aml_system_memory = 0x00, aml_system_io = 0x01, } AmlRegionSpace; @@ -96,6 +100,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_def_block(const char *signature, uint8_t revision, @@ -109,6 +114,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); -- 1.8.3.1