From f154176708d42f8a4778e3cf4b55e45b4a2be545 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Thu, 21 Jan 2010 20:56:18 +0000 Subject: Import ACPICA 20100121. --- debugger/dbcmds.c | 2 +- debugger/dbdisply.c | 2 +- debugger/dbexec.c | 6 +++--- debugger/dbfileio.c | 7 ++----- debugger/dbhistry.c | 2 +- debugger/dbinput.c | 2 +- debugger/dbstats.c | 2 +- debugger/dbutils.c | 2 +- debugger/dbxface.c | 2 +- 9 files changed, 12 insertions(+), 15 deletions(-) (limited to 'debugger') diff --git a/debugger/dbcmds.c b/debugger/dbcmds.c index 0a542d952f45..50a8b2e037e3 100644 --- a/debugger/dbcmds.c +++ b/debugger/dbcmds.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License diff --git a/debugger/dbdisply.c b/debugger/dbdisply.c index fbcb8f10d39a..7c04ffca8bc0 100644 --- a/debugger/dbdisply.c +++ b/debugger/dbdisply.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License diff --git a/debugger/dbexec.c b/debugger/dbexec.c index 7990890fc056..da21a12589c5 100644 --- a/debugger/dbexec.c +++ b/debugger/dbexec.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License @@ -243,7 +243,7 @@ AcpiDbExecuteMethod ( default: Params[i].Type = ACPI_TYPE_INTEGER; - Params[i].Integer.Value = i * (ACPI_INTEGER) 0x1000; + Params[i].Integer.Value = i * (UINT64) 0x1000; break; } } @@ -484,7 +484,7 @@ AcpiDbExecute ( * Allow any handlers in separate threads to complete. * (Such as Notify handlers invoked from AML executed above). */ - AcpiOsSleep ((ACPI_INTEGER) 10); + AcpiOsSleep ((UINT64) 10); #ifdef ACPI_DEBUG_OUTPUT diff --git a/debugger/dbfileio.c b/debugger/dbfileio.c index d52a72caa6a5..c6f2e253accf 100644 --- a/debugger/dbfileio.c +++ b/debugger/dbfileio.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License @@ -150,9 +150,6 @@ AcpiDbCheckTextModeCorruption ( UINT32 TableLength, UINT32 FileLength); -static ACPI_STATUS -AeLocalLoadTable ( - ACPI_TABLE_HEADER *TablePtr); #endif /******************************************************************************* @@ -424,7 +421,7 @@ AcpiDbReadTable ( { /* Now validate the checksum */ - Status = AcpiTbChecksum ((void *) *Table, + Status = AcpiTbVerifyChecksum ((void *) *Table, ACPI_CAST_PTR (ACPI_TABLE_HEADER, *Table)->Length); if (Status == AE_BAD_CHECKSUM) diff --git a/debugger/dbhistry.c b/debugger/dbhistry.c index e8e8a76bf104..613711e0fd23 100644 --- a/debugger/dbhistry.c +++ b/debugger/dbhistry.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License diff --git a/debugger/dbinput.c b/debugger/dbinput.c index 74b2dca6edd7..29b51b6d7523 100644 --- a/debugger/dbinput.c +++ b/debugger/dbinput.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License diff --git a/debugger/dbstats.c b/debugger/dbstats.c index 63a62ecbef8b..ace8263734ea 100644 --- a/debugger/dbstats.c +++ b/debugger/dbstats.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License diff --git a/debugger/dbutils.c b/debugger/dbutils.c index 15799eb7b4c9..19ff3f02a2ae 100644 --- a/debugger/dbutils.c +++ b/debugger/dbutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License diff --git a/debugger/dbxface.c b/debugger/dbxface.c index f3f7a4474601..1c0557ac3151 100644 --- a/debugger/dbxface.c +++ b/debugger/dbxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp. * All rights reserved. * * 2. License -- cgit v1.3