d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check in unmodified files off the vendor branch.

Browse Source
This commit is contained in:
njl 2004-04-14 02:14:51 +00:00
parent 565e13e588
commit fbcf6e9700
3 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/contrib/dev/acpica/acconfig.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
* $Revision: 150 $
* $Revision: 152 $
*
*****************************************************************************/
@ -137,7 +137,7 @@
/* Version string */
#define ACPI_CA_VERSION 0x20040311
#define ACPI_CA_VERSION 0x20040402
/* Maximum objects in the various object caches */

3
sys/contrib/dev/acpica/acutils.h
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
* $Revision: 160 $
* $Revision: 161 $
*
*****************************************************************************/
@ -545,6 +545,7 @@ AcpiUtDeleteInternalObjectList (
#define METHOD_NAME__PRT "_PRT"
#define METHOD_NAME__CRS "_CRS"
#define METHOD_NAME__PRS "_PRS"
#define METHOD_NAME__PRW "_PRW"
ACPI_STATUS

64
sys/contrib/dev/acpica/utglobal.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: utglobal - Global variables for the ACPI subsystem
* $Revision: 194 $
* $Revision: 198 $
*
*****************************************************************************/
@ -334,14 +334,15 @@ const UINT8 AcpiGbl_NsProperties[] =
ACPI_NS_NORMAL, /* 19 IndexField */
ACPI_NS_NORMAL, /* 20 Reference */
ACPI_NS_NORMAL, /* 21 Alias */
ACPI_NS_NORMAL, /* 22 Notify */
ACPI_NS_NORMAL, /* 23 Address Handler */
ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL, /* 24 Resource Desc */
ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL, /* 25 Resource Field */
ACPI_NS_NEWSCOPE, /* 26 Scope */
ACPI_NS_NORMAL, /* 27 Extra */
ACPI_NS_NORMAL, /* 28 Data */
ACPI_NS_NORMAL /* 29 Invalid */
ACPI_NS_NORMAL, /* 22 MethodAlias */
ACPI_NS_NORMAL, /* 23 Notify */
ACPI_NS_NORMAL, /* 24 Address Handler */
ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL, /* 25 Resource Desc */
ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL, /* 26 Resource Field */
ACPI_NS_NEWSCOPE, /* 27 Scope */
ACPI_NS_NORMAL, /* 28 Extra */
ACPI_NS_NORMAL, /* 29 Data */
ACPI_NS_NORMAL /* 30 Invalid */
};
@ -582,14 +583,15 @@ static const char *AcpiGbl_NsTypeNames[] = /* printable names of AC
/* 19 */ "IndexField",
/* 20 */ "Reference",
/* 21 */ "Alias",
/* 22 */ "Notify",
/* 23 */ "AddrHandler",
/* 24 */ "ResourceDesc",
/* 25 */ "ResourceFld",
/* 26 */ "Scope",
/* 27 */ "Extra",
/* 28 */ "Data",
/* 39 */ "Invalid"
/* 22 */ "MethodAlias",
/* 23 */ "Notify",
/* 24 */ "AddrHandler",
/* 25 */ "ResourceDesc",
/* 26 */ "ResourceFld",
/* 27 */ "Scope",
/* 28 */ "Extra",
/* 29 */ "Data",
/* 30 */ "Invalid"
};
@ -637,26 +639,40 @@ char *
AcpiUtGetNodeName (
void *Object)
{
ACPI_NAMESPACE_NODE *Node;
ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) Object;
/* Must return a string of exactly 4 characters == ACPI_NAME_SIZE */
if (!Object)
{
return ("NULL NODE");
return ("NULL");
}
Node = (ACPI_NAMESPACE_NODE *) Object;
/* Check for Root node */
if ((Object == ACPI_ROOT_OBJECT) ||
(Object == AcpiGbl_RootNode))
{
return ("\"\\\" ");
}
/* Descriptor must be a namespace node */
if (Node->Descriptor != ACPI_DESC_TYPE_NAMED)
{
return ("****");
return ("####");
}
/* Name must be a valid ACPI name */
if (!AcpiUtValidAcpiName (* (UINT32 *) Node->Name.Ascii))
{
return ("----");
return ("????");
}
/* Return the name */
return (Node->Name.Ascii);
}
@ -859,10 +875,6 @@ AcpiUtInitGlobals (
ACPI_FUNCTION_TRACE ("UtInitGlobals");
/* Runtime configuration */
AcpiGbl_CreateOsiMethod = TRUE;
AcpiGbl_AllMethodsSerialized = FALSE;
/* Memory allocation and cache lists */