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/nsload.c
          +++ new/usr/src/common/acpica/components/namespace/nsload.c
   1    1  /******************************************************************************
   2    2   *
   3    3   * Module Name: nsload - namespace loading/expanding/contracting procedures
   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 ↓ 67 lines elided ↑ open up ↑ 
  86   86      ACPI_NAMESPACE_NODE     *Node)
  87   87  {
  88   88      ACPI_STATUS             Status;
  89   89  
  90   90  
  91   91      ACPI_FUNCTION_TRACE (NsLoadTable);
  92   92  
  93   93  
  94   94      /*
  95   95       * Parse the table and load the namespace with all named
  96      -     * objects found within.  Control methods are NOT parsed
  97      -     * at this time.  In fact, the control methods cannot be
       96 +     * objects found within. Control methods are NOT parsed
       97 +     * at this time. In fact, the control methods cannot be
  98   98       * parsed until the entire namespace is loaded, because
  99   99       * if a control method makes a forward reference (call)
 100  100       * to another control method, we can't continue parsing
 101  101       * because we don't know how many arguments to parse next!
 102  102       */
 103  103      Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE);
 104  104      if (ACPI_FAILURE (Status))
 105  105      {
 106  106          return_ACPI_STATUS (Status);
 107  107      }
↓ open down ↓ 27 lines elided ↑ open up ↑ 
 135  135  
 136  136  Unlock:
 137  137      (void) AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE);
 138  138  
 139  139      if (ACPI_FAILURE (Status))
 140  140      {
 141  141          return_ACPI_STATUS (Status);
 142  142      }
 143  143  
 144  144      /*
 145      -     * Now we can parse the control methods.  We always parse
      145 +     * Now we can parse the control methods. We always parse
 146  146       * them here for a sanity check, and if configured for
 147  147       * just-in-time parsing, we delete the control method
 148  148       * parse trees.
 149  149       */
 150  150      ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
 151  151          "**** Begin Table Method Parsing and Object Initialization\n"));
 152  152  
 153  153      Status = AcpiDsInitializeObjects (TableIndex, Node);
 154  154  
 155  155      ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
↓ open down ↓ 29 lines elided ↑ open up ↑ 
 185  185  
 186  186      /* There must be at least a DSDT installed */
 187  187  
 188  188      if (AcpiGbl_DSDT == NULL)
 189  189      {
 190  190          ACPI_ERROR ((AE_INFO, "DSDT is not in memory"));
 191  191          return_ACPI_STATUS (AE_NO_ACPI_TABLES);
 192  192      }
 193  193  
 194  194      /*
 195      -     * Load the namespace.  The DSDT is required,
      195 +     * Load the namespace. The DSDT is required,
 196  196       * but the SSDT and PSDT tables are optional.
 197  197       */
 198  198      Status = AcpiNsLoadTableByType (ACPI_TABLE_ID_DSDT);
 199  199      if (ACPI_FAILURE (Status))
 200  200      {
 201  201          return_ACPI_STATUS (Status);
 202  202      }
 203  203  
 204  204      /* Ignore exceptions from these */
 205  205
↓ open down ↓ 105 lines elided ↑ open up ↑ 
 311  311  
 312  312  /*******************************************************************************
 313  313   *
 314  314   *  FUNCTION:       AcpiNsUnloadNameSpace
 315  315   *
 316  316   *  PARAMETERS:     Handle          - Root of namespace subtree to be deleted
 317  317   *
 318  318   *  RETURN:         Status
 319  319   *
 320  320   *  DESCRIPTION:    Shrinks the namespace, typically in response to an undocking
 321      - *                  event.  Deletes an entire subtree starting from (and
      321 + *                  event. Deletes an entire subtree starting from (and
 322  322   *                  including) the given handle.
 323  323   *
 324  324   ******************************************************************************/
 325  325  
 326  326  ACPI_STATUS
 327  327  AcpiNsUnloadNamespace (
 328  328      ACPI_HANDLE             Handle)
 329  329  {
 330  330      ACPI_STATUS             Status;
 331  331
↓ open down ↓ 14 lines elided ↑ open up ↑ 
 346  346      }
 347  347  
 348  348      /* This function does the real work */
 349  349  
 350  350      Status = AcpiNsDeleteSubtree (Handle);
 351  351  
 352  352      return_ACPI_STATUS (Status);
 353  353  }
 354  354  #endif
 355  355  #endif
 356      -
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX