4c4
< * $Revision: 105 $
---
> * $Revision: 116 $
130d129
<
132a132
>
134a135,173
> * FUNCTION: AcpiNsPrintPathname
> *
> * PARAMETERS: NumSegment - Number of ACPI name segments
> * Pathname - The compressed (internal) path
> *
> * DESCRIPTION: Print an object's full namespace pathname
> *
> ******************************************************************************/
>
> void
> AcpiNsPrintPathname (
> UINT32 NumSegments,
> char *Pathname)
> {
> UINT32 i;
>
> PROC_NAME ("AcpiNsPrintPathname");
>
>
> if (!(AcpiDbgLevel & ACPI_LV_NAMES) || !(AcpiDbgLayer & ACPI_NAMESPACE))
> {
> return;
> }
>
> /* Print the entire name */
>
> ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "["));
>
> for (i = 0; i < NumSegments; i++)
> {
> AcpiOsPrintf ("%4.4s.", (char *) &Pathname[i * 4]);
> }
>
> AcpiOsPrintf ("]\n");
> }
>
>
> /*******************************************************************************
> *
179c218
< AcpiOsPrintf ("%s %s (%p)\n", Msg, Buffer, Handle);
---
> AcpiOsPrintf ("%s %s (Node %p)\n", Msg, Buffer, Handle);
234a274,278
> if (!((ACPI_LV_TABLES & AcpiDbgLevel) && (_COMPONENT & AcpiDbgLayer)))
> {
> return (AE_OK);
> }
>
249d292
<
254d296
<
261c303
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "|"));
---
> AcpiOsPrintf ("|");
263d304
<
266c307
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " "));
---
> AcpiOsPrintf (" ");
271d311
<
277c317
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "+"));
---
> AcpiOsPrintf ("+");
279d318
<
283c322
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "+"));
---
> AcpiOsPrintf ("+");
288c327
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "-"));
---
> AcpiOsPrintf ("-");
290d328
<
293c331
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "+"));
---
> AcpiOsPrintf ("+");
295d332
<
298c335
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "-"));
---
> AcpiOsPrintf ("-");
303d339
<
308c344
< Type = INTERNAL_TYPE_DEF_ANY; /* prints as *ERROR* */
---
> Type = INTERNAL_TYPE_DEF_ANY; /* prints as *ERROR* */
319,320c355,356
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " %4.4s %-12s %p",
< (char*)&ThisNode->Name, AcpiUtGetTypeName (Type), ThisNode));
---
> AcpiOsPrintf (" %4.4s %-12s %p",
> (char *) &ThisNode->Name, AcpiUtGetTypeName (Type), ThisNode);
322c358
< ObjDesc = ThisNode->Object;
---
> ObjDesc = AcpiNsGetAttachedObject (ThisNode);
332c368
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
336d371
<
340c375
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " ID %d Addr %.4X Len %.4X\n",
---
> AcpiOsPrintf (" ID %d Addr %.4X Len %.4X\n",
343c378
< ObjDesc->Processor.Length));
---
> ObjDesc->Processor.Length);
347c382
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Notification object: %p", ObjDesc));
---
> AcpiOsPrintf (" Notification object: %p", ObjDesc);
351c386
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Args %d Len %.4X Aml %p \n",
---
> AcpiOsPrintf (" Args %d Len %.4X Aml %p \n",
354c389
< ObjDesc->Method.AmlStart));
---
> ObjDesc->Method.AmlStart);
358c393
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " = %8.8X%8.8X\n",
---
> AcpiOsPrintf (" = %8.8X%8.8X\n",
360c395
< LODWORD (ObjDesc->Integer.Value)));
---
> LODWORD (ObjDesc->Integer.Value));
364,365c399,400
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Elements %.2X\n",
< ObjDesc->Package.Count));
---
> AcpiOsPrintf (" Elements %.2X\n",
> ObjDesc->Package.Count);
369,370c404,405
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Len %.2X",
< ObjDesc->Buffer.Length));
---
> AcpiOsPrintf (" Len %.2X",
> ObjDesc->Buffer.Length);
376c411
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " ="));
---
> AcpiOsPrintf (" =");
379,380c414
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " %.2X",
< ObjDesc->Buffer.Pointer[i]));
---
> AcpiOsPrintf (" %.2X", ObjDesc->Buffer.Pointer[i]);
383c417
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
387,389c421,422
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Len %.2X",
< ObjDesc->String.Length));
<
---
> AcpiOsPrintf (" Len %.2X", ObjDesc->String.Length);
>
392,393c425
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " = \"%.32s\"...",
< ObjDesc->String.Pointer));
---
> AcpiOsPrintf (" = \"%.32s\"...", ObjDesc->String.Pointer);
395c427
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
399,400c431
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " [%s]",
< AcpiUtGetRegionName (ObjDesc->Region.SpaceId)));
---
> AcpiOsPrintf (" [%s]", AcpiUtGetRegionName (ObjDesc->Region.SpaceId));
403c434
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Addr %8.8X%8.8X Len %.4X\n",
---
> AcpiOsPrintf (" Addr %8.8X%8.8X Len %.4X\n",
406c437
< ObjDesc->Region.Length));
---
> ObjDesc->Region.Length);
410c441
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " [Address/Length not evaluated]\n"));
---
> AcpiOsPrintf (" [Address/Length not evaluated]\n");
415,416c446,447
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " [%s]\n",
< AcpiPsGetOpcodeName (ObjDesc->Reference.Opcode)));
---
> AcpiOsPrintf (" [%s]\n",
> AcpiPsGetOpcodeName (ObjDesc->Reference.Opcode));
420,421c451,456
<
< /* TBD: print Buffer name when we can easily get it */
---
> if (ObjDesc->BufferField.BufferObj &&
> ObjDesc->BufferField.BufferObj->Buffer.Node)
> {
> AcpiOsPrintf (" Buf [%4.4s]",
> (char *) &ObjDesc->BufferField.BufferObj->Buffer.Node->Name);
> }
425,426c460,461
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Rgn [%4.4s]",
< (char *) &ObjDesc->CommonField.RegionObj->Region.Node->Name));
---
> AcpiOsPrintf (" Rgn [%4.4s]",
> (char *) &ObjDesc->CommonField.RegionObj->Region.Node->Name);
430,431c465,467
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Rgn [%4.4s]",
< (char *) &ObjDesc->CommonField.RegionObj->Region.Node->Name));
---
> AcpiOsPrintf (" Rgn [%4.4s] Bnk [%4.4s]",
> (char *) &ObjDesc->CommonField.RegionObj->Region.Node->Name,
> (char *) &ObjDesc->BankField.BankObj->CommonField.Node->Name);
435,436c471,473
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Rgn [%4.4s]",
< (char *) &ObjDesc->IndexField.IndexObj->CommonField.RegionObj->Region.Node->Name));
---
> AcpiOsPrintf (" Idx [%4.4s] Dat [%4.4s]",
> (char *) &ObjDesc->IndexField.IndexObj->CommonField.Node->Name,
> (char *) &ObjDesc->IndexField.DataObj->CommonField.Node->Name);
440,441c477
<
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Object %p\n", ObjDesc));
---
> AcpiOsPrintf (" Object %p\n", ObjDesc);
453,456c489,493
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Off %.2X Len %.2X Acc %.2d\n",
< (ObjDesc->CommonField.BaseByteOffset * 8) + ObjDesc->CommonField.StartFieldBitOffset,
< ObjDesc->CommonField.BitLength,
< ObjDesc->CommonField.AccessBitWidth));
---
> AcpiOsPrintf (" Off %.2X Len %.2X Acc %.2d\n",
> (ObjDesc->CommonField.BaseByteOffset * 8)
> + ObjDesc->CommonField.StartFieldBitOffset,
> ObjDesc->CommonField.BitLength,
> ObjDesc->CommonField.AccessBitWidth);
465,466c502,503
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "%p O:%p",
< ThisNode, ObjDesc));
---
> AcpiOsPrintf ("%p O:%p",
> ThisNode, ObjDesc);
472c509
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
476,477c513,514
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(R%d)",
< ObjDesc->Common.ReferenceCount));
---
> AcpiOsPrintf ("(R%d)",
> ObjDesc->Common.ReferenceCount);
481d517
<
486,489c522,523
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " M:%p-%X\n",
< ObjDesc->Method.AmlStart,
< ObjDesc->Method.AmlLength));
<
---
> AcpiOsPrintf (" M:%p-%X\n", ObjDesc->Method.AmlStart,
> ObjDesc->Method.AmlLength);
492d525
<
495,497c528,529
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " N:%X%X\n",
< HIDWORD(ObjDesc->Integer.Value),
< LODWORD(ObjDesc->Integer.Value)));
---
> AcpiOsPrintf (" N:%X%X\n", HIDWORD(ObjDesc->Integer.Value),
> LODWORD(ObjDesc->Integer.Value));
500d531
<
503,505c534,535
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " S:%p-%X\n",
< ObjDesc->String.Pointer,
< ObjDesc->String.Length));
---
> AcpiOsPrintf (" S:%p-%X\n", ObjDesc->String.Pointer,
> ObjDesc->String.Length);
508d537
<
511,513c540,541
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " B:%p-%X\n",
< ObjDesc->Buffer.Pointer,
< ObjDesc->Buffer.Length));
---
> AcpiOsPrintf (" B:%p-%X\n", ObjDesc->Buffer.Pointer,
> ObjDesc->Buffer.Length);
516d543
<
519c546
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
522a550,554
>
>
> default:
> AcpiOsPrintf ("\n");
> break;
535c567
< ObjDesc = ThisNode->Object;
---
> ObjDesc = AcpiNsGetAttachedObject (ThisNode);
545c577
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Attached Object %p: ", ObjDesc));
---
> AcpiOsPrintf (" Attached Object %p: ", ObjDesc);
549c581
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(Ptr to Node)\n"));
---
> AcpiOsPrintf ("(Ptr to Node)\n");
553d584
<
560c591
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(Ptr to ACPI Object type %X [UNKNOWN])\n", ObjType));
---
> AcpiOsPrintf ("(Ptr to ACPI Object type %X [UNKNOWN])\n", ObjType);
563d593
<
566,567c596,597
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(Ptr to ACPI Object type %2.2X [%s])\n",
< ObjType, AcpiUtGetTypeName (ObjType)));
---
> AcpiOsPrintf ("(Ptr to ACPI Object type %2.2X [%s])\n",
> ObjType, AcpiUtGetTypeName (ObjType));
571d600
<
574c603
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(String or Buffer - not descriptor)\n"));
---
> AcpiOsPrintf ("(String or Buffer - not descriptor)\n");
628c657
< ObjType = INTERNAL_TYPE_INVALID; /* Terminate loop after next pass */
---
> ObjType = INTERNAL_TYPE_INVALID; /* Terminate loop after next pass */
632c661
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
802c831
< AcpiNsDumpObjects (ACPI_TYPE_ANY, ACPI_DISPLAY_OBJECTS, MaxDepth,
---
> AcpiNsDumpObjects (ACPI_TYPE_ANY, ACPI_DISPLAY_OBJECTS, MaxDepth,
831a861
> Info.DisplayType = ACPI_DISPLAY_SUMMARY;
< * $Revision: 105 $
---
> * $Revision: 116 $
130d129
<
132a132
>
134a135,173
> * FUNCTION: AcpiNsPrintPathname
> *
> * PARAMETERS: NumSegment - Number of ACPI name segments
> * Pathname - The compressed (internal) path
> *
> * DESCRIPTION: Print an object's full namespace pathname
> *
> ******************************************************************************/
>
> void
> AcpiNsPrintPathname (
> UINT32 NumSegments,
> char *Pathname)
> {
> UINT32 i;
>
> PROC_NAME ("AcpiNsPrintPathname");
>
>
> if (!(AcpiDbgLevel & ACPI_LV_NAMES) || !(AcpiDbgLayer & ACPI_NAMESPACE))
> {
> return;
> }
>
> /* Print the entire name */
>
> ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "["));
>
> for (i = 0; i < NumSegments; i++)
> {
> AcpiOsPrintf ("%4.4s.", (char *) &Pathname[i * 4]);
> }
>
> AcpiOsPrintf ("]\n");
> }
>
>
> /*******************************************************************************
> *
179c218
< AcpiOsPrintf ("%s %s (%p)\n", Msg, Buffer, Handle);
---
> AcpiOsPrintf ("%s %s (Node %p)\n", Msg, Buffer, Handle);
234a274,278
> if (!((ACPI_LV_TABLES & AcpiDbgLevel) && (_COMPONENT & AcpiDbgLayer)))
> {
> return (AE_OK);
> }
>
249d292
<
254d296
<
261c303
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "|"));
---
> AcpiOsPrintf ("|");
263d304
<
266c307
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " "));
---
> AcpiOsPrintf (" ");
271d311
<
277c317
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "+"));
---
> AcpiOsPrintf ("+");
279d318
<
283c322
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "+"));
---
> AcpiOsPrintf ("+");
288c327
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "-"));
---
> AcpiOsPrintf ("-");
290d328
<
293c331
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "+"));
---
> AcpiOsPrintf ("+");
295d332
<
298c335
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "-"));
---
> AcpiOsPrintf ("-");
303d339
<
308c344
< Type = INTERNAL_TYPE_DEF_ANY; /* prints as *ERROR* */
---
> Type = INTERNAL_TYPE_DEF_ANY; /* prints as *ERROR* */
319,320c355,356
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " %4.4s %-12s %p",
< (char*)&ThisNode->Name, AcpiUtGetTypeName (Type), ThisNode));
---
> AcpiOsPrintf (" %4.4s %-12s %p",
> (char *) &ThisNode->Name, AcpiUtGetTypeName (Type), ThisNode);
322c358
< ObjDesc = ThisNode->Object;
---
> ObjDesc = AcpiNsGetAttachedObject (ThisNode);
332c368
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
336d371
<
340c375
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " ID %d Addr %.4X Len %.4X\n",
---
> AcpiOsPrintf (" ID %d Addr %.4X Len %.4X\n",
343c378
< ObjDesc->Processor.Length));
---
> ObjDesc->Processor.Length);
347c382
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Notification object: %p", ObjDesc));
---
> AcpiOsPrintf (" Notification object: %p", ObjDesc);
351c386
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Args %d Len %.4X Aml %p \n",
---
> AcpiOsPrintf (" Args %d Len %.4X Aml %p \n",
354c389
< ObjDesc->Method.AmlStart));
---
> ObjDesc->Method.AmlStart);
358c393
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " = %8.8X%8.8X\n",
---
> AcpiOsPrintf (" = %8.8X%8.8X\n",
360c395
< LODWORD (ObjDesc->Integer.Value)));
---
> LODWORD (ObjDesc->Integer.Value));
364,365c399,400
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Elements %.2X\n",
< ObjDesc->Package.Count));
---
> AcpiOsPrintf (" Elements %.2X\n",
> ObjDesc->Package.Count);
369,370c404,405
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Len %.2X",
< ObjDesc->Buffer.Length));
---
> AcpiOsPrintf (" Len %.2X",
> ObjDesc->Buffer.Length);
376c411
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " ="));
---
> AcpiOsPrintf (" =");
379,380c414
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " %.2X",
< ObjDesc->Buffer.Pointer[i]));
---
> AcpiOsPrintf (" %.2X", ObjDesc->Buffer.Pointer[i]);
383c417
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
387,389c421,422
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Len %.2X",
< ObjDesc->String.Length));
<
---
> AcpiOsPrintf (" Len %.2X", ObjDesc->String.Length);
>
392,393c425
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " = \"%.32s\"...",
< ObjDesc->String.Pointer));
---
> AcpiOsPrintf (" = \"%.32s\"...", ObjDesc->String.Pointer);
395c427
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
399,400c431
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " [%s]",
< AcpiUtGetRegionName (ObjDesc->Region.SpaceId)));
---
> AcpiOsPrintf (" [%s]", AcpiUtGetRegionName (ObjDesc->Region.SpaceId));
403c434
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Addr %8.8X%8.8X Len %.4X\n",
---
> AcpiOsPrintf (" Addr %8.8X%8.8X Len %.4X\n",
406c437
< ObjDesc->Region.Length));
---
> ObjDesc->Region.Length);
410c441
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " [Address/Length not evaluated]\n"));
---
> AcpiOsPrintf (" [Address/Length not evaluated]\n");
415,416c446,447
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " [%s]\n",
< AcpiPsGetOpcodeName (ObjDesc->Reference.Opcode)));
---
> AcpiOsPrintf (" [%s]\n",
> AcpiPsGetOpcodeName (ObjDesc->Reference.Opcode));
420,421c451,456
<
< /* TBD: print Buffer name when we can easily get it */
---
> if (ObjDesc->BufferField.BufferObj &&
> ObjDesc->BufferField.BufferObj->Buffer.Node)
> {
> AcpiOsPrintf (" Buf [%4.4s]",
> (char *) &ObjDesc->BufferField.BufferObj->Buffer.Node->Name);
> }
425,426c460,461
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Rgn [%4.4s]",
< (char *) &ObjDesc->CommonField.RegionObj->Region.Node->Name));
---
> AcpiOsPrintf (" Rgn [%4.4s]",
> (char *) &ObjDesc->CommonField.RegionObj->Region.Node->Name);
430,431c465,467
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Rgn [%4.4s]",
< (char *) &ObjDesc->CommonField.RegionObj->Region.Node->Name));
---
> AcpiOsPrintf (" Rgn [%4.4s] Bnk [%4.4s]",
> (char *) &ObjDesc->CommonField.RegionObj->Region.Node->Name,
> (char *) &ObjDesc->BankField.BankObj->CommonField.Node->Name);
435,436c471,473
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Rgn [%4.4s]",
< (char *) &ObjDesc->IndexField.IndexObj->CommonField.RegionObj->Region.Node->Name));
---
> AcpiOsPrintf (" Idx [%4.4s] Dat [%4.4s]",
> (char *) &ObjDesc->IndexField.IndexObj->CommonField.Node->Name,
> (char *) &ObjDesc->IndexField.DataObj->CommonField.Node->Name);
440,441c477
<
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Object %p\n", ObjDesc));
---
> AcpiOsPrintf (" Object %p\n", ObjDesc);
453,456c489,493
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Off %.2X Len %.2X Acc %.2d\n",
< (ObjDesc->CommonField.BaseByteOffset * 8) + ObjDesc->CommonField.StartFieldBitOffset,
< ObjDesc->CommonField.BitLength,
< ObjDesc->CommonField.AccessBitWidth));
---
> AcpiOsPrintf (" Off %.2X Len %.2X Acc %.2d\n",
> (ObjDesc->CommonField.BaseByteOffset * 8)
> + ObjDesc->CommonField.StartFieldBitOffset,
> ObjDesc->CommonField.BitLength,
> ObjDesc->CommonField.AccessBitWidth);
465,466c502,503
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "%p O:%p",
< ThisNode, ObjDesc));
---
> AcpiOsPrintf ("%p O:%p",
> ThisNode, ObjDesc);
472c509
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
476,477c513,514
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(R%d)",
< ObjDesc->Common.ReferenceCount));
---
> AcpiOsPrintf ("(R%d)",
> ObjDesc->Common.ReferenceCount);
481d517
<
486,489c522,523
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " M:%p-%X\n",
< ObjDesc->Method.AmlStart,
< ObjDesc->Method.AmlLength));
<
---
> AcpiOsPrintf (" M:%p-%X\n", ObjDesc->Method.AmlStart,
> ObjDesc->Method.AmlLength);
492d525
<
495,497c528,529
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " N:%X%X\n",
< HIDWORD(ObjDesc->Integer.Value),
< LODWORD(ObjDesc->Integer.Value)));
---
> AcpiOsPrintf (" N:%X%X\n", HIDWORD(ObjDesc->Integer.Value),
> LODWORD(ObjDesc->Integer.Value));
500d531
<
503,505c534,535
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " S:%p-%X\n",
< ObjDesc->String.Pointer,
< ObjDesc->String.Length));
---
> AcpiOsPrintf (" S:%p-%X\n", ObjDesc->String.Pointer,
> ObjDesc->String.Length);
508d537
<
511,513c540,541
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " B:%p-%X\n",
< ObjDesc->Buffer.Pointer,
< ObjDesc->Buffer.Length));
---
> AcpiOsPrintf (" B:%p-%X\n", ObjDesc->Buffer.Pointer,
> ObjDesc->Buffer.Length);
516d543
<
519c546
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
522a550,554
>
>
> default:
> AcpiOsPrintf ("\n");
> break;
535c567
< ObjDesc = ThisNode->Object;
---
> ObjDesc = AcpiNsGetAttachedObject (ThisNode);
545c577
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, " Attached Object %p: ", ObjDesc));
---
> AcpiOsPrintf (" Attached Object %p: ", ObjDesc);
549c581
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(Ptr to Node)\n"));
---
> AcpiOsPrintf ("(Ptr to Node)\n");
553d584
<
560c591
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(Ptr to ACPI Object type %X [UNKNOWN])\n", ObjType));
---
> AcpiOsPrintf ("(Ptr to ACPI Object type %X [UNKNOWN])\n", ObjType);
563d593
<
566,567c596,597
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(Ptr to ACPI Object type %2.2X [%s])\n",
< ObjType, AcpiUtGetTypeName (ObjType)));
---
> AcpiOsPrintf ("(Ptr to ACPI Object type %2.2X [%s])\n",
> ObjType, AcpiUtGetTypeName (ObjType));
571d600
<
574c603
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "(String or Buffer - not descriptor)\n"));
---
> AcpiOsPrintf ("(String or Buffer - not descriptor)\n");
628c657
< ObjType = INTERNAL_TYPE_INVALID; /* Terminate loop after next pass */
---
> ObjType = INTERNAL_TYPE_INVALID; /* Terminate loop after next pass */
632c661
< ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "\n"));
---
> AcpiOsPrintf ("\n");
802c831
< AcpiNsDumpObjects (ACPI_TYPE_ANY, ACPI_DISPLAY_OBJECTS, MaxDepth,
---
> AcpiNsDumpObjects (ACPI_TYPE_ANY, ACPI_DISPLAY_OBJECTS, MaxDepth,
831a861
> Info.DisplayType = ACPI_DISPLAY_SUMMARY;