aboutsummaryrefslogtreecommitdiff
path: root/tools/acpiexec/aecommon.h
diff options
context:
space:
mode:
Diffstat (limited to 'tools/acpiexec/aecommon.h')
-rw-r--r--tools/acpiexec/aecommon.h47
1 files changed, 19 insertions, 28 deletions
diff --git a/tools/acpiexec/aecommon.h b/tools/acpiexec/aecommon.h
index bab2b6eb607d3..3febf6f40c86b 100644
--- a/tools/acpiexec/aecommon.h
+++ b/tools/acpiexec/aecommon.h
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -126,6 +126,7 @@
#include <signal.h>
#include "acpi.h"
+#include "accommon.h"
#include "acparser.h"
#include "amlcode.h"
#include "acnamesp.h"
@@ -140,7 +141,7 @@ extern BOOLEAN AcpiGbl_IgnoreErrors;
/*
* Debug Regions
*/
-typedef struct Region
+typedef struct ae_region
{
ACPI_PHYSICAL_ADDRESS Address;
UINT32 Length;
@@ -148,36 +149,14 @@ typedef struct Region
void *NextRegion;
UINT8 SpaceId;
-} REGION;
+} AE_REGION;
-typedef struct DebugRegions
+typedef struct ae_debug_regions
{
UINT32 NumberOfRegions;
- REGION *RegionList;
+ AE_REGION *RegionList;
-} DEBUG_REGIONS;
-
-
-/*
- * Pointer overlay for 16-bit code
- */
-typedef union ptr_ovl
-{
- void *ptr;
- UINT32 dword;
- struct
- {
- UINT16 offset;
- UINT16 base;
- } ovl;
-
-} PTR_OVL;
-
-
-#define GET_SEGMENT(ptr) ((UINT16)(_segment)(ptr))
-#define GET_OFFSET(ptr) ((UINT16)(UINT32) (ptr))
-#define GET_PHYSICAL_ADDRESS(ptr) (((((UINT32)GET_SEGMENT(ptr)) << 4)) + GET_OFFSET(ptr))
-#define PTR_OVL_BUILD_PTR(p,b,o) {p.ovl.base=b;p.ovl.offset=o;}
+} AE_DEBUG_REGIONS;
#define TEST_OUTPUT_LEVEL(lvl) if ((lvl) & OutputLevel)
@@ -238,6 +217,18 @@ void
AeMiscellaneousTests (
void);
+ACPI_STATUS
+AeRegionHandler (
+ UINT32 Function,
+ ACPI_PHYSICAL_ADDRESS Address,
+ UINT32 BitWidth,
+ ACPI_INTEGER *Value,
+ void *HandlerContext,
+ void *RegionContext);
+
+UINT32
+AeGpeHandler (
+ void *Context);
#endif /* _AECOMMON */