diff options
author | jkim <jkim@FreeBSD.org> | 2013-12-19 05:51:01 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2013-12-19 05:51:01 +0000 |
commit | b37c83dbb637fc63c5ba07fe61555d4d6e29dd7c (patch) | |
tree | 7fcfdcc62c3319ffd669b18b080d40c9c5897210 /source/include/platform | |
parent | a1672476f94b0c9ac84a682574aeb1eb481c484c (diff) | |
download | FreeBSD-src-b37c83dbb637fc63c5ba07fe61555d4d6e29dd7c.zip FreeBSD-src-b37c83dbb637fc63c5ba07fe61555d4d6e29dd7c.tar.gz |
Import ACPICA 20131218.
Diffstat (limited to 'source/include/platform')
-rw-r--r-- | source/include/platform/acenv.h | 20 | ||||
-rw-r--r-- | source/include/platform/aclinux.h | 8 |
2 files changed, 15 insertions, 13 deletions
diff --git a/source/include/platform/acenv.h b/source/include/platform/acenv.h index 8895ceb..6608571 100644 --- a/source/include/platform/acenv.h +++ b/source/include/platform/acenv.h @@ -97,13 +97,14 @@ #endif /* - * AcpiBin/AcpiDump/AcpiSrc/AcpiXtract configuration. All single + * AcpiBin/AcpiDump/AcpiSrc/AcpiXtract/Example configuration. All single * threaded, with no debug output. */ -#if (defined ACPI_BIN_APP) || \ - (defined ACPI_DUMP_APP) || \ - (defined ACPI_SRC_APP) || \ - (defined ACPI_XTRACT_APP) +#if (defined ACPI_BIN_APP) || \ + (defined ACPI_DUMP_APP) || \ + (defined ACPI_SRC_APP) || \ + (defined ACPI_XTRACT_APP) || \ + (defined ACPI_EXAMPLE_APP) #define ACPI_APPLICATION #define ACPI_SINGLE_THREADED #endif @@ -396,4 +397,13 @@ typedef char *va_list; #endif /* ACPI_USE_SYSTEM_CLIBRARY */ +#ifndef ACPI_FILE +#ifdef ACPI_APPLICATION +#include <stdio.h> +#define ACPI_FILE FILE * +#else +#define ACPI_FILE void * +#endif /* ACPI_APPLICATION */ +#endif /* ACPI_FILE */ + #endif /* __ACENV_H__ */ diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h index f56aff1..51cc4c2 100644 --- a/source/include/platform/aclinux.h +++ b/source/include/platform/aclinux.h @@ -257,14 +257,6 @@ EarlyAcpiOsUnmapMemory ( void __iomem *Virt, ACPI_SIZE Size); -void -AcpiOsGpeCount ( - UINT32 GpeNumber); - -void -AcpiOsFixedEventCount ( - UINT32 FixedEventNumber); - ACPI_STATUS AcpiOsHotplugExecute ( ACPI_OSD_EXEC_CALLBACK Function, |