Print this page
acpica-unix2-20130823
PANKOVs restructure

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/io/acpica/executer/exstorob.c
          +++ new/usr/src/common/acpica/components/executer/exstorob.c
   1      -
   2    1  /******************************************************************************
   3    2   *
   4    3   * Module Name: exstorob - AML Interpreter object store support, store to object
   5    4   *
   6    5   *****************************************************************************/
   7    6  
   8    7  /*
   9      - * Copyright (C) 2000 - 2011, Intel Corp.
        8 + * Copyright (C) 2000 - 2013, 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 ↓ 91 lines elided ↑ open up ↑
 111  110      if (Length <= TargetDesc->Buffer.Length)
 112  111      {
 113  112          /* Clear existing buffer and copy in the new one */
 114  113  
 115  114          ACPI_MEMSET (TargetDesc->Buffer.Pointer, 0, TargetDesc->Buffer.Length);
 116  115          ACPI_MEMCPY (TargetDesc->Buffer.Pointer, Buffer, Length);
 117  116  
 118  117  #ifdef ACPI_OBSOLETE_BEHAVIOR
 119  118          /*
 120  119           * NOTE: ACPI versions up to 3.0 specified that the buffer must be
 121      -         * truncated if the string is smaller than the buffer.  However, "other"
      120 +         * truncated if the string is smaller than the buffer. However, "other"
 122  121           * implementations of ACPI never did this and thus became the defacto
 123  122           * standard. ACPI 3.0A changes this behavior such that the buffer
 124  123           * is no longer truncated.
 125  124           */
 126  125  
 127  126          /*
 128  127           * OBSOLETE BEHAVIOR:
 129  128           * If the original source was a string, we must truncate the buffer,
 130      -         * according to the ACPI spec.  Integer-to-Buffer and Buffer-to-Buffer
      129 +         * according to the ACPI spec. Integer-to-Buffer and Buffer-to-Buffer
 131  130           * copy must not truncate the original buffer.
 132  131           */
 133  132          if (OriginalSrcType == ACPI_TYPE_STRING)
 134  133          {
 135  134              /* Set the new length of the target */
 136  135  
 137  136              TargetDesc->Buffer.Length = Length;
 138  137          }
 139  138  #endif
 140  139      }
↓ open down ↓ 92 lines elided ↑ open up ↑
 233  232  
 234  233          TargetDesc->Common.Flags &= ~AOPOBJ_STATIC_POINTER;
 235  234          ACPI_MEMCPY (TargetDesc->String.Pointer, Buffer, Length);
 236  235      }
 237  236  
 238  237      /* Set the new target length */
 239  238  
 240  239      TargetDesc->String.Length = Length;
 241  240      return_ACPI_STATUS (AE_OK);
 242  241  }
 243      -
 244      -
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX