Commit f70008d3 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Update internal #defines for ObjectType operator. No functional change 

ACPICA commit 5923a9be36b8cb1b62afa89fe217783c04c92ad3

To improve readability. Rename all *_TYPE_* defines related to
ObjectType to *_OBJECT_TYPE_*

Link: https://github.com/acpica/acpica/commit/5923a9be


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent cca7a6ea

drivers/acpi/acpica/acopcode.h

+2 −2
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
#define ARGP_NAMEPATH_OP                ARGP_LIST1 (ARGP_NAMESTRING)

#define ARGP_NOOP_OP                    ARG_NONE

#define ARGP_NOTIFY_OP                  ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_TERMARG)

#define ARGP_OBJECT_TYPE_OP             ARGP_LIST1 (ARGP_NAME_OR_REF)

#define ARGP_ONE_OP                     ARG_NONE

#define ARGP_ONES_OP                    ARG_NONE

#define ARGP_PACKAGE_OP                 ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_BYTEDATA,      ARGP_DATAOBJLIST)
@@ -185,7 +186,6 @@ 
#define ARGP_TO_HEX_STR_OP              ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)

#define ARGP_TO_INTEGER_OP              ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)

#define ARGP_TO_STRING_OP               ARGP_LIST3 (ARGP_TERMARG,    ARGP_TERMARG,       ARGP_TARGET)

#define ARGP_TYPE_OP                    ARGP_LIST1 (ARGP_NAME_OR_REF)

#define ARGP_UNLOAD_OP                  ARGP_LIST1 (ARGP_SUPERNAME)

#define ARGP_VAR_PACKAGE_OP             ARGP_LIST3 (ARGP_PKGLENGTH,  ARGP_TERMARG,       ARGP_DATAOBJLIST)

#define ARGP_WAIT_OP                    ARGP_LIST2 (ARGP_SUPERNAME,  ARGP_TERMARG)
@@ -285,6 +285,7 @@ 
#define ARGI_NAMEPATH_OP                ARGI_INVALID_OPCODE

#define ARGI_NOOP_OP                    ARG_NONE

#define ARGI_NOTIFY_OP                  ARGI_LIST2 (ARGI_DEVICE_REF, ARGI_INTEGER)

#define ARGI_OBJECT_TYPE_OP             ARGI_LIST1 (ARGI_ANYTYPE)

#define ARGI_ONE_OP                     ARG_NONE

#define ARGI_ONES_OP                    ARG_NONE

#define ARGI_PACKAGE_OP                 ARGI_LIST1 (ARGI_INTEGER)
@@ -318,7 +319,6 @@ 
#define ARGI_TO_HEX_STR_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)

#define ARGI_TO_INTEGER_OP              ARGI_LIST2 (ARGI_COMPUTEDATA,ARGI_FIXED_TARGET)

#define ARGI_TO_STRING_OP               ARGI_LIST3 (ARGI_BUFFER,     ARGI_INTEGER,       ARGI_FIXED_TARGET)

#define ARGI_TYPE_OP                    ARGI_LIST1 (ARGI_ANYTYPE)

#define ARGI_UNLOAD_OP                  ARGI_LIST1 (ARGI_DDBHANDLE)

#define ARGI_VAR_PACKAGE_OP             ARGI_LIST1 (ARGI_INTEGER)

#define ARGI_WAIT_OP                    ARGI_LIST2 (ARGI_EVENT,      ARGI_INTEGER)

drivers/acpi/acpica/amlcode.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
#define AML_CREATE_WORD_FIELD_OP    (u16) 0x8b

#define AML_CREATE_BYTE_FIELD_OP    (u16) 0x8c

#define AML_CREATE_BIT_FIELD_OP     (u16) 0x8d

#define AML_TYPE_OP                 (u16) 0x8e

#define AML_OBJECT_TYPE_OP          (u16) 0x8e

#define AML_CREATE_QWORD_FIELD_OP   (u16) 0x8f	/* ACPI 2.0 */

#define AML_LAND_OP                 (u16) 0x90

#define AML_LOR_OP                  (u16) 0x91

drivers/acpi/acpica/exoparg1.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state) 
		status = acpi_ex_store(return_desc, operand[0], walk_state);

		break;



	case AML_TYPE_OP:	/* object_type (source_object) */

	case AML_OBJECT_TYPE_OP:	/* object_type (source_object) */

		/*

		 * Note: The operand is not resolved at this point because we want to

		 * get the associated object, not its value. For example, we don't

drivers/acpi/acpica/psopcode.c

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = { 
			 AML_TYPE_CREATE_FIELD,

			 AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE |

			 AML_DEFER | AML_CREATE),

/* 37 */ ACPI_OP("ObjectType", ARGP_TYPE_OP, ARGI_TYPE_OP,

/* 37 */ ACPI_OP("ObjectType", ARGP_OBJECT_TYPE_OP, ARGI_OBJECT_TYPE_OP,

			 ACPI_TYPE_ANY, AML_CLASS_EXECUTE,

			 AML_TYPE_EXEC_1A_0T_1R,

			 AML_FLAGS_EXEC_1A_0T_1R | AML_NO_OPERAND_RESOLVE),

CRA Git | Maintained and supported by SUSTech CRA and CCSE