update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure

          --- old/usr/src/uts/intel/sys/acpi/platform/acfreebsd.h
          +++ new/usr/src/common/acpica/include/platform/acfreebsd.h
   1    1  /******************************************************************************
   2    2   *
   3    3   * Name: acfreebsd.h - OS specific defines, etc.
   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

  19   19   *    ("Disclaimer") and any redistribution must be conditioned upon
  20   20   *    including a substantially similar Disclaimer requirement for further
  21   21   *    binary redistribution.
  22   22   * 3. Neither the names of the above-listed copyright holders nor the names
  23   23   *    of any contributors may be used to endorse or promote products derived
  24   24   *    from this software without specific prior written permission.
  25   25   *
  26   26   * Alternatively, this software may be distributed under the terms of the
  27   27   * GNU General Public License ("GPL") version 2 as published by the Free
  28   28   * Software Foundation.
  29   29   *
  30   30   * NO WARRANTY
  31   31   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  32   32   * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  33   33   * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
  34   34   * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  35   35   * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  36   36   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  37   37   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  38   38   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39   39   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  40   40   * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  41   41   * POSSIBILITY OF SUCH DAMAGES.

  42   42   */
  43   43  
  44   44  #ifndef __ACFREEBSD_H__
  45   45  #define __ACFREEBSD_H__
  46   46  
  47   47  
  48   48  /* FreeBSD uses GCC */
  49   49  
  50   50  #include "acgcc.h"
  51   51  #include <sys/types.h>
  52      -#include <machine/acpica_machdep.h>
  53   52  
       53 +#ifdef __LP64__
       54 +#define ACPI_MACHINE_WIDTH      64
       55 +#else
       56 +#define ACPI_MACHINE_WIDTH      32
       57 +#endif
       58 +
       59 +#define COMPILER_DEPENDENT_INT64        int64_t
       60 +#define COMPILER_DEPENDENT_UINT64       uint64_t
       61 +
  54   62  #define ACPI_UINTPTR_T      uintptr_t
  55   63  
  56   64  #define ACPI_USE_DO_WHILE_0
  57   65  #define ACPI_USE_LOCAL_CACHE
       66 +#define ACPI_USE_NATIVE_DIVIDE
  58   67  #define ACPI_USE_SYSTEM_CLIBRARY
  59   68  
  60   69  #ifdef _KERNEL
  61   70  
  62   71  #include <sys/ctype.h>
  63   72  #include <sys/param.h>
  64   73  #include <sys/systm.h>
  65   74  #include <sys/libkern.h>
       75 +#include <machine/acpica_machdep.h>
  66   76  #include <machine/stdarg.h>
  67   77  
  68   78  #include "opt_acpi.h"
  69   79  
  70   80  #define ACPI_MUTEX_TYPE     ACPI_OSL_MUTEX
  71   81  
  72   82  #ifdef ACPI_DEBUG
  73   83  #define ACPI_DEBUG_OUTPUT   /* for backward compatibility */
  74   84  #define ACPI_DISASSEMBLER
  75   85  #endif

  76   86  
  77   87  #ifdef ACPI_DEBUG_OUTPUT
  78   88  #include "opt_ddb.h"
  79   89  #ifdef DDB
  80   90  #define ACPI_DEBUGGER
  81   91  #endif /* DDB */
  82   92  #endif /* ACPI_DEBUG_OUTPUT */
  83   93  
  84   94  #ifdef DEBUGGER_THREADING
  85   95  #undef DEBUGGER_THREADING
  86   96  #endif /* DEBUGGER_THREADING */
  87   97  
  88   98  #define DEBUGGER_THREADING  0   /* integrated with DDB */
  89   99  
  90  100  #else /* _KERNEL */
  91  101  
  92  102  #if __STDC_HOSTED__
  93  103  #include <ctype.h>
  94  104  #endif
  95  105  
  96  106  #define ACPI_CAST_PTHREAD_T(pthread)    ((ACPI_THREAD_ID) ACPI_TO_INTEGER (pthread))
  97  107  
  98  108  #define ACPI_USE_STANDARD_HEADERS
  99  109  
 100  110  #define ACPI_FLUSH_CPU_CACHE()
 101  111  #define __cdecl
 102  112  
 103  113  #endif /* _KERNEL */
 104  114  
 105  115  #endif /* __ACFREEBSD_H__ */

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX