Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ACPICA] Update to version 20201217. CORE-17410

Browse source
This commit is contained in:
Thomas Faber 2020-12-27 16:01:03 +01:00
parent 8de143e058
commit 9587fe1c36
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
18 changed files with 43 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/bus/acpi/acpica/dispatcher/dscontrol.c
View file

@ -102,7 +102,7 @@ AcpiDsExecBeginControlOp (
} }
} }
/*lint -fallthrough */ ACPI_FALLTHROUGH;
case AML_IF_OP: case AML_IF_OP:
/* /*

2
drivers/bus/acpi/acpica/dispatcher/dsdebug.c
View file

@ -146,7 +146,7 @@ AcpiDsDumpMethodStack (
/* Ignore control codes, they are not errors */ /* Ignore control codes, they are not errors */
if ((Status & AE_CODE_MASK) == AE_CODE_CONTROL) if (ACPI_CNTL_EXCEPTION (Status))
{ {
return_VOID; return_VOID;
} }

3
drivers/bus/acpi/acpica/dispatcher/dswexec.c
View file

@ -664,8 +664,7 @@ AcpiDsExecEndOp (
break; break;
} }
/* Fall through */ ACPI_FALLTHROUGH;
/*lint -fallthrough */
case AML_INT_EVAL_SUBTREE_OP: case AML_INT_EVAL_SUBTREE_OP:

2
drivers/bus/acpi/acpica/dispatcher/dswload.c
View file

@ -267,7 +267,7 @@ AcpiDsLoad1BeginOp (
break; break;
} }
/*lint -fallthrough */ ACPI_FALLTHROUGH;
default: default:

2
drivers/bus/acpi/acpica/dispatcher/dswload2.c
View file

@ -258,7 +258,7 @@ AcpiDsLoad2BeginOp (
break; break;
} }
/*lint -fallthrough */ ACPI_FALLTHROUGH;
default: default:

2
drivers/bus/acpi/acpica/executer/exfldio.c
View file

@ -508,7 +508,7 @@ AcpiExFieldDatumIo (
* RegionField case and write the datum to the Operation Region * RegionField case and write the datum to the Operation Region
*/ */
/*lint -fallthrough */ ACPI_FALLTHROUGH;
case ACPI_TYPE_LOCAL_REGION_FIELD: case ACPI_TYPE_LOCAL_REGION_FIELD:
/* /*

4
drivers/bus/acpi/acpica/executer/exresop.c
View file

@ -250,7 +250,7 @@ AcpiExResolveOperands (
TargetOp = AML_DEBUG_OP; TargetOp = AML_DEBUG_OP;
/*lint -fallthrough */ ACPI_FALLTHROUGH;
case ACPI_REFCLASS_ARG: case ACPI_REFCLASS_ARG:
case ACPI_REFCLASS_LOCAL: case ACPI_REFCLASS_LOCAL:
@ -314,7 +314,7 @@ AcpiExResolveOperands (
* Else not a string - fall through to the normal Reference * Else not a string - fall through to the normal Reference
* case below * case below
*/ */
/*lint -fallthrough */ ACPI_FALLTHROUGH;
case ARGI_REFERENCE: /* References: */ case ARGI_REFERENCE: /* References: */
case ARGI_INTEGER_REF: case ARGI_INTEGER_REF:

4
drivers/bus/acpi/acpica/executer/exstore.c
View file

@ -140,7 +140,7 @@ AcpiExStore (
return_ACPI_STATUS (AE_OK); return_ACPI_STATUS (AE_OK);
} }
/*lint -fallthrough */ ACPI_FALLTHROUGH;
default: default:
@ -477,7 +477,7 @@ AcpiExStoreObjectToNode (
break; break;
} }
/* Fallthrough */ ACPI_FALLTHROUGH;
case ACPI_TYPE_DEVICE: case ACPI_TYPE_DEVICE:
case ACPI_TYPE_EVENT: case ACPI_TYPE_EVENT:

2
drivers/bus/acpi/acpica/hardware/hwgpe.c
View file

@ -146,7 +146,7 @@ AcpiHwLowSetGpe (
return (AE_BAD_PARAMETER); return (AE_BAD_PARAMETER);
} }
/*lint -fallthrough */ ACPI_FALLTHROUGH;
case ACPI_GPE_ENABLE: case ACPI_GPE_ENABLE:

10
drivers/bus/acpi/acpica/include/acexcep.h
View file

@ -96,11 +96,11 @@ typedef struct acpi_exception_info
#define AE_OK (ACPI_STATUS) 0x0000 #define AE_OK (ACPI_STATUS) 0x0000
#define ACPI_ENV_EXCEPTION(Status) (Status & AE_CODE_ENVIRONMENTAL) #define ACPI_ENV_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_ENVIRONMENTAL)
#define ACPI_AML_EXCEPTION(Status) (Status & AE_CODE_AML) #define ACPI_AML_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_AML)
#define ACPI_PROG_EXCEPTION(Status) (Status & AE_CODE_PROGRAMMER) #define ACPI_PROG_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_PROGRAMMER)
#define ACPI_TABLE_EXCEPTION(Status) (Status & AE_CODE_ACPI_TABLES) #define ACPI_TABLE_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_ACPI_TABLES)
#define ACPI_CNTL_EXCEPTION(Status) (Status & AE_CODE_CONTROL) #define ACPI_CNTL_EXCEPTION(Status) (((Status) & AE_CODE_MASK) == AE_CODE_CONTROL)
/* /*

2
drivers/bus/acpi/acpica/include/acpixf.h
View file

@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */ /* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20201113 #define ACPI_CA_VERSION 0x20201217
#include "acconfig.h" #include "acconfig.h"
#include "actypes.h" #include "actypes.h"

5
drivers/bus/acpi/acpica/include/actypes.h
View file

@ -1429,5 +1429,10 @@ typedef enum
#define ACPI_OPT_END -1 #define ACPI_OPT_END -1
/* Definitions for explicit fallthrough */
#ifndef ACPI_FALLTHROUGH
#define ACPI_FALLTHROUGH do {} while(0)
#endif
#endif /* __ACTYPES_H__ */ #endif /* __ACTYPES_H__ */

15
drivers/bus/acpi/acpica/include/platform/acgcc.h
View file

@ -88,6 +88,21 @@ typedef __builtin_va_list va_list;
#define ACPI_USE_NATIVE_MATH64 #define ACPI_USE_NATIVE_MATH64
/* GCC did not support __has_attribute until 5.1. */
#ifndef __has_attribute
#define __has_attribute(x) 0
#endif
/*
* Explictly mark intentional explicit fallthrough to silence
* -Wimplicit-fallthrough in GCC 7.1+.
*/
#if __has_attribute(__fallthrough__)
#define ACPI_FALLTHROUGH __attribute__((__fallthrough__))
#endif
#ifdef __REACTOS__ #ifdef __REACTOS__
/* Flush CPU cache - used when going to sleep. Wbinvd or similar. */ /* Flush CPU cache - used when going to sleep. Wbinvd or similar. */

3
drivers/bus/acpi/acpica/parser/psloop.c
View file

@ -302,8 +302,7 @@ AcpiPsParseLoop (
*/ */
WalkState->Op = NULL; WalkState->Op = NULL;
Status = AcpiDsGetPredicateValue (WalkState, ACPI_TO_POINTER (TRUE)); Status = AcpiDsGetPredicateValue (WalkState, ACPI_TO_POINTER (TRUE));
if (ACPI_FAILURE (Status) && if (ACPI_FAILURE (Status) && !ACPI_CNTL_EXCEPTION (Status))
((Status & AE_CODE_MASK) != AE_CODE_CONTROL))
{ {
if (Status == AE_AML_NO_RETURN_VALUE) if (Status == AE_AML_NO_RETURN_VALUE)
{ {

2
drivers/bus/acpi/acpica/parser/psparse.c
View file

@ -425,7 +425,7 @@ AcpiPsNextParseState (
default: default:
Status = CallbackStatus; Status = CallbackStatus;
if ((CallbackStatus & AE_CODE_MASK) == AE_CODE_CONTROL) if (ACPI_CNTL_EXCEPTION (CallbackStatus))
{ {
Status = AE_OK; Status = AE_OK;
} }

2
drivers/bus/acpi/acpica/utilities/utdelete.c
View file

@ -158,7 +158,7 @@ AcpiUtDeleteInternalObj (
(void) AcpiEvDeleteGpeBlock (Object->Device.GpeBlock); (void) AcpiEvDeleteGpeBlock (Object->Device.GpeBlock);
} }
/*lint -fallthrough */ ACPI_FALLTHROUGH;
case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_PROCESSOR:
case ACPI_TYPE_THERMAL: case ACPI_TYPE_THERMAL:

4
drivers/bus/acpi/acpica/utilities/utstrsuppt.c
View file

@ -166,7 +166,7 @@ AcpiUtConvertDecimalString (
* 1) Runtime: terminate with no error, per the ACPI spec * 1) Runtime: terminate with no error, per the ACPI spec
* 2) Compiler: return an error * 2) Compiler: return an error
*/ */
if (!isdigit (*String)) if (!isdigit ((int) *String))
{ {
#ifdef ACPI_ASL_COMPILER #ifdef ACPI_ASL_COMPILER
Status = AE_BAD_DECIMAL_CONSTANT; Status = AE_BAD_DECIMAL_CONSTANT;
@ -228,7 +228,7 @@ AcpiUtConvertHexString (
* 1) Runtime: terminate with no error, per the ACPI spec * 1) Runtime: terminate with no error, per the ACPI spec
* 2) Compiler: return an error * 2) Compiler: return an error
*/ */
if (!isxdigit (*String)) if (!isxdigit ((int) *String))
{ {
#ifdef ACPI_ASL_COMPILER #ifdef ACPI_ASL_COMPILER
Status = AE_BAD_HEX_CONSTANT; Status = AE_BAD_HEX_CONSTANT;

2
media/doc/3rd Party Files.txt
View file

@ -69,7 +69,7 @@ URL: https://gitlab.freedesktop.org/mesa/glu, ftp://ftp.freedesktop.org/pub/mesa
Title: ACPICA Title: ACPICA
Path: drivers/bus/acpi/acpica Path: drivers/bus/acpi/acpica
Used Version: 20201113 Used Version: 20201217
License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html) License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html)
URL: https://acpica.org/ URL: https://acpica.org/