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/nsnames.c
          +++ new/usr/src/common/acpica/components/namespace/nsnames.c
   1    1  /*******************************************************************************
   2    2   *
   3    3   * Module Name: nsnames - Name manipulation and search
   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 ↓ 197 lines elided ↑ open up ↑
 216  216      Size = 0;
 217  217      NextNode = Node;
 218  218  
 219  219      while (NextNode && (NextNode != AcpiGbl_RootNode))
 220  220      {
 221  221          if (ACPI_GET_DESCRIPTOR_TYPE (NextNode) != ACPI_DESC_TYPE_NAMED)
 222  222          {
 223  223              ACPI_ERROR ((AE_INFO,
 224  224                  "Invalid Namespace Node (%p) while traversing namespace",
 225  225                  NextNode));
 226      -            return 0;
      226 +            return (0);
 227  227          }
 228  228          Size += ACPI_PATH_SEGMENT_LENGTH;
 229  229          NextNode = NextNode->Parent;
 230  230      }
 231  231  
 232  232      if (!Size)
 233  233      {
 234  234          Size = 1; /* Root node case */
 235  235      }
 236  236  
↓ open down ↓ 55 lines elided ↑ open up ↑
 292  292      Status = AcpiNsBuildExternalPath (Node, RequiredSize, Buffer->Pointer);
 293  293      if (ACPI_FAILURE (Status))
 294  294      {
 295  295          return_ACPI_STATUS (Status);
 296  296      }
 297  297  
 298  298      ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%s [%X]\n",
 299  299          (char *) Buffer->Pointer, (UINT32) RequiredSize));
 300  300      return_ACPI_STATUS (AE_OK);
 301  301  }
 302      -
 303      -
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX