From patchwork Thu May 14 09:19:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 48505 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B5B02121F for ; Thu, 14 May 2015 09:37:05 +0000 (UTC) Received: by laat2 with SMTP id t2sf18228187laa.2 for ; Thu, 14 May 2015 02:37:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:content-type:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=WQwRTgHVYvIUrLcuTH0K+3Gob2iMHZNe80ya8tKaMbo=; b=cDHXBJVAHZU+LL7AhdqvyUo0yz9ZKoSFNeYWlmqeYVIk7jhMS1roPQ+N+d30+DnCAK uM2bqBH0t7/TitfsSEXrbntC10VlPGAOs9xjbjJwdIUwjYXfasPMnLTltKqAMxRpWURp JeDBdjVaEo1NNC8GLy2J4XEO1iTuD5bSrEUTk5uboo6sOOscUico2cMqCzia61N+dvH3 zc6eCWuBlA5FhUn4Y/DiWWgWkhqOqd8DcYbmhe0LgP11jvjnPxYLwqx8/Vgm915HaLiM Xb5qJBfTZQSoW/bQAaiC3VtxWRr0LzSn+D/fm2BsCTlUedEIPXe9H0Dd7Vt4xKp1tvTc rouQ== X-Gm-Message-State: ALoCoQkUt5iMGbMaxdmIdQW3v84Gn6g9KimKpqqxSCSuljiksGtTyFBEAIgQPt1CUysCmdj65UbF X-Received: by 10.112.28.111 with SMTP id a15mr2429186lbh.21.1431596224261; Thu, 14 May 2015 02:37:04 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.100 with SMTP id j4ls395035lah.92.gmail; Thu, 14 May 2015 02:37:04 -0700 (PDT) X-Received: by 10.112.146.97 with SMTP id tb1mr2592340lbb.12.1431596224077; Thu, 14 May 2015 02:37:04 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id o2si14121336lah.165.2015.05.14.02.37.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 02:37:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labbd9 with SMTP id bd9so59402428lab.2 for ; Thu, 14 May 2015 02:37:03 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr2385524lak.117.1431596223662; Thu, 14 May 2015 02:37:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1122306lbb; Thu, 14 May 2015 02:37:02 -0700 (PDT) X-Received: by 10.140.20.150 with SMTP id 22mr4209897qgj.26.1431596222180; Thu, 14 May 2015 02:37:02 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p45si83224qgd.117.2015.05.14.02.37.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 May 2015 02:37:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:53397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspZd-0008O9-Dp for patch@linaro.org; Thu, 14 May 2015 05:37:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspNl-0005fZ-Ce for qemu-devel@nongnu.org; Thu, 14 May 2015 05:24:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YspNh-0001Vi-GM for qemu-devel@nongnu.org; Thu, 14 May 2015 05:24:45 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:32555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YspNg-0001Su-Re for qemu-devel@nongnu.org; Thu, 14 May 2015 05:24:41 -0400 Received: from 172.24.2.119 (EHLO szxeml430-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CLJ60797; Thu, 14 May 2015 17:21:15 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.158.1; Thu, 14 May 2015 17:21:01 +0800 From: Shannon Zhao To: , , , , , , , , , , Date: Thu, 14 May 2015 17:19:34 +0800 Message-ID: <1431595182-7552-16-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1431595182-7552-1-git-send-email-zhaoshenglong@huawei.com> References: <1431595182-7552-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Cc: hangaohuai@huawei.com, zhaoshenglong@huawei.com, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [Qemu-devel] [PATCH v7 15/23] hw/acpi/aml-build: Add aml_or() term X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao --- 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 0e4d35f..e4ec938 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -463,6 +463,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 f5e764c..91a9e64 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -208,6 +208,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);