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/exdebug.c
          +++ new/usr/src/common/acpica/components/executer/exdebug.c
   1    1  /******************************************************************************
   2    2   *
   3    3   * Module Name: exdebug - Support for stores to the AML Debug Object
   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 ↓ 136 lines elided ↑ open up ↑
 155  155          else
 156  156          {
 157  157              AcpiOsPrintf ("0x%8.8X%8.8X\n",
 158  158                  ACPI_FORMAT_UINT64 (SourceDesc->Integer.Value));
 159  159          }
 160  160          break;
 161  161  
 162  162      case ACPI_TYPE_BUFFER:
 163  163  
 164  164          AcpiOsPrintf ("[0x%.2X]\n", (UINT32) SourceDesc->Buffer.Length);
 165      -        AcpiUtDumpBuffer2 (SourceDesc->Buffer.Pointer,
      165 +        AcpiUtDumpBuffer (SourceDesc->Buffer.Pointer,
 166  166              (SourceDesc->Buffer.Length < 256) ?
 167      -                SourceDesc->Buffer.Length : 256, DB_BYTE_DISPLAY);
      167 +                SourceDesc->Buffer.Length : 256, DB_BYTE_DISPLAY, 0);
 168  168          break;
 169  169  
 170  170      case ACPI_TYPE_STRING:
 171  171  
 172  172          AcpiOsPrintf ("[0x%.2X] \"%s\"\n",
 173  173              SourceDesc->String.Length, SourceDesc->String.Pointer);
 174  174          break;
 175  175  
 176  176      case ACPI_TYPE_PACKAGE:
 177  177  
↓ open down ↓ 20 lines elided ↑ open up ↑
 198  198          case ACPI_REFCLASS_INDEX:
 199  199  
 200  200              AcpiOsPrintf ("0x%X\n", SourceDesc->Reference.Value);
 201  201              break;
 202  202  
 203  203          case ACPI_REFCLASS_TABLE:
 204  204  
 205  205              /* Case for DdbHandle */
 206  206  
 207  207              AcpiOsPrintf ("Table Index 0x%X\n", SourceDesc->Reference.Value);
 208      -            return;
      208 +            return_VOID;
 209  209  
 210  210          default:
      211 +
 211  212              break;
 212  213          }
 213  214  
 214  215          AcpiOsPrintf ("  ");
 215  216  
 216  217          /* Check for valid node first, then valid object */
 217  218  
 218  219          if (SourceDesc->Reference.Node)
 219  220          {
 220  221              if (ACPI_GET_DESCRIPTOR_TYPE (SourceDesc->Reference.Node) !=
↓ open down ↓ 13 lines elided ↑ open up ↑
 234  235  
 235  236                  case ACPI_TYPE_DEVICE:
 236  237                      AcpiOsPrintf ("Device\n");
 237  238                      break;
 238  239  
 239  240                  case ACPI_TYPE_THERMAL:
 240  241                      AcpiOsPrintf ("Thermal Zone\n");
 241  242                      break;
 242  243  
 243  244                  default:
      245 +
 244  246                      AcpiExDoDebugObject ((SourceDesc->Reference.Node)->Object,
 245  247                          Level+4, 0);
 246  248                      break;
 247  249                  }
 248  250              }
 249  251          }
 250  252          else if (SourceDesc->Reference.Object)
 251  253          {
 252  254              if (ACPI_GET_DESCRIPTOR_TYPE (SourceDesc->Reference.Object) ==
 253  255                      ACPI_DESC_TYPE_NAMED)
↓ open down ↓ 13 lines elided ↑ open up ↑
 267  269      default:
 268  270  
 269  271          AcpiOsPrintf ("%p\n", SourceDesc);
 270  272          break;
 271  273      }
 272  274  
 273  275      ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC, "\n"));
 274  276      return_VOID;
 275  277  }
 276  278  #endif
 277      -
 278      -
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX