4c4
< * $Revision: 1.132 $
---
> * $Revision: 1.150 $
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.
203a204,209
> {"DEBUG"},
> {"REGIONFIELDS"},
> {"BANKFIELDS"},
> {"INDEXFIELDS"},
> {"REFERENCES"},
> {"ALIAS"},
282,284d287
< #if ACPI_MACHINE_WIDTH == 16
< return (AE_OK);
< #else
309d311
< #endif
408c410
< for (i = 0; i < MAX_MUTEX; i++)
---
> for (i = 0; i < ACPI_MAX_MUTEX; i++)
411,412c413,414
< AcpiGbl_MutexInfo[i].ThreadId == ACPI_MUTEX_NOT_ACQUIRED
< ? "Locked" : "Unlocked");
---
> AcpiGbl_MutexInfo[i].ThreadId == ACPI_MUTEX_NOT_ACQUIRED
> ? "Locked" : "Unlocked");
434c436
< UINT32 i;
---
> ACPI_NATIVE_UINT i;
438c440,443
< for (i = 0; i < NUM_ACPI_TABLE_TYPES; i++)
---
> /*
> * Walk the root table list
> */
> for (i = 0; i < AcpiGbl_RootTableList.Count; i++)
440,445c445,448
< TableDesc = AcpiGbl_TableLists[i].Next;
< while (TableDesc)
< {
< AcpiOsPrintf ( "%s at %p length %.5X",
< AcpiGbl_TableData[i].Name, TableDesc->Pointer,
< (UINT32) TableDesc->Length);
---
> TableDesc = &AcpiGbl_RootTableList.Tables[i];
> AcpiOsPrintf ( "%4.4s at %p length %.5X",
> TableDesc->Signature.Ascii, TableDesc->Pointer,
> (UINT32) TableDesc->Length);
447,456c450,455
< if (i != ACPI_TABLE_FACS)
< {
< AcpiOsPrintf (" OemID=%6s TableId=%8s OemRevision=%8.8X",
< TableDesc->Pointer->OemId,
< TableDesc->Pointer->OemTableId,
< TableDesc->Pointer->OemRevision);
< }
< AcpiOsPrintf ("\n");
<
< TableDesc = TableDesc->Next;
---
> if (TableDesc->Pointer && (i != ACPI_TABLE_INDEX_FACS))
> {
> AcpiOsPrintf (" OemId=\"%6s\" OemTableId=\"%8s\" OemRevision=%8.8X",
> TableDesc->Pointer->OemId,
> TableDesc->Pointer->OemTableId,
> TableDesc->Pointer->OemRevision);
457a457
> AcpiOsPrintf ("\n");
481a482,484
> /* TBD: Need to reimplement for new data structures */
>
> #if 0
488c491
< for (i = 0; i < NUM_ACPI_TABLE_TYPES; i++)
---
> for (i = 0; i < (ACPI_TABLE_ID_MAX+1); i++)
510a514
> #endif
674c678
< ObjDesc->Method.AmlLength, NULL, 1);
---
> ObjDesc->Method.AmlLength, NULL, ACPI_IMODE_LOAD_PASS1);
934c938
< return;
---
> goto Cleanup;
941c945
< return;
---
> goto Cleanup;
957c961
< return;
---
> goto Cleanup;
964c968
< return;
---
> goto Cleanup;
975a980,982
>
> Cleanup:
> AcpiUtRemoveReference (ObjDesc);
1016c1023
< ACPI_MEM_FREE (Buffer.Pointer);
---
> ACPI_FREE (Buffer.Pointer);
1140c1147
< ACPI_MEM_FREE (Buffer.Pointer);
---
> ACPI_FREE (Buffer.Pointer);
1215,1216c1222,1223
< Status = AcpiNsGetNodeByPath (Name, AcpiGbl_RootNode,
< ACPI_NS_NO_UPSEARCH, &Node);
---
> Status = AcpiNsGetNode (AcpiGbl_RootNode, Name, ACPI_NS_NO_UPSEARCH,
> &Node);
1229,1230c1236,1237
< Status = AcpiNsGetNodeByPath (Name, AcpiGbl_DbScopeNode,
< ACPI_NS_NO_UPSEARCH, &Node);
---
> Status = AcpiNsGetNode (AcpiGbl_DbScopeNode, Name, ACPI_NS_NO_UPSEARCH,
> &Node);
1312d1318
< return;
1317c1323
< if (ACPI_MEMCMP (Aml1, Aml2, Aml1Length))
---
> else if (ACPI_MEMCMP (Aml1, Aml2, Aml1Length))
1336c1342
< Aml2 += Aml1Length;
---
> Aml2 += Aml2Length;
1413c1419
< ACPI_MEM_FREE (NewAml.Pointer);
---
> ACPI_FREE (NewAml.Pointer);
1415c1421
< ACPI_MEM_FREE (ResourceObj.Pointer);
---
> ACPI_FREE (ResourceObj.Pointer);
1417c1423
< ACPI_MEM_FREE (ReturnObj.Pointer);
---
> ACPI_FREE (ReturnObj.Pointer);
1438,1439d1443
< #if ACPI_MACHINE_WIDTH != 16
<
1486c1490
< AcpiRsDumpIrqList ((UINT8 *) AcpiGbl_DbBuffer);
---
> AcpiRsDumpIrqList (ACPI_CAST_PTR (UINT8, AcpiGbl_DbBuffer));
1577d1580
< #endif
1737c1740,1741
< Status = AcpiGetHandle (Node, METHOD_NAME__PRT, &TempNode);
---
> Status = AcpiGetHandle (Node, METHOD_NAME__PRT,
> ACPI_CAST_PTR (ACPI_HANDLE, &TempNode));
1756c1760
< ACPI_MEM_FREE (Buffer.Pointer);
---
> ACPI_FREE (Buffer.Pointer);
1800c1804
< ACPI_MEM_FREE (Cid);
---
> ACPI_FREE (Cid);