| Message ID | 1425813387-31231-3-git-send-email-marcel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 2015/3/8 19:16, Marcel Apfelbaum wrote: > Add encoding for ACPI DefOr Opcode. > > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> > --- > hw/acpi/aml-build.c | 10 ++++++++++ > include/hw/acpi/aml-build.h | 1 + > 2 files changed, 11 insertions(+) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 0d14561..603c0c4 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -448,6 +448,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_int(var->buf, 0x00); /* NullNameOp */ Hi, I notice that MST has sent a patch which uses build_append_byte instead of build_append_int. Maybe we can fix this patch before apply. Thanks, Shannon > + return var; > +} > +
On 03/09/2015 09:58 AM, Shannon Zhao wrote: > On 2015/3/8 19:16, Marcel Apfelbaum wrote: >> Add encoding for ACPI DefOr Opcode. >> >> Reviewed-by: Igor Mammedov <imammedo@redhat.com> >> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> >> --- >> hw/acpi/aml-build.c | 10 ++++++++++ >> include/hw/acpi/aml-build.h | 1 + >> 2 files changed, 11 insertions(+) >> >> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c >> index 0d14561..603c0c4 100644 >> --- a/hw/acpi/aml-build.c >> +++ b/hw/acpi/aml-build.c >> @@ -448,6 +448,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_int(var->buf, 0x00); /* NullNameOp */ > Hi, Hi Shannon, thank you for your review. > > I notice that MST has sent a patch which uses build_append_byte instead of build_append_int. > Maybe we can fix this patch before apply. Sure, thank you for bringing this to my attention. Marcel > > Thanks, > Shannon >> + return var; >> +} >> + > >
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 0d14561..603c0c4 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -448,6 +448,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_int(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 f6735ea..84d4180 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -137,6 +137,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);