Message ID | 1431595182-7552-21-git-send-email-zhaoshenglong@huawei.com |
---|---|
State | New |
Headers | show |
On Thu, May 14, 2015 at 05:19:39PM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > hw/acpi/aml-build.c | 18 ++++++++++++++++++ > include/hw/acpi/aml-build.h | 1 + > 2 files changed, 19 insertions(+) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 238d6a3..360023a 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -1056,6 +1056,24 @@ Aml *aml_touuid(const char *uuid) > return var; > } > > +/* > + * ACPI 2.0b: 16.2.3.6.4.3 Unicode Macro (Convert Ascii String To Unicode) > + */ > +Aml *aml_unicode(const char *str) > +{ > + Aml *var = aml_bundle(0x11 /* BufferOp */, AML_BUFFER); > + > + while (*str != '\0') { > + build_append_byte(var->buf, 0); > + build_append_byte(var->buf, *str); > + str++; > + } > + build_append_byte(var->buf, 0); > + build_append_byte(var->buf, *str); Same as build_append_byte(ar->buf, 0)? > + > + return var; > +} > + > void > build_header(GArray *linker, GArray *table_data, > AcpiTableHeader *h, const char *sig, int len, uint8_t rev) > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index 2fea838..564561e 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -275,6 +275,7 @@ Aml *aml_field(const char *name, AmlAccessType type, AmlUpdateRule rule); > Aml *aml_create_dword_field(Aml *srcbuf, Aml *index, const char *name); > Aml *aml_varpackage(uint32_t num_elements); > Aml *aml_touuid(const char *uuid); > +Aml *aml_unicode(const char *str); > > void > build_header(GArray *linker, GArray *table_data, > -- > 2.1.0 >
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 238d6a3..360023a 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1056,6 +1056,24 @@ Aml *aml_touuid(const char *uuid) return var; } +/* + * ACPI 2.0b: 16.2.3.6.4.3 Unicode Macro (Convert Ascii String To Unicode) + */ +Aml *aml_unicode(const char *str) +{ + Aml *var = aml_bundle(0x11 /* BufferOp */, AML_BUFFER); + + while (*str != '\0') { + build_append_byte(var->buf, 0); + build_append_byte(var->buf, *str); + str++; + } + build_append_byte(var->buf, 0); + build_append_byte(var->buf, *str); + + return var; +} + void build_header(GArray *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev) diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 2fea838..564561e 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -275,6 +275,7 @@ Aml *aml_field(const char *name, AmlAccessType type, AmlUpdateRule rule); Aml *aml_create_dword_field(Aml *srcbuf, Aml *index, const char *name); Aml *aml_varpackage(uint32_t num_elements); Aml *aml_touuid(const char *uuid); +Aml *aml_unicode(const char *str); void build_header(GArray *linker, GArray *table_data,