8 files changed, 2 insertions, 105 deletions
diff --git a/source/compiler/aslanalyze.c b/source/compiler/aslanalyze.c
index 940f220b940ab..112c1213986d3 100644
--- a/source/compiler/aslanalyze.c
+++ b/source/compiler/aslanalyze.c
@@ -569,51 +569,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);
-}
diff --git a/source/compiler/aslcompiler.h b/source/compiler/aslcompiler.h
index 1f94245a44767..40dcd692784c6 100644
--- a/source/compiler/aslcompiler.h
+++ b/source/compiler/aslcompiler.h
@@ -275,11 +275,6 @@ void
 ApCheckRegMethod (
     ACPI_PARSE_OBJECT       *Op);
 
-BOOLEAN
-ApFindNameInScope (
-    char                    *Name,
-    ACPI_PARSE_OBJECT       *Op);
-
 
 /*
  * aslerror - error handling/reporting
@@ -350,10 +345,6 @@ void
 AeClearErrorLog (
     void);
 
-ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer (
-    void);
-
 
 /*
  * asllisting - generate all "listing" type files
diff --git a/source/compiler/aslmain.c b/source/compiler/aslmain.c
index 6e92d53d54e54..3034281b3dcfc 100644
--- a/source/compiler/aslmain.c
+++ b/source/compiler/aslmain.c
@@ -341,6 +341,7 @@ main (
         return (-1);
     }
 
+    AcpiOsInitialize ();
     ACPI_DEBUG_INITIALIZE (); /* For debug version only */
 
     /* Initialize preprocessor and compiler before command line processing */
diff --git a/source/compiler/aslmessages.c b/source/compiler/aslmessages.c
index c9d196f17022a..926bc465cb689 100644
--- a/source/compiler/aslmessages.c
+++ b/source/compiler/aslmessages.c
@@ -233,7 +233,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 */
diff --git a/source/compiler/aslmessages.h b/source/compiler/aslmessages.h
index 48ebcbfc321fe..851d46c59ca14 100644
--- a/source/compiler/aslmessages.h
+++ b/source/compiler/aslmessages.h
@@ -235,7 +235,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 */
 
diff --git a/source/compiler/aslmethod.c b/source/compiler/aslmethod.c
index 9b0a7a1a13a85..a9b0640827573 100644
--- a/source/compiler/aslmethod.c
+++ b/source/compiler/aslmethod.c
@@ -108,17 +108,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;
@@ -424,15 +413,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:
diff --git a/source/compiler/asloptions.c b/source/compiler/asloptions.c
index 8d52826f1a91e..039fc7d3d48d0 100644
--- a/source/compiler/asloptions.c
+++ b/source/compiler/asloptions.c
@@ -168,7 +168,7 @@ AslDoOptions (
 
     /* Get the command line options */
 
-    while ((j = AcpiGetopt (argc, argv, ASL_SUPPORTED_OPTIONS)) != EOF) switch (j)
+    while ((j = AcpiGetopt (argc, argv, ASL_SUPPORTED_OPTIONS)) != ACPI_OPT_END) switch (j)
     {
     case '@':   /* Begin a response file */
 
diff --git a/source/compiler/aslstubs.c b/source/compiler/aslstubs.c
index 589edb21c1a3c..6bbb89ac34f81 100644
--- a/source/compiler/aslstubs.c
+++ b/source/compiler/aslstubs.c
@@ -57,13 +57,6 @@
  * Things like Events, Global Lock, etc. are not used
  * by the compiler, so they are stubbed out here.
  */
-ACPI_PHYSICAL_ADDRESS
-AeLocalGetRootPointer (
-    void)
-{
-    return (0);
-}
-
 void
 AcpiNsExecModuleCodeList (
     void)
@@ -232,21 +225,3 @@ AcpiTbFindTable (
 {
     return (AE_SUPPORT);
 }
-
-/* OSL interfaces */
-
-ACPI_THREAD_ID
-AcpiOsGetThreadId (
-    void)
-{
-    return (1);
-}
-
-ACPI_STATUS
-AcpiOsExecute (
-    ACPI_EXECUTE_TYPE       Type,
-    ACPI_OSD_EXEC_CALLBACK  Function,
-    void                    *Context)
-{
-    return (AE_SUPPORT);
-}