Deleted Added
sdiff udiff text old ( 123315 ) new ( 126372 )
full compact
dbobject.c (123315) dbobject.c (126372)
1/*******************************************************************************
2 *
3 * Module Name: dmobject - ACPI object decode and display
1/*******************************************************************************
2 *
3 * Module Name: dmobject - ACPI object decode and display
4 * $Revision: 6 $
4 * $Revision: 11 $
5 *
6 ******************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
5 *
6 ******************************************************************************/
7
8/******************************************************************************
9 *
10 * 1. Copyright Notice
11 *
12 * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
12 * Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
13 * All rights reserved.
14 *
15 * 2. License
16 *
17 * 2.1. This is your license from Intel Corp. under its intellectual property
18 * rights. You may have additional license terms from the party that provided
19 * you this software, covering your right to use that party's intellectual
20 * property rights.

--- 239 unchanged lines hidden (view full) ---

260 }
261
262 AcpiOsPrintf (" %s", AcpiUtGetObjectTypeName (ObjDesc));
263
264 switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
265 {
266 case ACPI_TYPE_INTEGER:
267
13 * All rights reserved.
14 *
15 * 2. License
16 *
17 * 2.1. This is your license from Intel Corp. under its intellectual property
18 * rights. You may have additional license terms from the party that provided
19 * you this software, covering your right to use that party's intellectual
20 * property rights.

--- 239 unchanged lines hidden (view full) ---

260 }
261
262 AcpiOsPrintf (" %s", AcpiUtGetObjectTypeName (ObjDesc));
263
264 switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
265 {
266 case ACPI_TYPE_INTEGER:
267
268 AcpiOsPrintf (" %8.8X%8.8X",
268 AcpiOsPrintf (" %8.8X%8.8X",
269 ACPI_FORMAT_UINT64 (ObjDesc->Integer.Value));
270 break;
271
272
273 case ACPI_TYPE_STRING:
274
275 AcpiOsPrintf ("(%d) \"%.24s",
276 ObjDesc->String.Length, ObjDesc->String.Pointer);

--- 150 unchanged lines hidden (view full) ---

427 case AML_DEBUG_OP:
428
429 AcpiOsPrintf ("[Debug] ");
430 break;
431
432
433 case AML_INDEX_OP:
434
269 ACPI_FORMAT_UINT64 (ObjDesc->Integer.Value));
270 break;
271
272
273 case ACPI_TYPE_STRING:
274
275 AcpiOsPrintf ("(%d) \"%.24s",
276 ObjDesc->String.Length, ObjDesc->String.Pointer);

--- 150 unchanged lines hidden (view full) ---

427 case AML_DEBUG_OP:
428
429 AcpiOsPrintf ("[Debug] ");
430 break;
431
432
433 case AML_INDEX_OP:
434
435 AcpiOsPrintf ("[Index] ");
436 if (!ObjDesc->Reference.Where)
435 AcpiOsPrintf ("[Index] ");
436 switch (ObjDesc->Reference.TargetType)
437 {
437 {
438 AcpiOsPrintf ("Uninitialized WHERE ptr");
438 case ACPI_TYPE_BUFFER_FIELD:
439 AcpiOsPrintf ("%p", ObjDesc->Reference.Object);
440 AcpiDmDecodeInternalObject (ObjDesc->Reference.Object);
441 break;
442
443 case ACPI_TYPE_PACKAGE:
444
445 AcpiOsPrintf ("%p", ObjDesc->Reference.Where);
446 if (!ObjDesc->Reference.Where)
447 {
448 AcpiOsPrintf (" Uninitialized WHERE ptr");
449 }
450 else
451 {
452 AcpiDmDecodeInternalObject (*(ObjDesc->Reference.Where));
453 }
454 break;
455
456 default:
457 AcpiOsPrintf ("Unknown index target type");
458 break;
439 }
459 }
440 else
441 {
442 AcpiDmDecodeInternalObject (*(ObjDesc->Reference.Where));
443 }
444 break;
445
446
447 case AML_LOAD_OP:
448
449 AcpiOsPrintf ("[DdbHandle] ");
450 break;
451
452
460 break;
461
462
463 case AML_LOAD_OP:
464
465 AcpiOsPrintf ("[DdbHandle] ");
466 break;
467
468
453 case AML_REF_OF_OP:
469 case AML_REF_OF_OP:
454
455 AcpiOsPrintf ("[RefOf] ");
456
470
471 AcpiOsPrintf ("[RefOf] ");
472
473 if (!ObjDesc->Reference.Object)
474 {
475 AcpiOsPrintf ("Uninitialized reference subobject ptr");
476 break;
477 }
478
457 /* Reference can be to a Node or an Operand object */
458
459 switch (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc->Reference.Object))
460 {
461 case ACPI_DESC_TYPE_NAMED:
462 AcpiDmDecodeNode (ObjDesc->Reference.Object);
463 break;
464

--- 13 unchanged lines hidden (view full) ---

478 ObjDesc->Reference.Opcode,
479 AcpiPsGetOpcodeName (ObjDesc->Reference.Opcode));
480 break;
481 }
482 break;
483
484 default:
485
479 /* Reference can be to a Node or an Operand object */
480
481 switch (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc->Reference.Object))
482 {
483 case ACPI_DESC_TYPE_NAMED:
484 AcpiDmDecodeNode (ObjDesc->Reference.Object);
485 break;
486

--- 13 unchanged lines hidden (view full) ---

500 ObjDesc->Reference.Opcode,
501 AcpiPsGetOpcodeName (ObjDesc->Reference.Opcode));
502 break;
503 }
504 break;
505
506 default:
507
486 AcpiOsPrintf (" ");
487 AcpiOsPrintf (" ");
508 AcpiOsPrintf ("<Obj> ");
488 AcpiDmDecodeInternalObject (ObjDesc);
489 break;
490 }
491 break;
492
493
494 default:
495
509 AcpiDmDecodeInternalObject (ObjDesc);
510 break;
511 }
512 break;
513
514
515 default:
516
496 AcpiOsPrintf ("<Not a valid ACPI Object Descriptor> [%s]",
517 AcpiOsPrintf (" [%s]",
497 AcpiUtGetDescriptorName (ObjDesc));
498 break;
499 }
500
501 AcpiOsPrintf ("\n");
502}
503
504

--- 101 unchanged lines hidden --- 		518 AcpiUtGetDescriptorName (ObjDesc));
519 break;
520 }
521
522 AcpiOsPrintf ("\n");
523}
524
525

--- 101 unchanged lines hidden ---