diff options
Diffstat (limited to 'source/include/platform/acenv.h')
| -rw-r--r-- | source/include/platform/acenv.h | 65 |
1 files changed, 7 insertions, 58 deletions
diff --git a/source/include/platform/acenv.h b/source/include/platform/acenv.h index b5268b4e6..7a7245624 100644 --- a/source/include/platform/acenv.h +++ b/source/include/platform/acenv.h @@ -151,7 +151,6 @@ (defined ACPI_EXAMPLE_APP) #define ACPI_APPLICATION #define ACPI_SINGLE_THREADED -#define USE_NATIVE_ALLOCATE_ZEROED #endif /* iASL configuration */ @@ -198,6 +197,7 @@ #ifdef ACPI_DUMP_APP #define ACPI_USE_NATIVE_MEMORY_MAPPING +#define USE_NATIVE_ALLOCATE_ZEROED #endif /* AcpiNames/Example configuration. Hardware disabled */ @@ -288,9 +288,6 @@ #elif defined(_GNU_EFI) #include "acefi.h" -#elif defined(_EDK2_EFI) -#include "acefi.h" - #elif defined(__HAIKU__) #include "achaiku.h" @@ -425,48 +422,12 @@ #include <stdlib.h> #include <string.h> #include <ctype.h> -#ifdef ACPI_APPLICATION -#include <stdio.h> -#include <fcntl.h> -#include <errno.h> -#include <signal.h> -#include <sys/stat.h> -#endif - -#else /* ACPI_USE_STANDARD_HEADERS */ - -#ifdef ACPI_USE_COMPILER_VA - -/* - * We will be linking to the standard Clib functions, but stdarg.h is - * compiler specific, this works for linux kernel. - */ -#include <stdarg.h> - -#else /* ACPI_USE_COMPILER_VA */ - -#ifndef va_arg - -#ifndef _VALIST -#define _VALIST -typedef char *va_list; -#endif /* _VALIST */ - -/* Storage alignment properties */ - -#define _AUPBND (sizeof (ACPI_NATIVE_INT) - 1) -#define _ADNBND (sizeof (ACPI_NATIVE_INT) - 1) - -/* Variable argument list macro definitions */ -#define _Bnd(X, bnd) (((sizeof (X)) + (bnd)) & (~(bnd))) -#define va_arg(ap, T) (*(T *)(((ap) += (_Bnd (T, _AUPBND))) - (_Bnd (T,_ADNBND)))) -#define va_end(ap) (ap = (va_list) NULL) -#define va_start(ap, A) (void) ((ap) = (((char *) &(A)) + (_Bnd (A,_AUPBND)))) +#endif /* ACPI_USE_STANDARD_HEADERS */ -#endif /* va_arg */ +/* We will be linking to the standard Clib functions */ -#endif /* ACPI_USE_COMPILER_VA */ +#else /****************************************************************************** * @@ -474,19 +435,6 @@ typedef char *va_list; * *****************************************************************************/ -typedef signed char int8_t; -typedef short int int16_t; -typedef int int32_t; -typedef unsigned char uint8_t; -typedef unsigned short int uint16_t; -typedef unsigned int uint32_t; -typedef COMPILER_DEPENDENT_INT64 int64_t; -typedef COMPILER_DEPENDENT_UINT64 uint64_t; - -#endif /* ACPI_USE_STANDARD_HEADERS */ - -#else /* ACPI_USE_SYSTEM_CLIBRARY */ - /* * Use local definitions of C library macros and functions. These function * implementations may not be as efficient as an inline or assembly code @@ -518,16 +466,17 @@ typedef char *va_list; #endif /* ACPI_USE_SYSTEM_CLIBRARY */ +#ifndef ACPI_FILE #ifdef ACPI_APPLICATION +#include <stdio.h> #define ACPI_FILE FILE * #define ACPI_FILE_OUT stdout #define ACPI_FILE_ERR stderr -#define ACPI_FILE_IN stdin #else #define ACPI_FILE void * #define ACPI_FILE_OUT NULL #define ACPI_FILE_ERR NULL -#define ACPI_FILE_IN NULL #endif /* ACPI_APPLICATION */ +#endif /* ACPI_FILE */ #endif /* __ACENV_H__ */ |