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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/sys/acpi/platform/acenv.h
          +++ new/usr/src/common/acpica/include/platform/acenv.h
   1    1  /******************************************************************************
   2    2   *
   3    3   * Name: acenv.h - Host and compiler configuration
   4    4   *
   5    5   *****************************************************************************/
   6    6  
   7    7  /*
   8      - * Copyright (C) 2000 - 2011, Intel Corp.
        8 + * Copyright (C) 2000 - 2014, Intel Corp.
   9    9   * All rights reserved.
  10   10   *
  11   11   * Redistribution and use in source and binary forms, with or without
  12   12   * modification, are permitted provided that the following conditions
  13   13   * are met:
  14   14   * 1. Redistributions of source code must retain the above copyright
  15   15   *    notice, this list of conditions, and the following disclaimer,
  16   16   *    without modification.
  17   17   * 2. Redistributions in binary form must reproduce at minimum a disclaimer
  18   18   *    substantially similar to the "NO WARRANTY" disclaimer below
↓ open down ↓ 53 lines elided ↑ open up ↑
  72   72  #ifdef ACPI_ASL_COMPILER
  73   73  #define ACPI_APPLICATION
  74   74  #define ACPI_DISASSEMBLER
  75   75  #define ACPI_DEBUG_OUTPUT
  76   76  #define ACPI_CONSTANT_EVAL_ONLY
  77   77  #define ACPI_LARGE_NAMESPACE_NODE
  78   78  #define ACPI_DATA_TABLE_DISASSEMBLY
  79   79  #define ACPI_SINGLE_THREADED
  80   80  #endif
  81   81  
  82      -/* AcpiExec and AcpiBin configuration */
       82 +/* AcpiExec configuration. Multithreaded with full AML debugger */
  83   83  
  84   84  #ifdef ACPI_EXEC_APP
  85   85  #define ACPI_APPLICATION
  86   86  #define ACPI_FULL_DEBUG
  87   87  #define ACPI_MUTEX_DEBUG
  88   88  #define ACPI_DBG_TRACK_ALLOCATIONS
  89   89  #endif
  90   90  
  91      -#ifdef ACPI_BIN_APP
       91 +/* AcpiNames configuration. Single threaded with debugger output enabled. */
       92 +
       93 +#ifdef ACPI_NAMES_APP
       94 +#define ACPI_DEBUGGER
  92   95  #define ACPI_APPLICATION
  93   96  #define ACPI_SINGLE_THREADED
  94   97  #endif
  95   98  
       99 +/*
      100 + * AcpiBin/AcpiDump/AcpiSrc/AcpiXtract/Example configuration. All single
      101 + * threaded, with no debug output.
      102 + */
      103 +#if (defined ACPI_BIN_APP)      || \
      104 +    (defined ACPI_DUMP_APP)     || \
      105 +    (defined ACPI_SRC_APP)      || \
      106 +    (defined ACPI_XTRACT_APP)   || \
      107 +    (defined ACPI_EXAMPLE_APP)
      108 +#define ACPI_APPLICATION
      109 +#define ACPI_SINGLE_THREADED
      110 +#endif
      111 +
      112 +#ifdef ACPI_HELP_APP
      113 +#define ACPI_APPLICATION
      114 +#define ACPI_SINGLE_THREADED
      115 +#define ACPI_NO_ERROR_MESSAGES
      116 +#endif
      117 +
  96  118  /* Linkable ACPICA library */
  97  119  
  98  120  #ifdef ACPI_LIBRARY
  99  121  #define ACPI_USE_LOCAL_CACHE
 100  122  #endif
 101  123  
 102  124  /* Common for all ACPICA applications */
 103  125  
 104  126  #ifdef ACPI_APPLICATION
 105  127  #define ACPI_USE_SYSTEM_CLIBRARY
↓ open down ↓ 14 lines elided ↑ open up ↑
 120  142  /******************************************************************************
 121  143   *
 122  144   * Host configuration files. The compiler configuration files are included
 123  145   * by the host files.
 124  146   *
 125  147   *****************************************************************************/
 126  148  
 127  149  #if defined(_LINUX) || defined(__linux__)
 128  150  #include "aclinux.h"
 129  151  
      152 +#elif defined(_APPLE) || defined(__APPLE__)
      153 +#include "acmacosx.h"
      154 +
 130  155  #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 131  156  #include "acfreebsd.h"
 132  157  
 133  158  #elif defined(__NetBSD__)
 134  159  #include "acnetbsd.h"
 135  160  
 136  161  #elif defined(__sun)
 137  162  #include "acsolaris.h"
 138  163  
 139  164  #elif defined(MODESTO)
↓ open down ↓ 13 lines elided ↑ open up ↑
 153  178  
 154  179  #elif defined(_WRS_LIB_BUILD)
 155  180  #include "acvxworks.h"
 156  181  
 157  182  #elif defined(__OS2__)
 158  183  #include "acos2.h"
 159  184  
 160  185  #elif defined(_AED_EFI)
 161  186  #include "acefi.h"
 162  187  
      188 +#elif defined(__HAIKU__)
      189 +#include "achaiku.h"
      190 +
 163  191  #else
 164  192  
 165  193  /* Unknown environment */
 166  194  
 167  195  #error Unknown target environment
 168  196  #endif
 169  197  
 170  198  /*! [End] no source code translation !*/
 171  199  
 172  200  
↓ open down ↓ 97 lines elided ↑ open up ↑
 270  298   *      the standard header files may be used.
 271  299   *
 272  300   * The ACPICA subsystem only uses low level C library functions that do not call
 273  301   * operating system services and may therefore be inlined in the code.
 274  302   *
 275  303   * It may be necessary to tailor these include files to the target
 276  304   * generation environment.
 277  305   */
 278  306  #ifdef ACPI_USE_SYSTEM_CLIBRARY
 279  307  
 280      -/* Use the standard C library headers. We want to keep these to a minimum */
      308 +/* Use the standard C library headers. We want to keep these to a minimum. */
 281  309  
 282  310  #ifdef ACPI_USE_STANDARD_HEADERS
 283  311  
 284  312  /* Use the standard headers from the standard locations */
 285  313  
 286  314  #include <stdarg.h>
 287  315  #include <stdlib.h>
 288  316  #include <string.h>
 289  317  #include <ctype.h>
 290  318  
↓ open down ↓ 46 lines elided ↑ open up ↑
 337  365  
 338  366  /* Storage alignment properties */
 339  367  
 340  368  #define  _AUPBND                (sizeof (ACPI_NATIVE_INT) - 1)
 341  369  #define  _ADNBND                (sizeof (ACPI_NATIVE_INT) - 1)
 342  370  
 343  371  /* Variable argument list macro definitions */
 344  372  
 345  373  #define _Bnd(X, bnd)            (((sizeof (X)) + (bnd)) & (~(bnd)))
 346  374  #define va_arg(ap, T)           (*(T *)(((ap) += (_Bnd (T, _AUPBND))) - (_Bnd (T,_ADNBND))))
 347      -#define va_end(ap)              (void) 0
      375 +#define va_end(ap)              (ap = (va_list) NULL)
 348  376  #define va_start(ap, A)         (void) ((ap) = (((char *) &(A)) + (_Bnd (A,_AUPBND))))
 349  377  
 350  378  #endif /* va_arg */
 351  379  
 352  380  /* Use the local (ACPICA) definitions of the clib functions */
 353  381  
 354  382  #define ACPI_STRSTR(s1,s2)      AcpiUtStrstr ((s1), (s2))
 355  383  #define ACPI_STRCHR(s1,c)       AcpiUtStrchr ((s1), (c))
 356  384  #define ACPI_STRLEN(s)          (ACPI_SIZE) AcpiUtStrlen ((s))
 357  385  #define ACPI_STRCPY(d,s)        (void) AcpiUtStrcpy ((d), (s))
↓ open down ↓ 4 lines elided ↑ open up ↑
 362  390  #define ACPI_STRNCAT(d,s,n)     AcpiUtStrncat ((d), (s), (ACPI_SIZE)(n))
 363  391  #define ACPI_STRTOUL(d,s,n)     AcpiUtStrtoul ((d), (s), (ACPI_SIZE)(n))
 364  392  #define ACPI_MEMCMP(s1,s2,n)    AcpiUtMemcmp((const char *)(s1), (const char *)(s2), (ACPI_SIZE)(n))
 365  393  #define ACPI_MEMCPY(d,s,n)      (void) AcpiUtMemcpy ((d), (s), (ACPI_SIZE)(n))
 366  394  #define ACPI_MEMSET(d,v,n)      (void) AcpiUtMemset ((d), (v), (ACPI_SIZE)(n))
 367  395  #define ACPI_TOUPPER(c)         AcpiUtToUpper ((int) (c))
 368  396  #define ACPI_TOLOWER(c)         AcpiUtToLower ((int) (c))
 369  397  
 370  398  #endif /* ACPI_USE_SYSTEM_CLIBRARY */
 371  399  
      400 +#ifndef ACPI_FILE
      401 +#ifdef ACPI_APPLICATION
      402 +#include <stdio.h>
      403 +#define ACPI_FILE              FILE *
      404 +#else
      405 +#define ACPI_FILE              void *
      406 +#endif /* ACPI_APPLICATION */
      407 +#endif /* ACPI_FILE */
      408 +
 372  409  #endif /* __ACENV_H__ */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX