Print this page
PANKOVs restructure

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/io/acpica/acpi_enum.c
          +++ new/usr/src/uts/intel/io/acpica/acpi_enum.c
↓ open down ↓ 10 lines elided ↑ open up ↑
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
       21 +
  21   22  /*
  22      - * Copyright (c) 2012 Gary Mills
  23      - *
  24   23   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  25   24   * Use is subject to license terms.
       25 + * Copyright (c) 2012 Gary Mills
       26 + * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  26   27   */
  27   28  
  28   29  /*
  29   30   * ACPI enumerator
  30   31   */
  31   32  
  32   33  #include <sys/ddi.h>
  33   34  #include <sys/sunddi.h>
  34   35  #include <sys/sunndi.h>
  35   36  #include <sys/note.h>
  36      -#include <sys/acpi/acpi.h>
  37      -#include <sys/acpica.h>
  38   37  #include <util/sscanf.h>
  39   38  
       39 +#include <acpica/include/acpi.h>
       40 +#include <sys/acpica.h>
  40   41  
  41   42  static char keyboard_alias[] = "keyboard";
  42   43  static char mouse_alias[] = "mouse";
  43   44  #define ACPI_ENUM_DEBUG         "acpi_enum_debug"
  44   45  #define PARSE_RESOURCES_DEBUG   0x0001
  45   46  #define MASTER_LOOKUP_DEBUG     0x0002
  46   47  #define DEVICES_NOT_ENUMED      0x0004
  47   48  #define PARSE_RES_IRQ           0x0008
  48   49  #define PARSE_RES_DMA           0x0010
  49   50  #define PARSE_RES_MEMORY        0x0020
↓ open down ↓ 1054 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX