Print this page
update to acpica-unix2-20140114
update to acpica-unix2-20131218
acpica-unix2-20130823
PANKOVs restructure

*** 3,13 **** * Name: acenv.h - Host and compiler configuration * *****************************************************************************/ /* ! * Copyright (C) 2000 - 2011, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: --- 3,13 ---- * Name: acenv.h - Host and compiler configuration * *****************************************************************************/ /* ! * Copyright (C) 2000 - 2014, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met:
*** 77,100 **** #define ACPI_LARGE_NAMESPACE_NODE #define ACPI_DATA_TABLE_DISASSEMBLY #define ACPI_SINGLE_THREADED #endif ! /* AcpiExec and AcpiBin configuration */ #ifdef ACPI_EXEC_APP #define ACPI_APPLICATION #define ACPI_FULL_DEBUG #define ACPI_MUTEX_DEBUG #define ACPI_DBG_TRACK_ALLOCATIONS #endif ! #ifdef ACPI_BIN_APP #define ACPI_APPLICATION #define ACPI_SINGLE_THREADED #endif /* Linkable ACPICA library */ #ifdef ACPI_LIBRARY #define ACPI_USE_LOCAL_CACHE #endif --- 77,122 ---- #define ACPI_LARGE_NAMESPACE_NODE #define ACPI_DATA_TABLE_DISASSEMBLY #define ACPI_SINGLE_THREADED #endif ! /* AcpiExec configuration. Multithreaded with full AML debugger */ #ifdef ACPI_EXEC_APP #define ACPI_APPLICATION #define ACPI_FULL_DEBUG #define ACPI_MUTEX_DEBUG #define ACPI_DBG_TRACK_ALLOCATIONS #endif ! /* AcpiNames configuration. Single threaded with debugger output enabled. */ ! ! #ifdef ACPI_NAMES_APP ! #define ACPI_DEBUGGER #define ACPI_APPLICATION #define ACPI_SINGLE_THREADED #endif + /* + * 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) || \ + (defined ACPI_EXAMPLE_APP) + #define ACPI_APPLICATION + #define ACPI_SINGLE_THREADED + #endif + + #ifdef ACPI_HELP_APP + #define ACPI_APPLICATION + #define ACPI_SINGLE_THREADED + #define ACPI_NO_ERROR_MESSAGES + #endif + /* Linkable ACPICA library */ #ifdef ACPI_LIBRARY #define ACPI_USE_LOCAL_CACHE #endif
*** 125,134 **** --- 147,159 ---- *****************************************************************************/ #if defined(_LINUX) || defined(__linux__) #include "aclinux.h" + #elif defined(_APPLE) || defined(__APPLE__) + #include "acmacosx.h" + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include "acfreebsd.h" #elif defined(__NetBSD__) #include "acnetbsd.h"
*** 158,167 **** --- 183,195 ---- #include "acos2.h" #elif defined(_AED_EFI) #include "acefi.h" + #elif defined(__HAIKU__) + #include "achaiku.h" + #else /* Unknown environment */ #error Unknown target environment
*** 275,285 **** * It may be necessary to tailor these include files to the target * generation environment. */ #ifdef ACPI_USE_SYSTEM_CLIBRARY ! /* Use the standard C library headers. We want to keep these to a minimum */ #ifdef ACPI_USE_STANDARD_HEADERS /* Use the standard headers from the standard locations */ --- 303,313 ---- * It may be necessary to tailor these include files to the target * generation environment. */ #ifdef ACPI_USE_SYSTEM_CLIBRARY ! /* Use the standard C library headers. We want to keep these to a minimum. */ #ifdef ACPI_USE_STANDARD_HEADERS /* Use the standard headers from the standard locations */
*** 342,352 **** /* 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) (void) 0 #define va_start(ap, A) (void) ((ap) = (((char *) &(A)) + (_Bnd (A,_AUPBND)))) #endif /* va_arg */ /* Use the local (ACPICA) definitions of the clib functions */ --- 370,380 ---- /* 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 /* va_arg */ /* Use the local (ACPICA) definitions of the clib functions */
*** 367,372 **** --- 395,409 ---- #define ACPI_TOUPPER(c) AcpiUtToUpper ((int) (c)) #define ACPI_TOLOWER(c) AcpiUtToLower ((int) (c)) #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__ */