Print this page 
update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure
Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/io/acpica/namespace/nsobject.c
          +++ new/usr/src/common/acpica/components/namespace/nsobject.c
   1    1  /*******************************************************************************
   2    2   *
   3    3   * Module Name: nsobject - Utilities for objects attached to namespace
   4    4   *                         table entries
   5    5   *
   6    6   ******************************************************************************/
   7    7  
   8    8  /*
   9      - * Copyright (C) 2000 - 2011, Intel Corp.
        9 + * Copyright (C) 2000 - 2014, Intel Corp.
  10   10   * All rights reserved.
  11   11   *
  12   12   * Redistribution and use in source and binary forms, with or without
  13   13   * modification, are permitted provided that the following conditions
  14   14   * are met:
  15   15   * 1. Redistributions of source code must retain the above copyright
  16   16   *    notice, this list of conditions, and the following disclaimer,
  17   17   *    without modification.
  18   18   * 2. Redistributions in binary form must reproduce at minimum a disclaimer
  19   19   *    substantially similar to the "NO WARRANTY" disclaimer below
↓ open down ↓ 39 lines elided ↑ open up ↑ 
  59   59   * FUNCTION:    AcpiNsAttachObject
  60   60   *
  61   61   * PARAMETERS:  Node                - Parent Node
  62   62   *              Object              - Object to be attached
  63   63   *              Type                - Type of object, or ACPI_TYPE_ANY if not
  64   64   *                                    known
  65   65   *
  66   66   * RETURN:      Status
  67   67   *
  68   68   * DESCRIPTION: Record the given object as the value associated with the
  69      - *              name whose ACPI_HANDLE is passed.  If Object is NULL
       69 + *              name whose ACPI_HANDLE is passed. If Object is NULL
  70   70   *              and Type is ACPI_TYPE_ANY, set the name as having no value.
  71   71   *              Note: Future may require that the Node->Flags field be passed
  72   72   *              as a parameter.
  73   73   *
  74   74   * MUTEX:       Assumes namespace is locked
  75   75   *
  76   76   ******************************************************************************/
  77   77  
  78   78  ACPI_STATUS
  79   79  AcpiNsAttachObject (
↓ open down ↓ 59 lines elided ↑ open up ↑ 
 139  139  
 140  140      /*
 141  141       * If the source object is a namespace Node with an attached object,
 142  142       * we will use that (attached) object
 143  143       */
 144  144      else if ((ACPI_GET_DESCRIPTOR_TYPE (Object) == ACPI_DESC_TYPE_NAMED) &&
 145  145              ((ACPI_NAMESPACE_NODE *) Object)->Object)
 146  146      {
 147  147          /*
 148  148           * Value passed is a name handle and that name has a
 149      -         * non-null value.  Use that name's value and type.
      149 +         * non-null value. Use that name's value and type.
 150  150           */
 151  151          ObjDesc    = ((ACPI_NAMESPACE_NODE *) Object)->Object;
 152  152          ObjectType = ((ACPI_NAMESPACE_NODE *) Object)->Type;
 153  153      }
 154  154  
 155  155      /*
 156  156       * Otherwise, we will use the parameter object, but we must type
 157  157       * it first
 158  158       */
 159  159      else
↓ open down ↓ 187 lines elided ↑ open up ↑ 
 347  347  /*******************************************************************************
 348  348   *
 349  349   * FUNCTION:    AcpiNsAttachData
 350  350   *
 351  351   * PARAMETERS:  Node            - Namespace node
 352  352   *              Handler         - Handler to be associated with the data
 353  353   *              Data            - Data to be attached
 354  354   *
 355  355   * RETURN:      Status
 356  356   *
 357      - * DESCRIPTION: Low-level attach data.  Create and attach a Data object.
      357 + * DESCRIPTION: Low-level attach data. Create and attach a Data object.
 358  358   *
 359  359   ******************************************************************************/
 360  360  
 361  361  ACPI_STATUS
 362  362  AcpiNsAttachData (
 363  363      ACPI_NAMESPACE_NODE     *Node,
 364  364      ACPI_OBJECT_HANDLER     Handler,
 365  365      void                    *Data)
 366  366  {
 367  367      ACPI_OPERAND_OBJECT     *PrevObjDesc;
↓ open down ↓ 45 lines elided ↑ open up ↑ 
 413  413  
 414  414  /*******************************************************************************
 415  415   *
 416  416   * FUNCTION:    AcpiNsDetachData
 417  417   *
 418  418   * PARAMETERS:  Node            - Namespace node
 419  419   *              Handler         - Handler associated with the data
 420  420   *
 421  421   * RETURN:      Status
 422  422   *
 423      - * DESCRIPTION: Low-level detach data.  Delete the data node, but the caller
      423 + * DESCRIPTION: Low-level detach data. Delete the data node, but the caller
 424  424   *              is responsible for the actual data.
 425  425   *
 426  426   ******************************************************************************/
 427  427  
 428  428  ACPI_STATUS
 429  429  AcpiNsDetachData (
 430  430      ACPI_NAMESPACE_NODE     *Node,
 431  431      ACPI_OBJECT_HANDLER     Handler)
 432  432  {
 433  433      ACPI_OPERAND_OBJECT     *ObjDesc;
↓ open down ↓ 60 lines elided ↑ open up ↑ 
 494  494          {
 495  495              *Data = ObjDesc->Data.Pointer;
 496  496              return (AE_OK);
 497  497          }
 498  498  
 499  499          ObjDesc = ObjDesc->Common.NextObject;
 500  500      }
 501  501  
 502  502      return (AE_NOT_FOUND);
 503  503  }
 504      -
 505      -
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX