svn commit: r212761 - in head: sys/conf sys/contrib/dev/acpica
sys/contrib/dev/acpica/common sys/contrib/dev/acpica/compiler
sys/contrib/dev/acpica/debugger sys/contrib/dev/acpica/events
sys/contri...
Jung-uk Kim
jkim at FreeBSD.org
Thu Sep 16 20:08:01 UTC 2010
Author: jkim
Date: Thu Sep 16 20:08:00 2010
New Revision: 212761
URL: http://svn.freebsd.org/changeset/base/212761
Log:
Merge ACPICA 20100915.
Added:
head/sys/contrib/dev/acpica/hardware/hwpci.c
- copied, changed from r212760, vendor-sys/acpica/dist/hardware/hwpci.c
head/sys/contrib/dev/acpica/utilities/utxferror.c
- copied, changed from r212760, vendor-sys/acpica/dist/utilities/utxferror.c
Modified:
head/sys/conf/files
head/sys/contrib/dev/acpica/changes.txt
head/sys/contrib/dev/acpica/common/adfile.c
head/sys/contrib/dev/acpica/common/adisasm.c
head/sys/contrib/dev/acpica/common/adwalk.c
head/sys/contrib/dev/acpica/common/dmrestag.c
head/sys/contrib/dev/acpica/common/getopt.c
head/sys/contrib/dev/acpica/compiler/aslanalyze.c
head/sys/contrib/dev/acpica/compiler/aslcompile.c
head/sys/contrib/dev/acpica/compiler/aslcompiler.h
head/sys/contrib/dev/acpica/compiler/aslerror.c
head/sys/contrib/dev/acpica/compiler/aslfiles.c
head/sys/contrib/dev/acpica/compiler/asllisting.c
head/sys/contrib/dev/acpica/compiler/asllookup.c
head/sys/contrib/dev/acpica/compiler/aslmain.c
head/sys/contrib/dev/acpica/compiler/aslopcodes.c
head/sys/contrib/dev/acpica/compiler/aslpredef.c
head/sys/contrib/dev/acpica/compiler/aslrestype1.c
head/sys/contrib/dev/acpica/compiler/aslrestype2d.c
head/sys/contrib/dev/acpica/compiler/aslrestype2e.c
head/sys/contrib/dev/acpica/compiler/aslrestype2w.c
head/sys/contrib/dev/acpica/compiler/aslstartup.c
head/sys/contrib/dev/acpica/compiler/dtcompile.c
head/sys/contrib/dev/acpica/compiler/dtio.c
head/sys/contrib/dev/acpica/debugger/dbexec.c
head/sys/contrib/dev/acpica/events/evrgnini.c
head/sys/contrib/dev/acpica/executer/exmutex.c
head/sys/contrib/dev/acpica/include/acglobal.h
head/sys/contrib/dev/acpica/include/achware.h
head/sys/contrib/dev/acpica/include/aclocal.h
head/sys/contrib/dev/acpica/include/acmacros.h
head/sys/contrib/dev/acpica/include/acnamesp.h
head/sys/contrib/dev/acpica/include/acpiosxf.h
head/sys/contrib/dev/acpica/include/acpixf.h
head/sys/contrib/dev/acpica/include/actypes.h
head/sys/contrib/dev/acpica/include/acutils.h
head/sys/contrib/dev/acpica/include/platform/acenv.h
head/sys/contrib/dev/acpica/include/platform/acfreebsd.h
head/sys/contrib/dev/acpica/include/platform/acgcc.h
head/sys/contrib/dev/acpica/namespace/nsrepair2.c
head/sys/contrib/dev/acpica/namespace/nsutils.c
head/sys/contrib/dev/acpica/osunixxf.c
head/sys/contrib/dev/acpica/tables/tbfadt.c
head/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h
head/sys/contrib/dev/acpica/utilities/utdebug.c
head/sys/contrib/dev/acpica/utilities/utmath.c
head/sys/contrib/dev/acpica/utilities/utmisc.c
head/sys/contrib/dev/acpica/utilities/utmutex.c
head/sys/dev/acpica/Osd/OsdHardware.c
head/sys/modules/acpi/acpi/Makefile
head/usr.sbin/acpi/acpidb/Makefile
head/usr.sbin/acpi/iasl/Makefile
Directory Properties:
head/sys/contrib/dev/acpica/ (props changed)
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/conf/files Thu Sep 16 20:08:00 2010 (r212761)
@@ -221,6 +221,7 @@ contrib/dev/acpica/executer/exsystem.c
contrib/dev/acpica/executer/exutils.c optional acpi
contrib/dev/acpica/hardware/hwacpi.c optional acpi
contrib/dev/acpica/hardware/hwgpe.c optional acpi
+contrib/dev/acpica/hardware/hwpci.c optional acpi
contrib/dev/acpica/hardware/hwregs.c optional acpi
contrib/dev/acpica/hardware/hwsleep.c optional acpi
contrib/dev/acpica/hardware/hwtimer.c optional acpi
@@ -289,6 +290,7 @@ contrib/dev/acpica/utilities/utosi.c op
contrib/dev/acpica/utilities/utresrc.c optional acpi
contrib/dev/acpica/utilities/utstate.c optional acpi
contrib/dev/acpica/utilities/utxface.c optional acpi
+contrib/dev/acpica/utilities/utxferror.c optional acpi
contrib/ipfilter/netinet/fil.c optional ipfilter inet \
compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
Modified: head/sys/contrib/dev/acpica/changes.txt
==============================================================================
--- head/sys/contrib/dev/acpica/changes.txt Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/changes.txt Thu Sep 16 20:08:00 2010 (r212761)
@@ -1,4 +1,68 @@
----------------------------------------
+15 September 2010. Summary of changes for version 20100915:
+
+This release is available at www.acpica.org/downloads
+
+1) ACPI CA Core Subsystem:
+
+Removed the AcpiOsDerivePciId OSL interface. The various host implementations
+of this function were not OS-dependent and are now obsolete and can be
+removed from all host OSLs. This function has been replaced by
+AcpiHwDerivePciId, which is now part of the ACPICA core code.
+AcpiHwDerivePciId has been implemented without recursion. Adds one new
+module, hwpci.c. ACPICA BZ 857.
+
+Implemented a dynamic repair for _HID and _CID strings. The following
+problems are now repaired at runtime: 1) Remove a leading asterisk in the
+string, and 2) the entire string is uppercased. Both repairs are in
+accordance with the ACPI specification and will simplify host driver code.
+ACPICA BZ 871.
+
+The ACPI_THREAD_ID type is no longer configurable, internally it is now
+always UINT64. This simplifies the ACPICA code, especially any printf output.
+UINT64 is the only common data type for all thread_id types across all
+operating systems. It is now up to the host OSL to cast the native thread_id
+type to UINT64 before returning the value to ACPICA (via AcpiOsGetThreadId).
+Lin Ming, Bob Moore.
+
+Added the ACPI_INLINE type to enhance the ACPICA configuration. The "inline"
+keyword is not standard across compilers, and this type allows inline to be
+configured on a per-compiler basis. Lin Ming.
+
+Made the system global AcpiGbl_SystemAwakeAndRunning publically available.
+Added an extern for this boolean in acpixf.h. Some hosts utilize this value
+during suspend/restore operations. ACPICA BZ 869.
+
+All code that implements error/warning messages with the "ACPI:" prefix has
+been moved to a new module, utxferror.c.
+
+The UINT64_OVERLAY was moved to utmath.c, which is the only module where it
+is used. ACPICA BZ 829. Lin Ming, Bob Moore.
+
+Example Code and Data Size: These are the sizes for the OS-independent
+acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The
+debug version of the code includes the debug output trace mechanism and has a
+much larger code and data size.
+
+ Previous Release:
+ Non-Debug Version: 89.1K Code, 19.0K Data, 108.1K Total
+ Debug Version: 165.1K Code, 51.9K Data, 217.0K Total
+ Current Release:
+ Non-Debug Version: 89.9K Code, 19.0K Data, 108.9K Total
+ Debug Version: 166.3K Code, 52.1K Data, 218.4K Total
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL/Disassembler: Write ACPI errors to stderr instead of the output file.
+This keeps the output files free of random error messages that may originate
+from within the namespace/interpreter code. Used this opportunity to merge
+all ACPI:-style messages into a single new module, utxferror.c. ACPICA BZ
+866. Lin Ming, Bob Moore.
+
+Tools: update some printfs for ansi warnings on size_t. Handle width change
+of size_t on 32-bit versus 64-bit generations. Lin Ming.
+
+----------------------------------------
06 August 2010. Summary of changes for version 20100806:
1) ACPI CA Core Subsystem:
Modified: head/sys/contrib/dev/acpica/common/adfile.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/adfile.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/common/adfile.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -126,13 +126,13 @@
/* Local prototypes */
-INT32
+static INT32
AdWriteBuffer (
char *Filename,
char *Buffer,
UINT32 Length);
-char FilenameBuf[20];
+static char FilenameBuf[20];
/******************************************************************************
@@ -190,7 +190,7 @@ AdGenerateFilename (
*
******************************************************************************/
-INT32
+static INT32
AdWriteBuffer (
char *Filename,
char *Buffer,
Modified: head/sys/contrib/dev/acpica/common/adisasm.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/adisasm.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/common/adisasm.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -147,18 +147,18 @@ LsSetupNsList (
/* Local prototypes */
-void
+static void
AdCreateTableHeader (
char *Filename,
ACPI_TABLE_HEADER *Table);
-ACPI_STATUS
+static ACPI_STATUS
AdDeferredParse (
ACPI_PARSE_OBJECT *Op,
UINT8 *Aml,
UINT32 AmlLength);
-ACPI_STATUS
+static ACPI_STATUS
AdParseDeferredOps (
ACPI_PARSE_OBJECT *Root);
@@ -634,7 +634,7 @@ AdDisassemblerHeader (
*
*****************************************************************************/
-void
+static void
AdCreateTableHeader (
char *Filename,
ACPI_TABLE_HEADER *Table)
@@ -781,7 +781,7 @@ AdDisplayTables (
*
*****************************************************************************/
-ACPI_STATUS
+static ACPI_STATUS
AdDeferredParse (
ACPI_PARSE_OBJECT *Op,
UINT8 *Aml,
@@ -904,7 +904,7 @@ AdDeferredParse (
*
*****************************************************************************/
-ACPI_STATUS
+static ACPI_STATUS
AdParseDeferredOps (
ACPI_PARSE_OBJECT *Root)
{
Modified: head/sys/contrib/dev/acpica/common/adwalk.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/adwalk.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/common/adwalk.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -792,6 +792,7 @@ AcpiDmXrefDescendingOp (
ACPI_PARSE_OBJECT *NextOp;
ACPI_NAMESPACE_NODE *Node;
ACPI_OPERAND_OBJECT *Object;
+ UINT32 ParamCount = 0;
WalkState = Info->WalkState;
@@ -880,18 +881,13 @@ AcpiDmXrefDescendingOp (
if (Object)
{
ObjectType2 = Object->Common.Type;
+ if (ObjectType2 == ACPI_TYPE_METHOD)
+ {
+ ParamCount = Object->Method.ParamCount;
+ }
}
- if (ObjectType2 == ACPI_TYPE_METHOD)
- {
- AcpiDmAddToExternalList (Op, Path, ACPI_TYPE_METHOD,
- Object->Method.ParamCount);
- }
- else
- {
- AcpiDmAddToExternalList (Op, Path, (UINT8) ObjectType2, 0);
- }
-
+ AcpiDmAddToExternalList (Op, Path, (UINT8) ObjectType2, ParamCount);
Op->Common.Node = Node;
}
else
Modified: head/sys/contrib/dev/acpica/common/dmrestag.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/dmrestag.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/common/dmrestag.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -704,8 +704,8 @@ AcpiDmUpdateResourceName (
Name[0] = '_';
Name[1] = AcpiGbl_Prefix[AcpiGbl_NextPrefix];
- Name[2] = AcpiUtHexToAsciiChar (AcpiGbl_NextResourceId, 4);
- Name[3] = AcpiUtHexToAsciiChar (AcpiGbl_NextResourceId, 0);
+ Name[2] = AcpiUtHexToAsciiChar ((UINT64) AcpiGbl_NextResourceId, 4);
+ Name[3] = AcpiUtHexToAsciiChar ((UINT64) AcpiGbl_NextResourceId, 0);
/* Update globals for next name */
Modified: head/sys/contrib/dev/acpica/common/getopt.c
==============================================================================
--- head/sys/contrib/dev/acpica/common/getopt.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/common/getopt.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -126,7 +126,6 @@
int AcpiGbl_Opterr = 1;
int AcpiGbl_Optind = 1;
-int AcpiGbl_Optopt;
char *AcpiGbl_Optarg;
@@ -171,9 +170,7 @@ AcpiGetopt(
/* Get the option */
- CurrentChar =
- AcpiGbl_Optopt =
- argv[AcpiGbl_Optind][CurrentCharPtr];
+ CurrentChar = argv[AcpiGbl_Optind][CurrentCharPtr];
/* Make sure that the option is legal */
Modified: head/sys/contrib/dev/acpica/compiler/aslanalyze.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslanalyze.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslanalyze.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -166,7 +166,7 @@ static UINT32
AnGetInternalMethodReturnType (
ACPI_PARSE_OBJECT *Op);
-BOOLEAN
+static BOOLEAN
AnIsResultUsed (
ACPI_PARSE_OBJECT *Op);
@@ -1754,7 +1754,7 @@ AnOperandTypecheckWalkEnd (
*
******************************************************************************/
-BOOLEAN
+static BOOLEAN
AnIsResultUsed (
ACPI_PARSE_OBJECT *Op)
{
@@ -1862,6 +1862,7 @@ AnOtherSemanticAnalysisWalkBegin (
if (Op->Asl.AmlOpcode == AML_DIVIDE_OP)
{
if ((ArgNode->Asl.ParseOpcode == PARSEOP_ZERO) &&
+ (PrevArgNode) &&
(PrevArgNode->Asl.ParseOpcode == PARSEOP_ZERO))
{
AslError (ASL_WARNING, ASL_MSG_RESULT_NOT_USED, Op, Op->Asl.ExternalName);
Modified: head/sys/contrib/dev/acpica/compiler/aslcompile.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslcompile.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslcompile.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -127,12 +127,12 @@ static void
CmFlushSourceCode (
void);
-void
+static void
FlConsumeAnsiComment (
ASL_FILE_INFO *FileInfo,
ASL_FILE_STATUS *Status);
-void
+static void
FlConsumeNewComment (
ASL_FILE_INFO *FileInfo,
ASL_FILE_STATUS *Status);
@@ -345,7 +345,7 @@ CmFlushSourceCode (
*
******************************************************************************/
-void
+static void
FlConsumeAnsiComment (
ASL_FILE_INFO *FileInfo,
ASL_FILE_STATUS *Status)
@@ -389,7 +389,7 @@ FlConsumeAnsiComment (
}
-void
+static void
FlConsumeNewComment (
ASL_FILE_INFO *FileInfo,
ASL_FILE_STATUS *Status)
Modified: head/sys/contrib/dev/acpica/compiler/aslcompiler.h
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslcompiler.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslcompiler.h Thu Sep 16 20:08:00 2010 (r212761)
@@ -686,6 +686,10 @@ ACPI_STATUS
LsDisplayNamespace (
void);
+void
+LsSetupNsList (
+ void *Handle);
+
/*
* aslutils - common compiler utilites
Modified: head/sys/contrib/dev/acpica/compiler/aslerror.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslerror.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslerror.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -304,7 +304,7 @@ AePrintException (
if (Enode->LineNumber)
{
- fprintf (OutputFile, "%6u: ", Enode->LineNumber);
+ fprintf (OutputFile, " %6u: ", Enode->LineNumber);
/*
* Seek to the offset in the combined source file, read the source
@@ -358,7 +358,7 @@ AePrintException (
{
/* Decode the message ID */
- fprintf (OutputFile, "%s %4.4d -",
+ fprintf (OutputFile, "%s %4.4d - ",
AslErrorLevel[Enode->Level],
Enode->MessageId + ((Enode->Level+1) * 1000));
Modified: head/sys/contrib/dev/acpica/compiler/aslfiles.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslfiles.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslfiles.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -122,7 +122,7 @@
/* Local prototypes */
-FILE *
+static FILE *
FlOpenIncludeWithPrefix (
char *PrefixDir,
char *Filename);
@@ -546,7 +546,7 @@ FlAddIncludeDirectory (
*
******************************************************************************/
-FILE *
+static FILE *
FlOpenIncludeWithPrefix (
char *PrefixDir,
char *Filename)
Modified: head/sys/contrib/dev/acpica/compiler/asllisting.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asllisting.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/asllisting.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -202,7 +202,7 @@ static void
LsDoHexOutputAsl (
void);
-ACPI_STATUS
+static ACPI_STATUS
LsTreeWriteWalk (
ACPI_PARSE_OBJECT *Op,
UINT32 Level,
@@ -222,7 +222,7 @@ LsTreeWriteWalk (
*
******************************************************************************/
-ACPI_STATUS
+static ACPI_STATUS
LsTreeWriteWalk (
ACPI_PARSE_OBJECT *Op,
UINT32 Level,
Modified: head/sys/contrib/dev/acpica/compiler/asllookup.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/asllookup.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/asllookup.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -180,11 +180,7 @@ LsDoOnePathname (
void *Context,
void **ReturnValue);
-void
-LsSetupNsList (
- void *Handle);
-
-ACPI_PARSE_OBJECT *
+static ACPI_PARSE_OBJECT *
LkGetNameOp (
ACPI_PARSE_OBJECT *Op);
@@ -623,7 +619,7 @@ LkObjectExists (
*
******************************************************************************/
-ACPI_PARSE_OBJECT *
+static ACPI_PARSE_OBJECT *
LkGetNameOp (
ACPI_PARSE_OBJECT *Op)
{
Modified: head/sys/contrib/dev/acpica/compiler/aslmain.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslmain.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslmain.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -214,7 +214,7 @@ Options (
printf (" -cr Disable Resource Descriptor error checking\n");
printf (" -r<Revision> Override table header Revision (1-255)\n");
- printf ("\nListings:\n");
+ printf ("\nASL Listing Files:\n");
printf (" -l Create mixed listing file (ASL source and AML) (*.lst)\n");
printf (" -ln Create namespace file (*.nsp)\n");
printf (" -ls Create combined source file (expanded includes) (*.src)\n");
@@ -462,6 +462,7 @@ AslDoOptions (
BOOLEAN IsResponseFile)
{
int j;
+ ACPI_STATUS Status;
/* Get the command line options */
@@ -554,7 +555,12 @@ AslDoOptions (
case 'e':
- AcpiDmAddToExternalFileList (AcpiGbl_Optarg);
+ Status = AcpiDmAddToExternalFileList (AcpiGbl_Optarg);
+ if (ACPI_FAILURE (Status))
+ {
+ printf ("Could not add %s to external list\n", AcpiGbl_Optarg);
+ return (-1);
+ }
break;
@@ -601,7 +607,6 @@ AslDoOptions (
printf ("Unknown option: -h%s\n", AcpiGbl_Optarg);
return (-1);
}
- break;
case 'I': /* Add an include file search directory */
@@ -891,6 +896,7 @@ AslCommandLine (
char **argv)
{
int BadCommandLine = 0;
+ ACPI_STATUS Status;
/* Minimum command line contains at least the command and an input file */
@@ -908,7 +914,11 @@ AslCommandLine (
if (Gbl_DoTemplates)
{
- DtCreateTemplates (Gbl_TemplateSignature);
+ Status = DtCreateTemplates (Gbl_TemplateSignature);
+ if (ACPI_FAILURE (Status))
+ {
+ exit (-1);
+ }
exit (1);
}
Modified: head/sys/contrib/dev/acpica/compiler/aslopcodes.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslopcodes.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslopcodes.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -592,9 +592,9 @@ OpcDoEisaId (
/* Create ID big-endian first (bits are contiguous) */
BigEndianId =
- (UINT32) (InString[0] - 0x40) << 26 |
- (UINT32) (InString[1] - 0x40) << 21 |
- (UINT32) (InString[2] - 0x40) << 16 |
+ (UINT32) ((UINT8) (InString[0] - 0x40)) << 26 |
+ (UINT32) ((UINT8) (InString[1] - 0x40)) << 21 |
+ (UINT32) ((UINT8) (InString[2] - 0x40)) << 16 |
(UtHexCharToValue (InString[3])) << 12 |
(UtHexCharToValue (InString[4])) << 8 |
Modified: head/sys/contrib/dev/acpica/compiler/aslpredef.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslpredef.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslpredef.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -117,8 +117,6 @@
#include <contrib/dev/acpica/compiler/aslcompiler.h>
#include "aslcompiler.y.h"
-#include <contrib/dev/acpica/include/amlcode.h>
-#include <contrib/dev/acpica/include/acparser.h>
#include <contrib/dev/acpica/include/acpredef.h>
Modified: head/sys/contrib/dev/acpica/compiler/aslrestype1.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslrestype1.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslrestype1.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -224,7 +224,6 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *MinOp = NULL;
ACPI_PARSE_OBJECT *MaxOp = NULL;
ACPI_PARSE_OBJECT *LengthOp = NULL;
- ACPI_PARSE_OBJECT *AlignOp = NULL;
ASL_RESOURCE_NODE *Rnode;
UINT32 i;
@@ -270,7 +269,6 @@ RsDoMemory24Descriptor (
Descriptor->Memory24.Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
RsCreateByteField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Alignment));
- AlignOp = InitializerOp;
break;
case 4: /* Length */
Modified: head/sys/contrib/dev/acpica/compiler/aslrestype2d.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslrestype2d.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslrestype2d.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -347,10 +347,10 @@ RsDoDwordIoDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
- Descriptor->Address32.Minimum,
- Descriptor->Address32.Maximum,
- Descriptor->Address32.AddressLength,
- Descriptor->Address32.Granularity,
+ (UINT64) Descriptor->Address32.Minimum,
+ (UINT64) Descriptor->Address32.Maximum,
+ (UINT64) Descriptor->Address32.AddressLength,
+ (UINT64) Descriptor->Address32.Granularity,
Descriptor->Address32.Flags,
MinOp, MaxOp, LengthOp, GranOp);
@@ -583,10 +583,10 @@ RsDoDwordMemoryDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
- Descriptor->Address32.Minimum,
- Descriptor->Address32.Maximum,
- Descriptor->Address32.AddressLength,
- Descriptor->Address32.Granularity,
+ (UINT64) Descriptor->Address32.Minimum,
+ (UINT64) Descriptor->Address32.Maximum,
+ (UINT64) Descriptor->Address32.AddressLength,
+ (UINT64) Descriptor->Address32.Granularity,
Descriptor->Address32.Flags,
MinOp, MaxOp, LengthOp, GranOp);
@@ -801,10 +801,10 @@ RsDoDwordSpaceDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
- Descriptor->Address32.Minimum,
- Descriptor->Address32.Maximum,
- Descriptor->Address32.AddressLength,
- Descriptor->Address32.Granularity,
+ (UINT64) Descriptor->Address32.Minimum,
+ (UINT64) Descriptor->Address32.Maximum,
+ (UINT64) Descriptor->Address32.AddressLength,
+ (UINT64) Descriptor->Address32.Granularity,
Descriptor->Address32.Flags,
MinOp, MaxOp, LengthOp, GranOp);
Modified: head/sys/contrib/dev/acpica/compiler/aslrestype2e.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslrestype2e.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslrestype2e.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -116,7 +116,6 @@
#include <contrib/dev/acpica/compiler/aslcompiler.h>
-#include "aslcompiler.y.h"
#define _COMPONENT ACPI_COMPILER
ACPI_MODULE_NAME ("aslrestype2e")
Modified: head/sys/contrib/dev/acpica/compiler/aslrestype2w.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslrestype2w.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslrestype2w.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -338,10 +338,10 @@ RsDoWordIoDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
- Descriptor->Address16.Minimum,
- Descriptor->Address16.Maximum,
- Descriptor->Address16.AddressLength,
- Descriptor->Address16.Granularity,
+ (UINT64) Descriptor->Address16.Minimum,
+ (UINT64) Descriptor->Address16.Maximum,
+ (UINT64) Descriptor->Address16.AddressLength,
+ (UINT64) Descriptor->Address16.Granularity,
Descriptor->Address16.Flags,
MinOp, MaxOp, LengthOp, GranOp);
@@ -544,10 +544,10 @@ RsDoWordBusNumberDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
- Descriptor->Address16.Minimum,
- Descriptor->Address16.Maximum,
- Descriptor->Address16.AddressLength,
- Descriptor->Address16.Granularity,
+ (UINT64) Descriptor->Address16.Minimum,
+ (UINT64) Descriptor->Address16.Maximum,
+ (UINT64) Descriptor->Address16.AddressLength,
+ (UINT64) Descriptor->Address16.Granularity,
Descriptor->Address16.Flags,
MinOp, MaxOp, LengthOp, GranOp);
@@ -761,10 +761,10 @@ RsDoWordSpaceDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
- Descriptor->Address16.Minimum,
- Descriptor->Address16.Maximum,
- Descriptor->Address16.AddressLength,
- Descriptor->Address16.Granularity,
+ (UINT64) Descriptor->Address16.Minimum,
+ (UINT64) Descriptor->Address16.Maximum,
+ (UINT64) Descriptor->Address16.AddressLength,
+ (UINT64) Descriptor->Address16.Granularity,
Descriptor->Address16.Flags,
MinOp, MaxOp, LengthOp, GranOp);
Modified: head/sys/contrib/dev/acpica/compiler/aslstartup.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/aslstartup.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/aslstartup.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -124,9 +124,8 @@
#define ASL_MAX_FILES 256
-char *FileList[ASL_MAX_FILES];
-int FileCount;
-BOOLEAN AslToFile = TRUE;
+static char *FileList[ASL_MAX_FILES];
+static BOOLEAN AslToFile = TRUE;
/* Local prototypes */
@@ -136,7 +135,7 @@ AsDoWildcard (
char *DirectoryPathname,
char *FileSpecifier);
-UINT8
+static UINT8
AslDetectSourceFileType (
ASL_FILE_INFO *Info);
@@ -210,6 +209,7 @@ AsDoWildcard (
#ifdef WIN32
void *DirInfo;
char *Filename;
+ int FileCount;
FileCount = 0;
@@ -277,7 +277,7 @@ AsDoWildcard (
*
******************************************************************************/
-UINT8
+static UINT8
AslDetectSourceFileType (
ASL_FILE_INFO *Info)
{
@@ -397,7 +397,7 @@ AslDoOneFile (
/* Shutdown compiler and ACPICA subsystem */
AeClearErrorLog ();
- AcpiTerminate ();
+ (void) AcpiTerminate ();
/*
* Gbl_Files[ASL_FILE_INPUT].Filename was replaced with the
@@ -487,7 +487,7 @@ AslDoOneFile (
}
Status = CmDoCompile ();
- AcpiTerminate ();
+ (void) AcpiTerminate ();
/*
* Return non-zero exit code if there have been errors, unless the
@@ -533,7 +533,7 @@ AslDoOnePathname (
ASL_PATHNAME_CALLBACK PathCallback)
{
ACPI_STATUS Status = AE_OK;
- char **FileList;
+ char **WildcardList;
char *Filename;
char *FullPathname;
@@ -548,16 +548,16 @@ AslDoOnePathname (
/* Expand possible wildcard into a file list (Windows/DOS only) */
- FileList = AsDoWildcard (Gbl_DirectoryPath, Filename);
- while (*FileList)
+ WildcardList = AsDoWildcard (Gbl_DirectoryPath, Filename);
+ while (*WildcardList)
{
FullPathname = ACPI_ALLOCATE (
- strlen (Gbl_DirectoryPath) + strlen (*FileList) + 1);
+ strlen (Gbl_DirectoryPath) + strlen (*WildcardList) + 1);
/* Construct a full path to the file */
strcpy (FullPathname, Gbl_DirectoryPath);
- strcat (FullPathname, *FileList);
+ strcat (FullPathname, *WildcardList);
/*
* If -p not specified, we will use the input filename as the
@@ -573,9 +573,9 @@ AslDoOnePathname (
Status |= (*PathCallback) (FullPathname);
ACPI_FREE (FullPathname);
- ACPI_FREE (*FileList);
- *FileList = NULL;
- FileList++;
+ ACPI_FREE (*WildcardList);
+ *WildcardList = NULL;
+ WildcardList++;
}
ACPI_FREE (Gbl_DirectoryPath);
Modified: head/sys/contrib/dev/acpica/compiler/dtcompile.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/dtcompile.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/dtcompile.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -127,7 +127,7 @@ static char VersionStrin
/* Local prototypes */
-static void
+static ACPI_STATUS
DtInitialize (
void);
@@ -166,7 +166,12 @@ DtDoCompile (
/* Initialize globals */
- DtInitialize ();
+ Status = DtInitialize ();
+ if (ACPI_FAILURE (Status))
+ {
+ printf ("Error during compiler initialization, 0x%X\n", Status);
+ return (Status);
+ }
/*
* Scan the input file (file is already open) and
@@ -236,26 +241,38 @@ CleanupAndExit:
*
* PARAMETERS: None
*
- * RETURN: None
+ * RETURN: Status
*
* DESCRIPTION: Initialize data table compiler globals. Enables multiple
* compiles per invocation.
*
*****************************************************************************/
-static void
+static ACPI_STATUS
DtInitialize (
void)
{
+ ACPI_STATUS Status;
- AcpiOsInitialize ();
- AcpiUtInitGlobals ();
+
+ Status = AcpiOsInitialize ();
+ if (ACPI_FAILURE (Status))
+ {
+ return (Status);
+ }
+
+ Status = AcpiUtInitGlobals ();
+ if (ACPI_FAILURE (Status))
+ {
+ return (Status);
+ }
Gbl_FieldList = NULL;
Gbl_RootTable = NULL;
Gbl_SubtableStack = NULL;
sprintf (VersionString, "%X", (UINT32) ACPI_CA_VERSION);
+ return (AE_OK);
}
Modified: head/sys/contrib/dev/acpica/compiler/dtio.c
==============================================================================
--- head/sys/contrib/dev/acpica/compiler/dtio.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/compiler/dtio.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -158,7 +158,7 @@ DtWriteBinary (
#define DT_SLASH_SLASH_COMMENT 4
#define DT_END_COMMENT 5
-UINT32 Gbl_NextLineOffset;
+static UINT32 Gbl_NextLineOffset;
/******************************************************************************
Modified: head/sys/contrib/dev/acpica/debugger/dbexec.c
==============================================================================
--- head/sys/contrib/dev/acpica/debugger/dbexec.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/debugger/dbexec.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -567,14 +567,12 @@ AcpiDbMethodThread (
if (Info->InitArgs)
{
AcpiDbUInt32ToHexString (Info->NumCreated, Info->IndexOfThreadStr);
- AcpiDbUInt32ToHexString (ACPI_TO_INTEGER (AcpiOsGetThreadId ()),
- Info->IdOfThreadStr);
+ AcpiDbUInt32ToHexString ((UINT32) AcpiOsGetThreadId (), Info->IdOfThreadStr);
}
if (Info->Threads && (Info->NumCreated < Info->NumThreads))
{
- Info->Threads[Info->NumCreated++] =
- ACPI_TO_INTEGER (AcpiOsGetThreadId());
+ Info->Threads[Info->NumCreated++] = AcpiOsGetThreadId();
}
LocalInfo = *Info;
@@ -722,8 +720,8 @@ AcpiDbCreateExecutionThreads (
/* Array to store IDs of threads */
AcpiGbl_DbMethodInfo.NumThreads = NumThreads;
- Size = 4 * AcpiGbl_DbMethodInfo.NumThreads;
- AcpiGbl_DbMethodInfo.Threads = (UINT32 *) AcpiOsAllocate (Size);
+ Size = sizeof (ACPI_THREAD_ID) * AcpiGbl_DbMethodInfo.NumThreads;
+ AcpiGbl_DbMethodInfo.Threads = AcpiOsAllocate (Size);
if (AcpiGbl_DbMethodInfo.Threads == NULL)
{
AcpiOsPrintf ("No memory for thread IDs array\n");
Modified: head/sys/contrib/dev/acpica/events/evrgnini.c
==============================================================================
--- head/sys/contrib/dev/acpica/events/evrgnini.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/events/evrgnini.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -395,8 +395,8 @@ AcpiEvPciConfigRegionSetup (
}
/*
- * Get the PCI device and function numbers from the _ADR object contained
- * in the parent's scope.
+ * Get the PCI device and function numbers from the _ADR object
+ * contained in the parent's scope.
*/
Status = AcpiUtEvaluateNumericObject (METHOD_NAME__ADR,
PciDeviceNode, &PciValue);
@@ -429,9 +429,14 @@ AcpiEvPciConfigRegionSetup (
PciId->Bus = ACPI_LOWORD (PciValue);
}
- /* Complete this device's PciId */
+ /* Complete/update the PCI ID for this device */
- AcpiOsDerivePciId (PciRootNode, RegionObj->Region.Node, &PciId);
+ Status = AcpiHwDerivePciId (PciId, PciRootNode, RegionObj->Region.Node);
+ if (ACPI_FAILURE (Status))
+ {
+ ACPI_FREE (PciId);
+ return_ACPI_STATUS (Status);
+ }
*RegionContext = PciId;
return_ACPI_STATUS (AE_OK);
Modified: head/sys/contrib/dev/acpica/executer/exmutex.c
==============================================================================
--- head/sys/contrib/dev/acpica/executer/exmutex.c Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/executer/exmutex.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -513,10 +513,10 @@ AcpiExReleaseMutex (
(ObjDesc != AcpiGbl_GlobalLockMutex))
{
ACPI_ERROR ((AE_INFO,
- "Thread %p cannot release Mutex [%4.4s] acquired by thread %p",
- ACPI_CAST_PTR (void, WalkState->Thread->ThreadId),
+ "Thread %u cannot release Mutex [%4.4s] acquired by thread %u",
+ (UINT32) WalkState->Thread->ThreadId,
AcpiUtGetNodeName (ObjDesc->Mutex.Node),
- ACPI_CAST_PTR (void, OwnerThread->ThreadId)));
+ (UINT32) OwnerThread->ThreadId));
return_ACPI_STATUS (AE_AML_NOT_OWNER);
}
Copied and modified: head/sys/contrib/dev/acpica/hardware/hwpci.c (from r212760, vendor-sys/acpica/dist/hardware/hwpci.c)
==============================================================================
--- vendor-sys/acpica/dist/hardware/hwpci.c Thu Sep 16 19:43:32 2010 (r212760, copy source)
+++ head/sys/contrib/dev/acpica/hardware/hwpci.c Thu Sep 16 20:08:00 2010 (r212761)
@@ -115,8 +115,8 @@
#define __HWPCI_C__
-#include "acpi.h"
-#include "accommon.h"
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
#define _COMPONENT ACPI_NAMESPACE
Modified: head/sys/contrib/dev/acpica/include/acglobal.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/acglobal.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/include/acglobal.h Thu Sep 16 20:08:00 2010 (r212761)
@@ -214,6 +214,7 @@ ACPI_TABLE_FADT AcpiGbl_FADT
UINT32 AcpiCurrentGpeCount;
UINT32 AcpiGbl_TraceFlags;
ACPI_NAME AcpiGbl_TraceMethodName;
+BOOLEAN AcpiGbl_SystemAwakeAndRunning;
#endif
@@ -334,7 +335,6 @@ ACPI_EXTERN UINT8
ACPI_EXTERN BOOLEAN AcpiGbl_StepToNextCall;
ACPI_EXTERN BOOLEAN AcpiGbl_AcpiHardwarePresent;
ACPI_EXTERN BOOLEAN AcpiGbl_EventsInitialized;
-ACPI_EXTERN BOOLEAN AcpiGbl_SystemAwakeAndRunning;
ACPI_EXTERN UINT8 AcpiGbl_OsiData;
ACPI_EXTERN ACPI_INTERFACE_INFO *AcpiGbl_SupportedInterfaces;
Modified: head/sys/contrib/dev/acpica/include/achware.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/achware.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/include/achware.h Thu Sep 16 20:08:00 2010 (r212761)
@@ -251,6 +251,16 @@ AcpiHwEnableRuntimeGpeBlock (
/*
+ * hwpci - PCI configuration support
+ */
+ACPI_STATUS
+AcpiHwDerivePciId (
+ ACPI_PCI_ID *PciId,
+ ACPI_HANDLE RootPciDevice,
+ ACPI_HANDLE PciRegion);
+
+
+/*
* hwtimer - ACPI Timer prototypes
*/
ACPI_STATUS
Modified: head/sys/contrib/dev/acpica/include/aclocal.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/aclocal.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/include/aclocal.h Thu Sep 16 20:08:00 2010 (r212761)
@@ -1270,7 +1270,7 @@ typedef struct acpi_db_method_info
ACPI_HANDLE MainThreadGate;
ACPI_HANDLE ThreadCompleteGate;
ACPI_HANDLE InfoGate;
- UINT32 *Threads;
+ ACPI_THREAD_ID *Threads;
UINT32 NumThreads;
UINT32 NumCreated;
UINT32 NumCompleted;
Modified: head/sys/contrib/dev/acpica/include/acmacros.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/acmacros.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/include/acmacros.h Thu Sep 16 20:08:00 2010 (r212761)
@@ -400,8 +400,8 @@
* the plist contains a set of parens to allow variable-length lists.
* These macros are used for both the debug and non-debug versions of the code.
*/
-#define ACPI_ERROR_NAMESPACE(s, e) AcpiNsReportError (AE_INFO, s, e);
-#define ACPI_ERROR_METHOD(s, n, p, e) AcpiNsReportMethodError (AE_INFO, s, n, p, e);
+#define ACPI_ERROR_NAMESPACE(s, e) AcpiUtNamespaceError (AE_INFO, s, e);
+#define ACPI_ERROR_METHOD(s, n, p, e) AcpiUtMethodError (AE_INFO, s, n, p, e);
#define ACPI_WARN_PREDEFINED(plist) AcpiUtPredefinedWarning plist
#define ACPI_INFO_PREDEFINED(plist) AcpiUtPredefinedInfo plist
Modified: head/sys/contrib/dev/acpica/include/acnamesp.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/acnamesp.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/include/acnamesp.h Thu Sep 16 20:08:00 2010 (r212761)
@@ -514,22 +514,6 @@ AcpiNsLocal (
ACPI_OBJECT_TYPE Type);
void
-AcpiNsReportError (
- const char *ModuleName,
- UINT32 LineNumber,
- const char *InternalName,
- ACPI_STATUS LookupStatus);
-
-void
-AcpiNsReportMethodError (
- const char *ModuleName,
- UINT32 LineNumber,
- const char *Message,
- ACPI_NAMESPACE_NODE *Node,
- const char *Path,
- ACPI_STATUS LookupStatus);
-
-void
AcpiNsPrintNodePathname (
ACPI_NAMESPACE_NODE *Node,
const char *Msg);
Modified: head/sys/contrib/dev/acpica/include/acpiosxf.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/acpiosxf.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/include/acpiosxf.h Thu Sep 16 20:08:00 2010 (r212761)
@@ -406,16 +406,6 @@ AcpiOsWritePciConfiguration (
/*
- * Interim function needed for PCI IRQ routing
- */
-void
-AcpiOsDerivePciId(
- ACPI_HANDLE Device,
- ACPI_HANDLE Region,
- ACPI_PCI_ID **PciId);
-
-
-/*
* Miscellaneous
*/
BOOLEAN
Modified: head/sys/contrib/dev/acpica/include/acpixf.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/acpixf.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/include/acpixf.h Thu Sep 16 20:08:00 2010 (r212761)
@@ -120,7 +120,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20100806
+#define ACPI_CA_VERSION 0x20100915
#include <contrib/dev/acpica/include/actypes.h>
#include <contrib/dev/acpica/include/actbl.h>
@@ -130,6 +130,7 @@
*/
extern UINT32 AcpiCurrentGpeCount;
extern ACPI_TABLE_FADT AcpiGbl_FADT;
+extern BOOLEAN AcpiGbl_SystemAwakeAndRunning;
/* Runtime configuration of debug print levels */
Modified: head/sys/contrib/dev/acpica/include/actypes.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/actypes.h Thu Sep 16 19:43:32 2010 (r212760)
+++ head/sys/contrib/dev/acpica/include/actypes.h Thu Sep 16 20:08:00 2010 (r212761)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list