Print this page
update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/sys/acpi/acapps.h
          +++ new/usr/src/common/acpica/include/acapps.h
   1    1  /******************************************************************************
   2    2   *
   3    3   * Module Name: acapps - common include for ACPI applications/tools
   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 ↓ 26 lines elided ↑ open up ↑
  45   45  #define _ACAPPS
  46   46  
  47   47  
  48   48  #ifdef _MSC_VER                 /* disable some level-4 warnings */
  49   49  #pragma warning(disable:4100)   /* warning C4100: unreferenced formal parameter */
  50   50  #endif
  51   51  
  52   52  /* Common info for tool signons */
  53   53  
  54   54  #define ACPICA_NAME                 "Intel ACPI Component Architecture"
  55      -#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2011 Intel Corporation"
       55 +#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2014 Intel Corporation"
  56   56  
  57   57  #if ACPI_MACHINE_WIDTH == 64
  58   58  #define ACPI_WIDTH          "-64"
  59   59  
  60   60  #elif ACPI_MACHINE_WIDTH == 32
  61   61  #define ACPI_WIDTH          "-32"
  62   62  
  63   63  #else
  64   64  #error unknown ACPI_MACHINE_WIDTH
  65   65  #define ACPI_WIDTH          "-??"
↓ open down ↓ 8 lines elided ↑ open up ↑
  74   74      UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
  75   75      ACPICA_COPYRIGHT
  76   76  
  77   77  #define ACPI_COMMON_HEADER(UtilityName, Prefix) \
  78   78      "%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \
  79   79      Prefix, ACPICA_NAME, \
  80   80      Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
  81   81      Prefix, ACPICA_COPYRIGHT, \
  82   82      Prefix
  83   83  
       84 +/* Macros for usage messages */
       85 +
       86 +#define ACPI_USAGE_HEADER(Usage) \
       87 +    printf ("Usage: %s\nOptions:\n", Usage);
       88 +
       89 +#define ACPI_OPTION(Name, Description) \
       90 +    printf ("  %-18s%s\n", Name, Description);
       91 +
       92 +
  84   93  #define FILE_SUFFIX_DISASSEMBLY     "dsl"
  85   94  #define ACPI_TABLE_FILE_SUFFIX      ".dat"
  86   95  
  87   96  
  88   97  /*
  89   98   * getopt
  90   99   */
  91  100  int
  92  101  AcpiGetopt(
  93  102      int                     argc,
  94  103      char                    **argv,
  95  104      char                    *opts);
  96  105  
      106 +int
      107 +AcpiGetoptArgument (
      108 +    int                     argc,
      109 +    char                    **argv);
      110 +
  97  111  extern int                  AcpiGbl_Optind;
  98  112  extern int                  AcpiGbl_Opterr;
      113 +extern int                  AcpiGbl_SubOptChar;
  99  114  extern char                 *AcpiGbl_Optarg;
 100  115  
 101  116  
      117 +#ifndef ACPI_DUMP_APP
 102  118  /*
 103  119   * adisasm
 104  120   */
 105  121  ACPI_STATUS
 106  122  AdAmlDisassemble (
 107  123      BOOLEAN                 OutToFile,
 108  124      char                    *Filename,
 109  125      char                    *Prefix,
 110  126      char                    **OutFilename,
 111  127      BOOLEAN                 GetAllTables);
↓ open down ↓ 84 lines elided ↑ open up ↑
 196  212  AdGenerateFilename (
 197  213      char                    *Prefix,
 198  214      char                    *TableId);
 199  215  
 200  216  void
 201  217  AdWriteTable (
 202  218      ACPI_TABLE_HEADER       *Table,
 203  219      UINT32                  Length,
 204  220      char                    *TableName,
 205  221      char                    *OemTableId);
      222 +#endif
 206  223  
 207  224  #endif /* _ACAPPS */
 208      -
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX