hwxface.c (ac0c84502697114a378057eed83a9baba879cfc9) | hwxface.c (3371c19c294a4cb3649aa4e84606be8a1d999e61) |
---|---|
1 2/****************************************************************************** 3 * 4 * Module Name: hwxface - Public ACPICA hardware interfaces 5 * 6 *****************************************************************************/ 7 8/* --- 518 unchanged lines hidden (view full) --- 527 if (!info->return_object) { 528 ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]", 529 info->pathname)); 530 status = AE_NOT_EXIST; 531 } 532 533 /* It must be of type Package */ 534 | 1 2/****************************************************************************** 3 * 4 * Module Name: hwxface - Public ACPICA hardware interfaces 5 * 6 *****************************************************************************/ 7 8/* --- 518 unchanged lines hidden (view full) --- 527 if (!info->return_object) { 528 ACPI_ERROR((AE_INFO, "No Sleep State object returned from [%s]", 529 info->pathname)); 530 status = AE_NOT_EXIST; 531 } 532 533 /* It must be of type Package */ 534 |
535 else if (ACPI_GET_OBJECT_TYPE(info->return_object) != ACPI_TYPE_PACKAGE) { | 535 else if (info->return_object->common.type != ACPI_TYPE_PACKAGE) { |
536 ACPI_ERROR((AE_INFO, 537 "Sleep State return object is not a Package")); 538 status = AE_AML_OPERAND_TYPE; 539 } 540 541 /* 542 * The package must have at least two elements. NOTE (March 2005): This 543 * goes against the current ACPI spec which defines this object as a --- 4 unchanged lines hidden (view full) --- 548 else if (info->return_object->package.count < 2) { 549 ACPI_ERROR((AE_INFO, 550 "Sleep State return package does not have at least two elements")); 551 status = AE_AML_NO_OPERAND; 552 } 553 554 /* The first two elements must both be of type Integer */ 555 | 536 ACPI_ERROR((AE_INFO, 537 "Sleep State return object is not a Package")); 538 status = AE_AML_OPERAND_TYPE; 539 } 540 541 /* 542 * The package must have at least two elements. NOTE (March 2005): This 543 * goes against the current ACPI spec which defines this object as a --- 4 unchanged lines hidden (view full) --- 548 else if (info->return_object->package.count < 2) { 549 ACPI_ERROR((AE_INFO, 550 "Sleep State return package does not have at least two elements")); 551 status = AE_AML_NO_OPERAND; 552 } 553 554 /* The first two elements must both be of type Integer */ 555 |
556 else if ((ACPI_GET_OBJECT_TYPE(info->return_object->package.elements[0]) | 556 else if (((info->return_object->package.elements[0])->common.type |
557 != ACPI_TYPE_INTEGER) || | 557 != ACPI_TYPE_INTEGER) || |
558 (ACPI_GET_OBJECT_TYPE(info->return_object->package.elements[1]) | 558 ((info->return_object->package.elements[1])->common.type |
559 != ACPI_TYPE_INTEGER)) { 560 ACPI_ERROR((AE_INFO, 561 "Sleep State return package elements are not both Integers (%s, %s)", 562 acpi_ut_get_object_type_name(info->return_object-> 563 package.elements[0]), 564 acpi_ut_get_object_type_name(info->return_object-> 565 package.elements[1]))); 566 status = AE_AML_OPERAND_TYPE; --- 25 unchanged lines hidden --- | 559 != ACPI_TYPE_INTEGER)) { 560 ACPI_ERROR((AE_INFO, 561 "Sleep State return package elements are not both Integers (%s, %s)", 562 acpi_ut_get_object_type_name(info->return_object-> 563 package.elements[0]), 564 acpi_ut_get_object_type_name(info->return_object-> 565 package.elements[1]))); 566 status = AE_AML_OPERAND_TYPE; --- 25 unchanged lines hidden --- |