[Fwd: cvs commit: src/sys/contrib/dev/acpica dsutils.c]

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 <njl_at_FreeBSD.org>
To: njl_at_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
_at__at_ -167,7 +167,8 _at__at_
       * 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