[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 14/20] hw/acpi/aml-build: Add aml_or() term
From: |
Shannon Zhao |
Subject: |
[Qemu-devel] [PATCH v5 14/20] hw/acpi/aml-build: Add aml_or() term |
Date: |
Wed, 15 Apr 2015 21:25:03 +0800 |
From: Shannon Zhao <address@hidden>
Add aml_or() term and expose build_append_int_noprefix
as it wiil be used by creating a buffer.
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
---
hw/acpi/aml-build.c | 12 +++++++++++-
include/hw/acpi/aml-build.h | 2 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 316d5a5..cd4ffe2 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -242,7 +242,7 @@ static void build_extop_package(GArray *package, uint8_t op)
build_prepend_byte(package, 0x5B); /* ExtOpPrefix */
}
-static void build_append_int_noprefix(GArray *table, uint64_t value, int size)
+void build_append_int_noprefix(GArray *table, uint64_t value, int size)
{
int i;
@@ -456,6 +456,16 @@ Aml *aml_and(Aml *arg1, Aml *arg2)
return var;
}
+/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefOr */
+Aml *aml_or(Aml *arg1, Aml *arg2)
+{
+ Aml *var = aml_opcode(0x7D /* OrOp */);
+ aml_append(var, arg1);
+ aml_append(var, arg2);
+ build_append_byte(var->buf, 0x00 /* NullNameOp */);
+ return var;
+}
+
/* ACPI 1.0b: 16.2.5.3 Type 1 Opcodes Encoding: DefNotify */
Aml *aml_notify(Aml *arg1, Aml *arg2)
{
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index b41fd0c..61c1a03 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -202,6 +202,7 @@ Aml *aml_int(const uint64_t val);
Aml *aml_arg(int pos);
Aml *aml_store(Aml *val, Aml *target);
Aml *aml_and(Aml *arg1, Aml *arg2);
+Aml *aml_or(Aml *arg1, Aml *arg2);
Aml *aml_notify(Aml *arg1, Aml *arg2);
Aml *aml_call1(const char *method, Aml *arg1);
Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2);
@@ -260,6 +261,7 @@ Aml *aml_resource_template(void);
Aml *aml_field(const char *name, AmlFieldFlags flags);
Aml *aml_varpackage(uint32_t num_elements);
Aml *aml_touuid(const char *uuid);
+void build_append_int_noprefix(GArray *table, uint64_t value, int size);
void
build_header(GArray *linker, GArray *table_data,
--
2.0.4
- [Qemu-devel] [PATCH v5 00/20] Generate ACPI v5.1 tables and expose them to guest over fw_cfg on ARM, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 12/20] hw/arm/virt-acpi-build: Add PCIe info and generate MCFG table, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 10/20] hw/arm/virt-acpi-build: Generate RSDT table, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 16/20] hw/acpi/aml-build: Add aml_else() term, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 09/20] hw/arm/virt-acpi-build: Generate GTDT table, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 13/20] hw/acpi/aml-build: Add ToUUID macro, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 14/20] hw/acpi/aml-build: Add aml_or() term,
Shannon Zhao <=
- [Qemu-devel] [PATCH v5 11/20] hw/arm/virt-acpi-build: Generate RSDP table, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 15/20] hw/acpi/aml-build: Add aml_not() term, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 08/20] hw/arm/virt-acpi-build: Generate MADT table, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 07/20] hw/arm/virt-acpi-build: Generate FADT table and update ACPI headers, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 20/20] hw/arm/virt: Enable dynamic generation of ACPI v5.1 tables, Shannon Zhao, 2015/04/15
- [Qemu-devel] [PATCH v5 19/20] hw/arm/virt-acpi-build: Add PCIe controller in ACPI DSDT table, Shannon Zhao, 2015/04/15