diff options
Diffstat (limited to 'source/tools/examples/examples.c')
| -rw-r--r-- | source/tools/examples/examples.c | 34 | 
1 files changed, 18 insertions, 16 deletions
diff --git a/source/tools/examples/examples.c b/source/tools/examples/examples.c index 98d7bbcb908b..4b1d9fcc107f 100644 --- a/source/tools/examples/examples.c +++ b/source/tools/examples/examples.c @@ -176,6 +176,7 @@ InitializeFullAcpica (void)      /* Initialize the ACPICA subsystem */ +    AcpiGbl_OverrideDefaultRegionHandlers = TRUE;      Status = AcpiInitializeSubsystem ();      if (ACPI_FAILURE (Status))      { @@ -194,15 +195,6 @@ InitializeFullAcpica (void)          return (Status);      } -    /* Create the ACPI namespace from ACPI tables */ - -    Status = AcpiLoadTables (); -    if (ACPI_FAILURE (Status)) -    { -        ACPI_EXCEPTION ((AE_INFO, Status, "While loading ACPI tables")); -        return (Status); -    } -      /* Install local handlers */      Status = InstallHandlers (); @@ -221,6 +213,15 @@ InitializeFullAcpica (void)          return (Status);      } +    /* Create the ACPI namespace from ACPI tables */ + +    Status = AcpiLoadTables (); +    if (ACPI_FAILURE (Status)) +    { +        ACPI_EXCEPTION ((AE_INFO, Status, "While loading ACPI tables")); +        return (Status); +    } +      /* Complete the ACPI namespace object initialization */      Status = AcpiInitializeObjects (ACPI_FULL_INITIALIZATION); @@ -283,6 +284,7 @@ InitializeAcpi (      /* Initialize the ACPICA subsystem */ +    AcpiGbl_OverrideDefaultRegionHandlers = TRUE;      Status = AcpiInitializeSubsystem ();      if (ACPI_FAILURE (Status))      { @@ -297,26 +299,26 @@ InitializeAcpi (          return (Status);      } -    /* Create the ACPI namespace from ACPI tables */ +    /* Install local handlers */ -    Status = AcpiLoadTables (); +    Status = InstallHandlers ();      if (ACPI_FAILURE (Status))      { +        ACPI_EXCEPTION ((AE_INFO, Status, "While installing handlers"));          return (Status);      } -    /* Install local handlers */ +    /* Initialize the ACPI hardware */ -    Status = InstallHandlers (); +    Status = AcpiEnableSubsystem (ACPI_FULL_INITIALIZATION);      if (ACPI_FAILURE (Status))      { -        ACPI_EXCEPTION ((AE_INFO, Status, "While installing handlers"));          return (Status);      } -    /* Initialize the ACPI hardware */ +    /* Create the ACPI namespace from ACPI tables */ -    Status = AcpiEnableSubsystem (ACPI_FULL_INITIALIZATION); +    Status = AcpiLoadTables ();      if (ACPI_FAILURE (Status))      {          return (Status);  | 
