Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d79e0389 authored by Erik Schmauss's avatar Erik Schmauss Committed by Rafael J. Wysocki
Browse files

ACPICA: Changing External to a named object 

ACPICA commit 0d5dd42fd7d5129835b6d92250378a962eb73cb3

This is done so that the aml parser will build the parse tree of
External Op as a named object. This is done to streamline creation
of external op parse nodes and facilitate namespace resolution of
externals.

Link: https://github.com/acpica/acpica/commit/0d5dd42f


Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
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 2d2a9543

drivers/acpi/acpica/acopcode.h

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
#define ARGP_DWORD_OP                   ARGP_LIST1 (ARGP_DWORDDATA)

#define ARGP_ELSE_OP                    ARGP_LIST2 (ARGP_PKGLENGTH,  ARGP_TERMLIST)

#define ARGP_EVENT_OP                   ARGP_LIST1 (ARGP_NAME)

#define ARGP_EXTERNAL_OP                ARGP_LIST3 (ARGP_NAMESTRING, ARGP_BYTEDATA,      ARGP_BYTEDATA)

#define ARGP_EXTERNAL_OP                ARGP_LIST3 (ARGP_NAME,       ARGP_BYTEDATA,      ARGP_BYTEDATA)

#define ARGP_FATAL_OP                   ARGP_LIST3 (ARGP_BYTEDATA,   ARGP_DWORDDATA,     ARGP_TERMARG)

#define ARGP_FIELD_OP                   ARGP_LIST4 (ARGP_PKGLENGTH,  ARGP_NAMESTRING,    ARGP_BYTEDATA,  ARGP_FIELDLIST)

#define ARGP_FIND_SET_LEFT_BIT_OP       ARGP_LIST2 (ARGP_TERMARG,    ARGP_TARGET)

drivers/acpi/acpica/psopcode.c

+5 −3
Original line number Diff line number Diff line
@@ -651,8 +651,10 @@ const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES] = { 
/* ACPI 6.0 opcodes */



/* 81 */ ACPI_OP("External", ARGP_EXTERNAL_OP, ARGI_EXTERNAL_OP,

			 ACPI_TYPE_ANY, AML_CLASS_EXECUTE, /* ? */

			 AML_TYPE_EXEC_3A_0T_0R, AML_FLAGS_EXEC_3A_0T_0R),

			 ACPI_TYPE_ANY, AML_CLASS_NAMED_OBJECT,

			 AML_TYPE_NAMED_SIMPLE,

			 AML_HAS_ARGS | AML_NSOBJECT | AML_NSOPCODE |

			 AML_NSNODE | AML_NAMED),

/* 82 */ ACPI_OP("Comment", ARGP_COMMENT_OP, ARGI_COMMENT_OP,

			 ACPI_TYPE_STRING, AML_CLASS_ARGUMENT,

			 AML_TYPE_LITERAL, AML_CONSTANT)