Print this page
acpica-unix2-20130823
PANKOVs restructure

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/i86pc/sys/acpidev.h
          +++ new/usr/src/uts/i86pc/sys/acpidev.h
↓ open down ↓ 21 lines elided ↑ open up ↑
  22   22   * Copyright (c) 2009-2010, Intel Corporation.
  23   23   * All rights reserved.
  24   24   */
  25   25  
  26   26  #ifndef _SYS_ACPIDEV_H
  27   27  #define _SYS_ACPIDEV_H
  28   28  #include <sys/types.h>
  29   29  #include <sys/obpdefs.h>
  30   30  #include <sys/sunddi.h>
  31   31  #ifdef  _KERNEL
  32      -#include <sys/acpi/acpi.h>
       32 +#include <acpica/include/acpi.h>
  33   33  #include <sys/acpica.h>
  34   34  #endif
  35   35  
  36   36  #ifdef __cplusplus
  37   37  extern "C" {
  38   38  #endif
  39   39  
  40   40  /* Maximum recursion levels when enumerating objects in ACPI namespace. */
  41   41  #define ACPIDEV_MAX_ENUM_LEVELS         32
  42   42  
↓ open down ↓ 78 lines elided ↑ open up ↑
 121  121  /* Flags for acpidev_options boot options. */
 122  122  #define ACPIDEV_OUSER_NO_CPU            0x1
 123  123  #define ACPIDEV_OUSER_NO_MEM            0x2
 124  124  #define ACPIDEV_OUSER_NO_CONTAINER      0x4
 125  125  #define ACPIDEV_OUSER_NO_PCI            0x8
 126  126  #define ACPIDEV_OUSER_NO_CACHE          0x10000
 127  127  
 128  128  #ifdef  _KERNEL
 129  129  
 130  130  /* Common ACPI object names. */
 131      -#define ACPIDEV_OBJECT_NAME_SB          ACPI_NS_SYSTEM_BUS
      131 +#define ACPIDEV_OBJECT_NAME_SB          METHOD_NAME__SB_
 132  132  #define ACPIDEV_OBJECT_NAME_PR          "_PR_"
 133  133  
 134  134  /* Common ACPI method names. */
 135  135  #define ACPIDEV_METHOD_NAME_MAT         "_MAT"
 136  136  #define ACPIDEV_METHOD_NAME_EJ0         "_EJ0"
 137  137  #define ACPIDEV_METHOD_NAME_EDL         "_EDL"
 138  138  #define ACPIDEV_METHOD_NAME_EJD         "_EJD"
 139  139  #define ACPIDEV_METHOD_NAME_OST         "_OST"
 140  140  #define ACPIDEV_METHOD_NAME_PXM         "_PXM"
 141  141  #define ACPIDEV_METHOD_NAME_SLI         "_SLI"
↓ open down ↓ 421 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX