From patchwork Sat Jan 23 02:12:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1430630 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DN05j05lsz9sCD for ; Sat, 23 Jan 2021 13:12:57 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1l38Pz-00066e-Dl; Sat, 23 Jan 2021 02:12:51 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l38Px-00066F-V0 for fwts-devel@lists.ubuntu.com; Sat, 23 Jan 2021 02:12:49 +0000 Received: from 2.general.alexhung.us.vpn ([10.172.65.255] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l38Px-0007i8-DR; Sat, 23 Jan 2021 02:12:49 +0000 From: Alex Hung To: fwts-devel@lists.ubuntu.com Subject: [PATCH 6/7] acpi: method: refine _PRW method tests Date: Fri, 22 Jan 2021 19:12:30 -0700 Message-Id: <20210123021231.54136-6-alex.hung@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123021231.54136-1-alex.hung@canonical.com> References: <20210123021231.54136-1-alex.hung@canonical.com> MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" Signed-off-by: Alex Hung Acked-by: Ivan Hu Acked-by: Colin Ian King --- src/acpi/method/method.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c index b9f463c8..025bd66f 100644 --- a/src/acpi/method/method.c +++ b/src/acpi/method/method.c @@ -1331,6 +1331,11 @@ static void method_test_PRW_return( uint32_t i; bool failed = false; + static const fwts_package_element elements[] = { + { ACPI_TYPE_LOCAL_REFERENCE, "DeviceName" }, + { ACPI_TYPE_INTEGER, "Index" }, + }; + FWTS_UNUSED(private); if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_PACKAGE) != FWTS_OK) @@ -1350,24 +1355,8 @@ static void method_test_PRW_return( if (obj->Package.Elements[0].Type == ACPI_TYPE_PACKAGE) { ACPI_OBJECT *pkg; pkg = &obj->Package.Elements[0]; - if (fwts_method_subpackage_count_equal(fw, name, pkg, 0, 2) != FWTS_OK) - failed = true; - - if (pkg->Package.Elements[0].Type != ACPI_TYPE_LOCAL_REFERENCE) { - fwts_failed(fw, LOG_LEVEL_MEDIUM, - "Method_PRWBadSubPackageElementType", - "%s sub-package 0 element 0 is not " - "a reference.",name); - failed = true; - } - - if (pkg->Package.Elements[1].Type != ACPI_TYPE_INTEGER) { - fwts_failed(fw, LOG_LEVEL_MEDIUM, - "Method_PRWBadSubPackageElementType", - "%s sub-package 0 element 0 is not " - "an integer.",name); + if (fwts_method_package_elements_type(fw, name, pkg, elements) != FWTS_OK) failed = true; - } } if (obj->Package.Elements[1].Type != ACPI_TYPE_INTEGER) {