Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Namespace: Remove _PRP method support. #36

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion source/common/ahpredef.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ const AH_PREDEFINED_NAME AslPredefinedInfo[] =
AH_PREDEF ("_PR3", "Power Resources for D3hot", "Returns a list of dependent power resources to enter state D3hot"),
AH_PREDEF ("_PRE", "Power Resources for Enumeration", "Returns a list of dependent power resources to enumerate devices on a bus"),
AH_PREDEF ("_PRL", "Power Source Redundancy List", "Returns a list of power source devices in the same redundancy grouping"),
AH_PREDEF ("_PRP", "Device Properties", "Returns a list of device property information"),
AH_PREDEF ("_PRS", "Possible Resource Settings", "Returns a list of a device's possible resource settings"),
AH_PREDEF ("_PRT", "PCI Routing Table", "Returns a list of PCI interrupt mappings"),
AH_PREDEF ("_PRW", "Power Resources for Wake", "Returns a list of dependent power resources for waking"),
Expand Down
48 changes: 0 additions & 48 deletions source/compiler/aslanalyze.c
Original file line number Diff line number Diff line change
Expand Up @@ -641,51 +641,3 @@ ApCheckRegMethod (

AslError (ASL_WARNING, ASL_MSG_NO_REGION, Op, NULL);
}


/*******************************************************************************
*
* FUNCTION: ApFindNameInScope
*
* PARAMETERS: Name - Name to search for
* Op - Current parse op
*
* RETURN: TRUE if name found in the same scope as Op.
*
* DESCRIPTION: Determine if a name appears in the same scope as Op, as either
* a Method() or a Name().
*
******************************************************************************/

BOOLEAN
ApFindNameInScope (
char *Name,
ACPI_PARSE_OBJECT *Op)
{
ACPI_PARSE_OBJECT *Next;
ACPI_PARSE_OBJECT *Parent;


/* Get the start of the current scope */

Parent = Op->Asl.Parent;
Next = Parent->Asl.Child;

/* Search entire scope for a match to the name */

while (Next)
{
if ((Next->Asl.ParseOpcode == PARSEOP_METHOD) ||
(Next->Asl.ParseOpcode == PARSEOP_NAME))
{
if (ACPI_COMPARE_NAME (Name, Next->Asl.NameSeg))
{
return (TRUE);
}
}

Next = Next->Asl.Next;
}

return (FALSE);
}
5 changes: 0 additions & 5 deletions source/compiler/aslcompiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,6 @@ void
ApCheckRegMethod (
ACPI_PARSE_OBJECT *Op);

BOOLEAN
ApFindNameInScope (
char *Name,
ACPI_PARSE_OBJECT *Op);


/*
* aslerror - error handling/reporting
Expand Down
1 change: 0 additions & 1 deletion source/compiler/aslmessages.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ const char *AslCompilerMsgs [] =
/* ASL_MSG_WRITE */ "Could not write file",
/* ASL_MSG_RANGE */ "Constant out of range",
/* ASL_MSG_BUFFER_ALLOCATION */ "Could not allocate line buffer",
/* ASL_MSG_MISSING_DEPENDENCY */ "Missing dependency"
};

/* Table compiler */
Expand Down
1 change: 0 additions & 1 deletion source/compiler/aslmessages.h
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ typedef enum
ASL_MSG_WRITE,
ASL_MSG_RANGE,
ASL_MSG_BUFFER_ALLOCATION,
ASL_MSG_MISSING_DEPENDENCY,

/* These messages are used by the Data Table compiler only */

Expand Down
20 changes: 0 additions & 20 deletions source/compiler/aslmethod.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,6 @@ MtMethodAnalysisWalkBegin (

WalkInfo->MethodStack = MethodInfo;

/* Special handling for _PRP, must have a _HID also */

if (!ACPI_STRCMP (METHOD_NAME__PRP, Op->Asl.NameSeg))
{
if (!ApFindNameInScope (METHOD_NAME__HID, Op))
{
AslError (ASL_WARNING, ASL_MSG_MISSING_DEPENDENCY, Op,
"_PRP requires _HID in same scope");
}
}

/* Get the name node */

Next = Op->Asl.Child;
Expand Down Expand Up @@ -496,15 +485,6 @@ MtMethodAnalysisWalkBegin (
}
}

else if (!ACPI_STRCMP (METHOD_NAME__PRP, Op->Asl.NameSeg))
{
if (!ApFindNameInScope (METHOD_NAME__HID, Op))
{
AslError (ASL_WARNING, ASL_MSG_MISSING_DEPENDENCY, Op,
"_PRP requires _HID in same scope");
}
}

break;

default:
Expand Down
1 change: 0 additions & 1 deletion source/include/acnames.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
#define METHOD_NAME__HID "_HID"
#define METHOD_NAME__INI "_INI"
#define METHOD_NAME__PLD "_PLD"
#define METHOD_NAME__PRP "_PRP"
#define METHOD_NAME__PRS "_PRS"
#define METHOD_NAME__PRT "_PRT"
#define METHOD_NAME__PRW "_PRW"
Expand Down
6 changes: 0 additions & 6 deletions source/include/acpredef.h
Original file line number Diff line number Diff line change
Expand Up @@ -760,12 +760,6 @@ const ACPI_PREDEFINED_INFO AcpiGbl_PredefinedMethods[] =
METHOD_RETURNS (ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO (ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0,0,0),

{{"_PRP", METHOD_0ARGS,
METHOD_RETURNS (ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each: 1 Str, 1 Int/Str/Pkg */
PACKAGE_INFO (ACPI_PTYPE2, ACPI_RTYPE_STRING, 1,
ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING |
ACPI_RTYPE_PACKAGE | ACPI_RTYPE_REFERENCE, 1,0),

{{"_PRS", METHOD_0ARGS,
METHOD_RETURNS (ACPI_RTYPE_BUFFER)}},

Expand Down