Print this page
acpica-unix2-20130823
PANKOVs restructure
        
*** 3,13 ****
   * Module Name: nsaccess - Top-level functions for accessing ACPI namespace
   *
   ******************************************************************************/
  
  /*
!  * Copyright (C) 2000 - 2011, Intel Corp.
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
--- 3,13 ----
   * Module Name: nsaccess - Top-level functions for accessing ACPI namespace
   *
   ******************************************************************************/
  
  /*
!  * Copyright (C) 2000 - 2013, Intel Corp.
   * All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
*** 119,134 ****
          }
  
          Status = AcpiNsLookup (NULL, InitVal->Name, InitVal->Type,
                          ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH,
                          NULL, &NewNode);
! 
!         if (ACPI_FAILURE (Status) || (!NewNode)) /* Must be on same line for code converter */
          {
              ACPI_EXCEPTION ((AE_INFO, Status,
                  "Could not create predefined name %s",
                  InitVal->Name));
          }
  
          /*
           * Name entered successfully. If entry in PreDefinedNames[] specifies
           * an initial value, create the initial value.
--- 119,134 ----
          }
  
          Status = AcpiNsLookup (NULL, InitVal->Name, InitVal->Type,
                          ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH,
                          NULL, &NewNode);
!         if (ACPI_FAILURE (Status))
          {
              ACPI_EXCEPTION ((AE_INFO, Status,
                  "Could not create predefined name %s",
                  InitVal->Name));
+             continue;
          }
  
          /*
           * Name entered successfully. If entry in PreDefinedNames[] specifies
           * an initial value, create the initial value.
*** 165,174 ****
--- 165,175 ----
               * used for initial values are implemented here.
               */
              switch (InitVal->Type)
              {
              case ACPI_TYPE_METHOD:
+ 
                  ObjDesc->Method.ParamCount = (UINT8) ACPI_TO_INTEGER (Val);
                  ObjDesc->Common.Flags |= AOPOBJ_DATA_VALID;
  
  #if defined (ACPI_ASL_COMPILER)
  
*** 186,206 ****
              case ACPI_TYPE_INTEGER:
  
                  ObjDesc->Integer.Value = ACPI_TO_INTEGER (Val);
                  break;
  
- 
              case ACPI_TYPE_STRING:
  
                  /* Build an object around the static string */
  
                  ObjDesc->String.Length = (UINT32) ACPI_STRLEN (Val);
                  ObjDesc->String.Pointer = Val;
                  ObjDesc->Common.Flags |= AOPOBJ_STATIC_POINTER;
                  break;
  
- 
              case ACPI_TYPE_MUTEX:
  
                  ObjDesc->Mutex.Node = NewNode;
                  ObjDesc->Mutex.SyncLevel = (UINT8) (ACPI_TO_INTEGER (Val) - 1);
  
--- 187,205 ----
*** 229,239 ****
                          goto UnlockAndExit;
                      }
                  }
                  break;
  
- 
              default:
  
                  ACPI_ERROR ((AE_INFO, "Unsupported initial type value 0x%X",
                      InitVal->Type));
                  AcpiUtRemoveReference (ObjDesc);
--- 228,237 ----
*** 448,459 ****
                  if (!ThisNode)
                  {
                      /* Current scope has no parent scope */
  
                      ACPI_ERROR ((AE_INFO,
!                         "ACPI path has too many parent prefixes (^) "
!                         "- reached beyond root node"));
                      return_ACPI_STATUS (AE_NOT_FOUND);
                  }
              }
  
              if (SearchParentFlag == ACPI_NS_NO_UPSEARCH)
--- 446,457 ----
                  if (!ThisNode)
                  {
                      /* Current scope has no parent scope */
  
                      ACPI_ERROR ((AE_INFO,
!                         "%s: Path has too many parent prefixes (^) "
!                         "- reached beyond root node", Pathname));
                      return_ACPI_STATUS (AE_NOT_FOUND);
                  }
              }
  
              if (SearchParentFlag == ACPI_NS_NO_UPSEARCH)
*** 695,700 ****
      }
  
      *ReturnNode = ThisNode;
      return_ACPI_STATUS (AE_OK);
  }
- 
--- 693,697 ----