mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-23 08:54:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

UtFormatException obsoleted; AcpiFormatException substituted globally

Browse Source 
date	2001.07.06.22.16.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:16:52 +00:00
parent f1ead553da
commit fdf2dddd17
3 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/components/debugger/dbcmds.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbcmds - debug commands and output routines
* $Revision: 1.60 $
* $Revision: 1.61 $
*
******************************************************************************/
@ -326,7 +326,8 @@ AcpiDbUnloadAcpiTable (
for (i = 0; i < NUM_ACPI_TABLES; i++)
{
if (!STRNCMP (TableArg, AcpiGbl_AcpiTableData[i].Signature, AcpiGbl_AcpiTableData[i].SigLength))
if (!STRNCMP (TableArg, AcpiGbl_AcpiTableData[i].Signature,
AcpiGbl_AcpiTableData[i].SigLength))
{
/* Found the table, unload it */
@ -337,7 +338,8 @@ AcpiDbUnloadAcpiTable (
}
else
{
AcpiOsPrintf ("%s, while unloading [%s]\n", AcpiUtFormatException (Status), TableArg);
AcpiOsPrintf ("%s, while unloading [%s]\n",
AcpiFormatException (Status), TableArg);
}
return;
@ -1046,7 +1048,7 @@ AcpiDbDisplayResources (
Status = AcpiEvaluateObject (ObjDesc, "_PRT", NULL, &ReturnObj);
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("Could not obtain _PRT: %s\n", AcpiUtFormatException (Status));
AcpiOsPrintf ("Could not obtain _PRT: %s\n", AcpiFormatException (Status));
goto GoCRS;
}
@ -1056,7 +1058,7 @@ AcpiDbDisplayResources (
Status = AcpiGetIrqRoutingTable (ObjDesc, &ReturnObj);
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("GetIrqRoutingTable failed: %s\n", AcpiUtFormatException (Status));
AcpiOsPrintf ("GetIrqRoutingTable failed: %s\n", AcpiFormatException (Status));
goto GoCRS;
}
@ -1073,7 +1075,7 @@ GoCRS:
Status = AcpiEvaluateObject (ObjDesc, "_CRS", NULL, &ReturnObj);
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("Could not obtain _CRS: %s\n", AcpiUtFormatException (Status));
AcpiOsPrintf ("Could not obtain _CRS: %s\n", AcpiFormatException (Status));
goto GoPRS;
}
@ -1083,7 +1085,7 @@ GoCRS:
Status = AcpiGetCurrentResources (ObjDesc, &ReturnObj);
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("AcpiGetCurrentResources failed: %s\n", AcpiUtFormatException (Status));
AcpiOsPrintf ("AcpiGetCurrentResources failed: %s\n", AcpiFormatException (Status));
goto GoPRS;
}
@ -1099,7 +1101,7 @@ GoPRS:
Status = AcpiEvaluateObject (ObjDesc, "_PRS", NULL, &ReturnObj);
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("Could not obtain _PRS: %s\n", AcpiUtFormatException (Status));
AcpiOsPrintf ("Could not obtain _PRS: %s\n", AcpiFormatException (Status));
goto Cleanup;
}
@ -1109,7 +1111,7 @@ GoPRS:
Status = AcpiGetPossibleResources (ObjDesc, &ReturnObj);
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("AcpiGetPossibleResources failed: %s\n", AcpiUtFormatException (Status));
AcpiOsPrintf ("AcpiGetPossibleResources failed: %s\n", AcpiFormatException (Status));
goto Cleanup;
}

23
source/components/debugger/dbexec.c
View File

@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbexec - debugger control method execution
* $Revision: 1.23 $
* $Revision: 1.27 $
*
******************************************************************************/
@ -132,18 +132,6 @@
MODULE_NAME ("dbexec")
typedef struct dbmethodinfo
{
ACPI_HANDLE ThreadGate;
NATIVE_CHAR *Name;
NATIVE_CHAR **Args;
UINT32 Flags;
UINT32 NumLoops;
NATIVE_CHAR Pathname[128];
} DB_METHOD_INFO;
DB_METHOD_INFO Info;
@ -333,7 +321,8 @@ AcpiDbExecute (
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("Execution of %s failed with status %s\n", Info.Pathname, AcpiCmFormatException (Status));
AcpiOsPrintf ("Execution of %s failed with status %s\n",
Info.Pathname, AcpiFormatException (Status));
}
else
@ -342,7 +331,7 @@ AcpiDbExecute (
if (ReturnObj.Length)
{
AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n",
AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n",
Info.Pathname, ReturnObj.Pointer, ReturnObj.Length);
AcpiDbDumpObject (ReturnObj.Pointer, 1);
}
@ -382,7 +371,7 @@ AcpiDbMethodThread (
{
if (ReturnObj.Length)
{
AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n",
AcpiOsPrintf ("Execution of %s returned object %p Buflen %X\n",
Info->Pathname, ReturnObj.Pointer, ReturnObj.Length);
AcpiDbDumpObject (ReturnObj.Pointer, 1);
}
@ -440,7 +429,7 @@ AcpiDbCreateExecutionThreads (
Status = AcpiOsCreateSemaphore (1, 0, &ThreadGate);
if (ACPI_FAILURE (Status))
{
AcpiOsPrintf ("Could not create semaphore, %s\n", AcpiCmFormatException (Status));
AcpiOsPrintf ("Could not create semaphore, %s\n", AcpiFormatException (Status));
return;
}

16
source/components/debugger/dbfileio.c
View File

@ -2,7 +2,7 @@
*
* Module Name: dbfileio - Debugger file I/O commands. These can't usually
* be used when running the debugger in Ring 0 (Kernel mode)
* $Revision: 1.39 $
* $Revision: 1.43 $
*
******************************************************************************/
@ -155,7 +155,7 @@ FILE *DebugFile = NULL;
*
******************************************************************************/
OBJECT_TYPE_INTERNAL
ACPI_OBJECT_TYPE8
AcpiDbMatchArgument (
NATIVE_CHAR *UserArgument,
ARGUMENT_INFO *Arguments)
@ -172,7 +172,7 @@ AcpiDbMatchArgument (
{
if (STRSTR (Arguments[i].Name, UserArgument) == Arguments[i].Name)
{
return ((OBJECT_TYPE_INTERNAL) i);
return ((ACPI_OBJECT_TYPE8) i);
}
}
@ -311,7 +311,7 @@ AcpiDbLoadTable(
/* Allocate a buffer for the table */
*TableLength = TableHeader.Length;
*TablePtr = (ACPI_TABLE_HEADER *) AcpiCmAllocate ((size_t) *TableLength);
*TablePtr = ACPI_MEM_ALLOCATE ((size_t) *TableLength);
if (!*TablePtr)
{
AcpiOsPrintf ("Could not allocate memory for the table (size=%X)\n", TableHeader.Length);
@ -342,7 +342,7 @@ AcpiDbLoadTable(
AcpiOsPrintf ("Error - could not read the table file\n");
AcpiCmFree (*TablePtr);
ACPI_MEM_FREE (*TablePtr);
*TablePtr = NULL;
*TableLength = 0;
@ -469,12 +469,14 @@ AcpiDbLoadAcpiTable (
AcpiOsPrintf ("Table %4.4s is already installed\n",
&TablePtr->Signature);
}
else
{
AcpiOsPrintf ("Could not install table, %s\n",
AcpiCmFormatException (Status));
AcpiFormatException (Status));
}
AcpiCmFree (TablePtr);
ACPI_MEM_FREE (TablePtr);
return (Status);
}