From owner-freebsd-current@FreeBSD.ORG Wed Jan 12 00:56:39 2005 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16D2716A4CE; Wed, 12 Jan 2005 00:56:39 +0000 (GMT) Received: from www.cryptography.com (li-22.members.linode.com [64.5.53.22]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA3EE43D1D; Wed, 12 Jan 2005 00:56:38 +0000 (GMT) (envelope-from nate@root.org) Received: from [10.0.0.34] (adsl-67-119-74-222.dsl.sntc01.pacbell.net [67.119.74.222]) by www.cryptography.com (8.12.8/8.12.8) with ESMTP id j0C0ubGV021956 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 11 Jan 2005 16:56:38 -0800 Message-ID: <41E475C5.8000800@root.org> Date: Tue, 11 Jan 2005 16:56:37 -0800 From: Nate Lawson User-Agent: Mozilla Thunderbird 0.9 (Windows/20041103) X-Accept-Language: en-us, en MIME-Version: 1.0 To: current@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit cc: acpi@freebsd.org Subject: [Fwd: cvs commit: src/sys/contrib/dev/acpica dsutils.c] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2005 00:56:39 -0000 This fix should be tested by anyone with _STA errors ("no return object"). I'll MFC in a day or two given no major issues. -------- Original Message -------- Subject: cvs commit: src/sys/contrib/dev/acpica dsutils.c Date: Wed, 12 Jan 2005 00:52:49 +0000 (GMT) From: Nate Lawson To: njl@FreeBSD.ORG njl 2005-01-12 00:52:40 UTC FreeBSD src repository Modified files: (Branch: INTEL) sys/contrib/dev/acpica dsutils.c Log: Fix handling of the implicit return case for methods called from an external source (i.e., _STA). The previous case only handled calls occurring within AML. This should fix Toshibas, among others. Thanks to Robert Moore of Intel for the fix. MFC after: 2 days Revision Changes Path 1.1.1.23 +2 -1 src/sys/contrib/dev/acpica/dsutils.c Index: src/sys/contrib/dev/acpica/dsutils.c diff -u src/sys/contrib/dev/acpica/dsutils.c:1.1.1.22 src/sys/contrib/dev/acpica/dsutils.c:1.1.1.23 --- src/sys/contrib/dev/acpica/dsutils.c:1.1.1.22 Wed Dec 1 23:13:41 2004 +++ src/sys/contrib/dev/acpica/dsutils.c Wed Jan 12 00:52:40 2005 @@ -167,7 +167,8 @@ * An executing method typically has no parent, since each method * is parsed separately. */ - if (!Op->Common.Parent) + if (!Op->Common.Parent || + Op->Common.Parent->Common.AmlOpcode == AML_SCOPE_OP) { /* * If this is the last statement in the method, we know it is not a -- Nate