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/executer/exoparg3.c
          +++ new/usr/src/common/acpica/components/executer/exoparg3.c
   1      -
   2    1  /******************************************************************************
   3    2   *
   4    3   * Module Name: exoparg3 - AML execution - opcodes with 3 arguments
   5    4   *
   6    5   *****************************************************************************/
   7    6  
   8    7  /*
   9      - * Copyright (C) 2000 - 2011, Intel Corp.
        8 + * Copyright (C) 2000 - 2014, Intel Corp.
  10    9   * All rights reserved.
  11   10   *
  12   11   * Redistribution and use in source and binary forms, with or without
  13   12   * modification, are permitted provided that the following conditions
  14   13   * are met:
  15   14   * 1. Redistributions of source code must retain the above copyright
  16   15   *    notice, this list of conditions, and the following disclaimer,
  17   16   *    without modification.
  18   17   * 2. Redistributions in binary form must reproduce at minimum a disclaimer
  19   18   *    substantially similar to the "NO WARRANTY" disclaimer below
↓ open down ↓ 103 lines elided ↑ open up ↑
 123  122  
 124  123          /* Always signal the OS! */
 125  124  
 126  125          Status = AcpiOsSignal (ACPI_SIGNAL_FATAL, Fatal);
 127  126  
 128  127          /* Might return while OS is shutting down, just continue */
 129  128  
 130  129          ACPI_FREE (Fatal);
 131  130          break;
 132  131  
 133      -
 134  132      default:
 135  133  
 136  134          ACPI_ERROR ((AE_INFO, "Unknown AML opcode 0x%X",
 137  135              WalkState->Opcode));
 138  136          Status = AE_AML_BAD_OPCODE;
 139  137          goto Cleanup;
 140  138      }
 141  139  
 142  140  
 143  141  Cleanup:
↓ open down ↓ 26 lines elided ↑ open up ↑
 170  168      ACPI_SIZE               Length;
 171  169  
 172  170  
 173  171      ACPI_FUNCTION_TRACE_STR (ExOpcode_3A_1T_1R,
 174  172          AcpiPsGetOpcodeName (WalkState->Opcode));
 175  173  
 176  174  
 177  175      switch (WalkState->Opcode)
 178  176      {
 179  177      case AML_MID_OP:    /* Mid (Source[0], Index[1], Length[2], Result[3]) */
 180      -
 181  178          /*
 182      -         * Create the return object.  The Source operand is guaranteed to be
      179 +         * Create the return object. The Source operand is guaranteed to be
 183  180           * either a String or a Buffer, so just use its type.
 184  181           */
 185  182          ReturnDesc = AcpiUtCreateInternalObject (
 186  183                          (Operand[0])->Common.Type);
 187  184          if (!ReturnDesc)
 188  185          {
 189  186              Status = AE_NO_MEMORY;
 190  187              goto Cleanup;
 191  188          }
 192  189  
↓ open down ↓ 69 lines elided ↑ open up ↑
 262  259          /* Set the length of the new String/Buffer */
 263  260  
 264  261          ReturnDesc->String.Pointer = Buffer;
 265  262          ReturnDesc->String.Length = (UINT32) Length;
 266  263  
 267  264          /* Mark buffer initialized */
 268  265  
 269  266          ReturnDesc->Buffer.Flags |= AOPOBJ_DATA_VALID;
 270  267          break;
 271  268  
 272      -
 273  269      default:
 274  270  
 275  271          ACPI_ERROR ((AE_INFO, "Unknown AML opcode 0x%X",
 276  272              WalkState->Opcode));
 277  273          Status = AE_AML_BAD_OPCODE;
 278  274          goto Cleanup;
 279  275      }
 280  276  
 281  277      /* Store the result in the target */
 282  278  
↓ open down ↓ 10 lines elided ↑ open up ↑
 293  289      }
 294  290  
 295  291      /* Set the return object and exit */
 296  292  
 297  293      else
 298  294      {
 299  295          WalkState->ResultObj = ReturnDesc;
 300  296      }
 301  297      return_ACPI_STATUS (Status);
 302  298  }
 303      -
 304      -
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX