diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:50:46 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:50:46 +0000 |
| commit | 6b92cff93be2b7ae83deb340b753b02444cdcacd (patch) | |
| tree | a30a26908f5dc9678327cc04b639b945340f97c7 /sys/contrib/dev/acpica/actypes.h | |
| parent | 918310234a7ff346da92f4f10b72dac878b415f2 (diff) | |
| download | FreeBSD-src-6b92cff93be2b7ae83deb340b753b02444cdcacd.zip FreeBSD-src-6b92cff93be2b7ae83deb340b753b02444cdcacd.tar.gz | |
Vendor import of the Intel ACPI CA 200200404 drop.
Diffstat (limited to 'sys/contrib/dev/acpica/actypes.h')
| -rw-r--r-- | sys/contrib/dev/acpica/actypes.h | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/actypes.h b/sys/contrib/dev/acpica/actypes.h index 1bb8603..a7a99bb 100644 --- a/sys/contrib/dev/acpica/actypes.h +++ b/sys/contrib/dev/acpica/actypes.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: actypes.h - Common data types for the entire ACPI subsystem - * $Revision: 224 $ + * $Revision: 227 $ * *****************************************************************************/ @@ -148,12 +148,13 @@ typedef unsigned char BOOLEAN; typedef unsigned short UINT16; typedef int INT32; typedef unsigned int UINT32; +typedef COMPILER_DEPENDENT_INT64 INT64; typedef COMPILER_DEPENDENT_UINT64 UINT64; typedef UINT64 NATIVE_UINT; typedef UINT64 NATIVE_INT; -typedef NATIVE_UINT ACPI_TBLPTR; +typedef UINT64 ACPI_TBLPTR; typedef UINT64 ACPI_IO_ADDRESS; typedef UINT64 ACPI_PHYSICAL_ADDRESS; typedef UINT64 ACPI_SIZE; @@ -210,12 +211,13 @@ typedef unsigned char BOOLEAN; typedef unsigned short UINT16; typedef int INT32; typedef unsigned int UINT32; +typedef COMPILER_DEPENDENT_INT64 INT64; typedef COMPILER_DEPENDENT_UINT64 UINT64; typedef UINT32 NATIVE_UINT; typedef INT32 NATIVE_INT; -typedef NATIVE_UINT ACPI_TBLPTR; +typedef UINT64 ACPI_TBLPTR; typedef UINT32 ACPI_IO_ADDRESS; typedef UINT64 ACPI_PHYSICAL_ADDRESS; typedef UINT32 ACPI_SIZE; @@ -239,7 +241,6 @@ typedef char NATIVE_CHAR; /* * Data type ranges */ - #define ACPI_UINT8_MAX (UINT8) 0xFF #define ACPI_UINT16_MAX (UINT16) 0xFFFF #define ACPI_UINT32_MAX (UINT32) 0xFFFFFFFF @@ -262,6 +263,31 @@ typedef UINT64 u64; /* + * Pointer overlays to avoid lots of typecasting for + * code that accepts both physical and logical pointers. + */ +typedef union AcpiPointers +{ + ACPI_PHYSICAL_ADDRESS Physical; + void *Logical; + ACPI_TBLPTR Value; + +} ACPI_POINTERS; + +typedef struct AcpiPointer +{ + UINT32 PointerType; + ACPI_POINTERS Pointer; + +} ACPI_POINTER; + +/* PointerTypes for above */ + +#define ACPI_LOGICAL_POINTER 0x01 +#define ACPI_PHYSICAL_POINTER 0x02 + + +/* * Useful defines */ |
