aboutsummaryrefslogtreecommitdiff
path: root/source/include
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2019-08-16 17:03:01 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2019-08-16 17:03:01 +0000
commite63852a7532181a14cec2928b31af2209e98414a (patch)
treebe94508475add18bbaa0cacd6c467983d2b8a443 /source/include
parent0ada71f05e76bf61eb2d5aba852db00705edd364 (diff)
vendor/acpica/20190816
Notes
Diffstat (limited to 'source/include')
-rw-r--r--source/include/acconfig.h4
-rw-r--r--source/include/aclocal.h4
-rw-r--r--source/include/acobject.h2
-rw-r--r--source/include/acpiosxf.h1
-rw-r--r--source/include/acpixf.h14
-rw-r--r--source/include/acstruct.h2
-rw-r--r--source/include/actypes.h20
-rw-r--r--source/include/acutils.h9
-rw-r--r--source/include/platform/acmsvc.h1
9 files changed, 37 insertions, 20 deletions
diff --git a/source/include/acconfig.h b/source/include/acconfig.h
index e93cfe1eafae..50bfe0b9a771 100644
--- a/source/include/acconfig.h
+++ b/source/include/acconfig.h
@@ -239,9 +239,9 @@
#define ACPI_DEFAULT_PAGE_SIZE 4096 /* Must be power of 2 */
-/* OwnerId tracking. 8 entries allows for 255 OwnerIds */
+/* OwnerId tracking. 128 entries allows for 4095 OwnerIds */
-#define ACPI_NUM_OWNERID_MASKS 8
+#define ACPI_NUM_OWNERID_MASKS 128
/* Size of the root table array is increased by this increment */
diff --git a/source/include/aclocal.h b/source/include/aclocal.h
index e1ed00531356..c3703c152a44 100644
--- a/source/include/aclocal.h
+++ b/source/include/aclocal.h
@@ -295,12 +295,12 @@ typedef struct acpi_namespace_node
union acpi_operand_object *Object; /* Interpreter object */
UINT8 DescriptorType; /* Differentiate object descriptor types */
UINT8 Type; /* ACPI Type associated with this name */
- UINT8 Flags; /* Miscellaneous flags */
- ACPI_OWNER_ID OwnerId; /* Node creator */
+ UINT16 Flags; /* Miscellaneous flags */
ACPI_NAME_UNION Name; /* ACPI Name, always 4 chars per ACPI spec */
struct acpi_namespace_node *Parent; /* Parent node */
struct acpi_namespace_node *Child; /* First child */
struct acpi_namespace_node *Peer; /* First peer */
+ ACPI_OWNER_ID OwnerId; /* Node creator */
/*
* The following fields are used by the ASL compiler and disassembler only
diff --git a/source/include/acobject.h b/source/include/acobject.h
index b9b30200e9ec..74feb8d93da9 100644
--- a/source/include/acobject.h
+++ b/source/include/acobject.h
@@ -333,8 +333,8 @@ typedef struct acpi_object_method
} Dispatch;
UINT32 AmlLength;
- UINT8 ThreadCount;
ACPI_OWNER_ID OwnerId;
+ UINT8 ThreadCount;
} ACPI_OBJECT_METHOD;
diff --git a/source/include/acpiosxf.h b/source/include/acpiosxf.h
index 19eef638d5e0..dfcd008f6f7d 100644
--- a/source/include/acpiosxf.h
+++ b/source/include/acpiosxf.h
@@ -577,6 +577,7 @@ AcpiOsEnterSleep (
* Debug print routines
*/
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsPrintf
+ACPI_PRINTF_LIKE (1)
void ACPI_INTERNAL_VAR_XFACE
AcpiOsPrintf (
const char *Format,
diff --git a/source/include/acpixf.h b/source/include/acpixf.h
index 2893bf23b1ca..a123eed7fd86 100644
--- a/source/include/acpixf.h
+++ b/source/include/acpixf.h
@@ -154,7 +154,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20190703
+#define ACPI_CA_VERSION 0x20190816
#include "acconfig.h"
#include "actypes.h"
@@ -446,6 +446,9 @@ ACPI_GLOBAL (BOOLEAN, AcpiGbl_SystemAwakeAndRunning);
#define ACPI_HW_DEPENDENT_RETURN_OK(Prototype) \
ACPI_EXTERNAL_RETURN_OK(Prototype)
+#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \
+ ACPI_EXTERNAL_RETURN_UINT32(prototype)
+
#define ACPI_HW_DEPENDENT_RETURN_VOID(Prototype) \
ACPI_EXTERNAL_RETURN_VOID(Prototype)
@@ -456,6 +459,9 @@ ACPI_GLOBAL (BOOLEAN, AcpiGbl_SystemAwakeAndRunning);
#define ACPI_HW_DEPENDENT_RETURN_OK(Prototype) \
static ACPI_INLINE Prototype {return(AE_OK);}
+#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \
+ static ACPI_INLINE prototype {return(0);}
+
#define ACPI_HW_DEPENDENT_RETURN_VOID(Prototype) \
static ACPI_INLINE Prototype {return;}
@@ -1076,6 +1082,12 @@ AcpiGetGpeStatus (
UINT32 GpeNumber,
ACPI_EVENT_STATUS *EventStatus))
+ACPI_HW_DEPENDENT_RETURN_UINT32 (
+UINT32
+AcpiDispatchGpe (
+ ACPI_HANDLE GpeDevice,
+ UINT32 GpeNumber))
+
ACPI_HW_DEPENDENT_RETURN_STATUS (
ACPI_STATUS
AcpiDisableAllGpes (
diff --git a/source/include/acstruct.h b/source/include/acstruct.h
index a0b63ec40937..f81c8a7dd386 100644
--- a/source/include/acstruct.h
+++ b/source/include/acstruct.h
@@ -327,9 +327,9 @@ typedef struct acpi_evaluate_info
UINT32 ReturnFlags; /* Used for return value analysis */
UINT32 ReturnBtype; /* Bitmapped type of the returned object */
UINT16 ParamCount; /* Count of the input argument list */
+ UINT16 NodeFlags; /* Same as Node->Flags */
UINT8 PassNumber; /* Parser pass number */
UINT8 ReturnObjectType; /* Object type of the returned object */
- UINT8 NodeFlags; /* Same as Node->Flags */
UINT8 Flags; /* General flags */
} ACPI_EVALUATE_INFO;
diff --git a/source/include/actypes.h b/source/include/actypes.h
index e7a2d57804e2..0521f3353e67 100644
--- a/source/include/actypes.h
+++ b/source/include/actypes.h
@@ -591,8 +591,8 @@ typedef void * ACPI_HANDLE; /* Actually a ptr to a N
/* Owner IDs are used to track namespace nodes for selective deletion */
-typedef UINT8 ACPI_OWNER_ID;
-#define ACPI_OWNER_ID_MAX 0xFF
+typedef UINT16 ACPI_OWNER_ID;
+#define ACPI_OWNER_ID_MAX 0xFFF /* 4095 possible owner IDs */
#define ACPI_INTEGER_BIT_SIZE 64
@@ -657,7 +657,7 @@ typedef UINT64 ACPI_INTEGER;
/* Pointer/Integer type conversions */
-#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) 0, (ACPI_SIZE) (i))
+#define ACPI_TO_POINTER(i) ACPI_CAST_PTR (void, (ACPI_SIZE) (i))
#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0)
#define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0)
#define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)
@@ -1513,12 +1513,14 @@ typedef enum
#define ACPI_OSI_WIN_VISTA_SP2 0x0A
#define ACPI_OSI_WIN_7 0x0B
#define ACPI_OSI_WIN_8 0x0C
-#define ACPI_OSI_WIN_10 0x0D
-#define ACPI_OSI_WIN_10_RS1 0x0E
-#define ACPI_OSI_WIN_10_RS2 0x0F
-#define ACPI_OSI_WIN_10_RS3 0x10
-#define ACPI_OSI_WIN_10_RS4 0x11
-#define ACPI_OSI_WIN_10_RS5 0x12
+#define ACPI_OSI_WIN_8_1 0x0D
+#define ACPI_OSI_WIN_10 0x0E
+#define ACPI_OSI_WIN_10_RS1 0x0F
+#define ACPI_OSI_WIN_10_RS2 0x10
+#define ACPI_OSI_WIN_10_RS3 0x11
+#define ACPI_OSI_WIN_10_RS4 0x12
+#define ACPI_OSI_WIN_10_RS5 0x13
+#define ACPI_OSI_WIN_10_19H1 0x14
/* Definitions of getopt */
diff --git a/source/include/acutils.h b/source/include/acutils.h
index 8f48d3702823..0c2327d2c3ca 100644
--- a/source/include/acutils.h
+++ b/source/include/acutils.h
@@ -1194,30 +1194,33 @@ AcpiUtDeleteAddressLists (
/*
* utxferror - various error/warning output functions
*/
+ACPI_PRINTF_LIKE(5)
void ACPI_INTERNAL_VAR_XFACE
AcpiUtPredefinedWarning (
const char *ModuleName,
UINT32 LineNumber,
char *Pathname,
- UINT8 NodeFlags,
+ UINT16 NodeFlags,
const char *Format,
...);
+ACPI_PRINTF_LIKE(5)
void ACPI_INTERNAL_VAR_XFACE
AcpiUtPredefinedInfo (
const char *ModuleName,
UINT32 LineNumber,
char *Pathname,
- UINT8 NodeFlags,
+ UINT16 NodeFlags,
const char *Format,
...);
+ACPI_PRINTF_LIKE(5)
void ACPI_INTERNAL_VAR_XFACE
AcpiUtPredefinedBiosError (
const char *ModuleName,
UINT32 LineNumber,
char *Pathname,
- UINT8 NodeFlags,
+ UINT16 NodeFlags,
const char *Format,
...);
diff --git a/source/include/platform/acmsvc.h b/source/include/platform/acmsvc.h
index 394b8095cf58..5c8714ce2548 100644
--- a/source/include/platform/acmsvc.h
+++ b/source/include/platform/acmsvc.h
@@ -287,7 +287,6 @@
#pragma warning(disable:4459)
-
/* Debug support. */
#ifdef _DEBUG
generated by cgit v1.3 (git 2.53.0) at 2026-05-11 09:55:19 +0000