4c4
< * $Revision: 1.17 $
---
> * $Revision: 1.28 $
12c12
< * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp.
---
> * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp.
121a122
> #include <contrib/dev/acpica/actables.h>
169c170
< ACPI_FUNCTION_NAME ("DsInitOneObject");
---
> ACPI_FUNCTION_ENTRY ();
176c177
< if (Node->OwnerId != Info->TableDesc->OwnerId)
---
> if (Node->OwnerId != Info->OwnerId)
194,197c195,197
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "Region %p [%4.4s] - Init failure, %s\n",
< ObjHandle, AcpiUtGetNodeName (ObjHandle),
< AcpiFormatException (Status)));
---
> ACPI_EXCEPTION ((AE_INFO, Status,
> "During Region initialization %p [%4.4s]",
> ObjHandle, AcpiUtGetNodeName (ObjHandle)));
206,240d205
< /*
< * Print a dot for each method unless we are going to print
< * the entire pathname
< */
< if (!(AcpiDbgLevel & ACPI_LV_INIT_NAMES))
< {
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "."));
< }
<
< /*
< * Set the execution data width (32 or 64) based upon the
< * revision number of the parent ACPI table.
< * TBD: This is really for possible future support of integer width
< * on a per-table basis. Currently, we just use a global for the width.
< */
< if (Info->TableDesc->Pointer->Revision == 1)
< {
< Node->Flags |= ANOBJ_DATA_WIDTH_32;
< }
<
< /*
< * Always parse methods to detect errors, we will delete
< * the parse tree below
< */
< Status = AcpiDsParseMethod (ObjHandle);
< if (ACPI_FAILURE (Status))
< {
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
< "\n+Method %p [%4.4s] - parse failure, %s\n",
< ObjHandle, AcpiUtGetNodeName (ObjHandle),
< AcpiFormatException (Status)));
<
< /* This parse failed, but we will continue parsing more methods */
< }
<
279c244
< ACPI_TABLE_DESC *TableDesc,
---
> ACPI_NATIVE_UINT TableIndex,
283a249,250
> ACPI_TABLE_HEADER *Table;
> ACPI_OWNER_ID OwnerId;
286c253
< ACPI_FUNCTION_TRACE ("DsInitializeObjects");
---
> ACPI_FUNCTION_TRACE (DsInitializeObjects);
288a256,261
> Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
> if (ACPI_FAILURE (Status))
> {
> return_ACPI_STATUS (Status);
> }
>
297c270,271
< Info.TableDesc = TableDesc;
---
> Info.TableIndex = TableIndex;
> Info.OwnerId = OwnerId;
305,306c279
< ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "WalkNamespace failed, %s\n",
< AcpiFormatException (Status)));
---
> ACPI_EXCEPTION ((AE_INFO, Status, "During WalkNamespace"));
308a282,287
> Status = AcpiGetTableByIndex (TableIndex, &Table);
> if (ACPI_FAILURE (Status))
> {
> return_ACPI_STATUS (Status);
> }
>
311c290
< TableDesc->Pointer->Signature, TableDesc->OwnerId, Info.ObjectCount,
---
> Table->Signature, OwnerId, Info.ObjectCount,