acpica-unix2-20130823
PANKOVs restructure

*** 3,13 ****
   * Module Name: acapps - common include for ACPI applications/tools
   *
   *****************************************************************************/
  
  /*
!  * 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: acapps - common include for ACPI applications/tools
   *
   *****************************************************************************/
  
  /*
!  * 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:
*** 50,60 ****
  #endif
  
  /* Common info for tool signons */
  
  #define ACPICA_NAME                 "Intel ACPI Component Architecture"
! #define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2011 Intel Corporation"
  
  #if ACPI_MACHINE_WIDTH == 64
  #define ACPI_WIDTH          "-64"
  
  #elif ACPI_MACHINE_WIDTH == 32
--- 50,60 ----
  #endif
  
  /* Common info for tool signons */
  
  #define ACPICA_NAME                 "Intel ACPI Component Architecture"
! #define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2013 Intel Corporation"
  
  #if ACPI_MACHINE_WIDTH == 64
  #define ACPI_WIDTH          "-64"
  
  #elif ACPI_MACHINE_WIDTH == 32
*** 79,88 ****
--- 79,97 ----
      Prefix, ACPICA_NAME, \
      Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
      Prefix, ACPICA_COPYRIGHT, \
      Prefix
  
+ /* Macros for usage messages */
+ 
+ #define ACPI_USAGE_HEADER(Usage) \
+     printf ("Usage: %s\nOptions:\n", Usage);
+ 
+ #define ACPI_OPTION(Name, Description) \
+     printf ("  %-18s%s\n", Name, Description);
+ 
+ 
  #define FILE_SUFFIX_DISASSEMBLY     "dsl"
  #define ACPI_TABLE_FILE_SUFFIX      ".dat"
  
  
  /*
*** 92,106 ****
--- 101,122 ----
  AcpiGetopt(
      int                     argc,
      char                    **argv,
      char                    *opts);
  
+ int
+ AcpiGetoptArgument (
+     int                     argc,
+     char                    **argv);
+ 
  extern int                  AcpiGbl_Optind;
  extern int                  AcpiGbl_Opterr;
+ extern int                  AcpiGbl_SubOptChar;
  extern char                 *AcpiGbl_Optarg;
  
  
+ #ifndef ACPI_DUMP_APP
  /*
   * adisasm
   */
  ACPI_STATUS
  AdAmlDisassemble (
*** 201,208 ****
  AdWriteTable (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length,
      char                    *TableName,
      char                    *OemTableId);
  
  #endif /* _ACAPPS */
- 
--- 217,224 ----
  AdWriteTable (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length,
      char                    *TableName,
      char                    *OemTableId);
+ #endif
  
  #endif /* _ACAPPS */