aboutsummaryrefslogtreecommitdiff
path: root/source/tools/acpihelp/ahdecode.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2013-04-04 21:18:57 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2013-04-04 21:18:57 +0000
commit0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8 (patch)
tree2d060ed4fedfc9aace2e673176570faa8ae1d376 /source/tools/acpihelp/ahdecode.c
parent6bb10c5e2fa82c104e57c7468335930ba9e47d4f (diff)
downloadsrc-0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8.tar.gz
src-0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8.zip
Import ACPICA 20130328.vendor/acpica/20130328
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=249109 svn path=/vendor-sys/acpica/20130328/; revision=249110; tag=vendor/acpica/20130328
Diffstat (limited to 'source/tools/acpihelp/ahdecode.c')
-rw-r--r--source/tools/acpihelp/ahdecode.c97
1 files changed, 31 insertions, 66 deletions
diff --git a/source/tools/acpihelp/ahdecode.c b/source/tools/acpihelp/ahdecode.c
index 633b0db0a412..38e2b7e2378e 100644
--- a/source/tools/acpihelp/ahdecode.c
+++ b/source/tools/acpihelp/ahdecode.c
@@ -41,9 +41,10 @@
* POSSIBILITY OF SUCH DAMAGES.
*/
-#include "acpihelp.h"
-
#define ACPI_CREATE_PREDEFINED_TABLE
+#define ACPI_CREATE_RESOURCE_TABLE
+
+#include "acpihelp.h"
#include "acpredef.h"
@@ -93,15 +94,6 @@ static const AH_DEVICE_ID AhDeviceIds[] =
static char Gbl_Buffer[BUFFER_LENGTH];
static char Gbl_LineBuffer[LINE_BUFFER_LENGTH];
-static const char *AcpiRtypeNames[] =
-{
- "/Integer",
- "/String",
- "/Buffer",
- "/Package",
- "/Reference",
-};
-
/* Local prototypes */
@@ -115,9 +107,8 @@ AhDisplayPredefinedInfo (
char *Name);
static void
-AhGetExpectedTypes (
- char *Buffer,
- UINT32 ExpectedBtypes);
+AhDisplayResourceName (
+ const ACPI_PREDEFINED_INFO *ThisName);
static void
AhDisplayAmlOpcode (
@@ -279,83 +270,57 @@ AhDisplayPredefinedName (
static void
AhDisplayPredefinedInfo (
- char *Name)
+ char *Name)
{
const ACPI_PREDEFINED_INFO *ThisName;
- BOOLEAN Matched;
- UINT32 i;
- /* Find/display only the exact input name */
+ /* NOTE: we check both tables always because there are some dupes */
- for (ThisName = PredefinedNames; ThisName->Info.Name[0]; ThisName++)
- {
- Matched = TRUE;
- for (i = 0; i < ACPI_NAME_SIZE; i++)
- {
- if (ThisName->Info.Name[i] != Name[i])
- {
- Matched = FALSE;
- break;
- }
- }
+ /* Check against the predefine methods first */
- if (Matched)
- {
- AhGetExpectedTypes (Gbl_Buffer, ThisName->Info.ExpectedBtypes);
+ ThisName = AcpiUtMatchPredefinedMethod (Name);
+ if (ThisName)
+ {
+ AcpiUtDisplayPredefinedMethod (Gbl_Buffer, ThisName, TRUE);
+ }
- printf ("%*s%4.4s has %u arguments, returns: %s\n",
- 6, " ", ThisName->Info.Name, ThisName->Info.ParamCount,
- ThisName->Info.ExpectedBtypes ? Gbl_Buffer : "-Nothing-");
- return;
- }
+ /* Check against the predefined resource descriptor names */
- if (ThisName->Info.ExpectedBtypes & ACPI_RTYPE_PACKAGE)
- {
- ThisName++;
- }
+ ThisName = AcpiUtMatchResourceName (Name);
+ if (ThisName)
+ {
+ AhDisplayResourceName (ThisName);
}
}
/*******************************************************************************
*
- * FUNCTION: AhGetExpectedTypes
+ * FUNCTION: AhDisplayResourceName
*
- * PARAMETERS: Buffer - Where the formatted string is returned
- * ExpectedBTypes - Bitfield of expected data types
+ * PARAMETERS: ThisName - Entry in the predefined method/name table
*
- * RETURN: Formatted string in Buffer.
+ * RETURN: None
*
- * DESCRIPTION: Format the expected object types into a printable string.
+ * DESCRIPTION: Display information about a resource descriptor name.
*
******************************************************************************/
static void
-AhGetExpectedTypes (
- char *Buffer,
- UINT32 ExpectedBtypes)
+AhDisplayResourceName (
+ const ACPI_PREDEFINED_INFO *ThisName)
{
- UINT32 ThisRtype;
- UINT32 i;
- UINT32 j;
-
+ UINT32 NumTypes;
- j = 1;
- Buffer[0] = 0;
- ThisRtype = ACPI_RTYPE_INTEGER;
- for (i = 0; i < ACPI_NUM_RTYPES; i++)
- {
- /* If one of the expected types, concatenate the name of this type */
+ NumTypes = AcpiUtGetResourceBitWidth (Gbl_Buffer,
+ ThisName->Info.ArgumentList);
- if (ExpectedBtypes & ThisRtype)
- {
- strcat (Buffer, &AcpiRtypeNames[i][j]);
- j = 0; /* Use name separator from now on */
- }
- ThisRtype <<= 1; /* Next Rtype */
- }
+ printf (" %4.4s resource descriptor field is %s bits wide%s\n",
+ ThisName->Info.Name,
+ Gbl_Buffer,
+ (NumTypes > 1) ? " (depending on descriptor type)" : "");
}