Print this page 
update to acpica-unix2-20130927
acpica-unix2-20130823
PANKOVs restructure
Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/io/acpica/events/evxfevnt.c
          +++ new/usr/src/common/acpica/components/events/evxfevnt.c
   1    1  /******************************************************************************
   2    2   *
   3    3   * Module Name: evxfevnt - External Interfaces, ACPI event disable/enable
   4    4   *
   5    5   *****************************************************************************/
   6    6  
   7    7  /*
   8      - * Copyright (C) 2000 - 2011, Intel Corp.
        8 + * Copyright (C) 2000 - 2013, 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 ↓ 17 lines elided ↑ open up ↑ 
  36   36   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  37   37   * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  38   38   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39   39   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  40   40   * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  41   41   * POSSIBILITY OF SUCH DAMAGES.
  42   42   */
  43   43  
  44   44  
  45   45  #define __EVXFEVNT_C__
       46 +#define EXPORT_ACPI_INTERFACES
  46   47  
  47   48  #include "acpi.h"
  48   49  #include "accommon.h"
  49   50  #include "actables.h"
  50   51  
  51   52  #define _COMPONENT          ACPI_EVENTS
  52   53          ACPI_MODULE_NAME    ("evxfevnt")
  53   54  
  54   55  
       56 +#if (!ACPI_REDUCED_HARDWARE) /* Entire module */
  55   57  /*******************************************************************************
  56   58   *
  57   59   * FUNCTION:    AcpiEnable
  58   60   *
  59   61   * PARAMETERS:  None
  60   62   *
  61   63   * RETURN:      Status
  62   64   *
  63   65   * DESCRIPTION: Transfers the system into ACPI mode.
  64   66   *
↓ open down ↓ 9 lines elided ↑ open up ↑ 
  74   76      ACPI_FUNCTION_TRACE (AcpiEnable);
  75   77  
  76   78  
  77   79      /* ACPI tables must be present */
  78   80  
  79   81      if (!AcpiTbTablesLoaded ())
  80   82      {
  81   83          return_ACPI_STATUS (AE_NO_ACPI_TABLES);
  82   84      }
  83   85  
       86 +    /* If the Hardware Reduced flag is set, machine is always in acpi mode */
       87 +
       88 +    if (AcpiGbl_ReducedHardware)
       89 +    {
       90 +        return_ACPI_STATUS (AE_OK);
       91 +    }
       92 +
  84   93      /* Check current mode */
  85   94  
  86   95      if (AcpiHwGetMode() == ACPI_SYS_MODE_ACPI)
  87   96      {
  88   97          ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "System is already in ACPI mode\n"));
  89   98      }
  90   99      else
  91  100      {
  92  101          /* Transition to ACPI mode */
  93  102
↓ open down ↓ 29 lines elided ↑ open up ↑ 
 123  132  ACPI_STATUS
 124  133  AcpiDisable (
 125  134      void)
 126  135  {
 127  136      ACPI_STATUS             Status = AE_OK;
 128  137  
 129  138  
 130  139      ACPI_FUNCTION_TRACE (AcpiDisable);
 131  140  
 132  141  
      142 +    /* If the Hardware Reduced flag is set, machine is always in acpi mode */
      143 +
      144 +    if (AcpiGbl_ReducedHardware)
      145 +    {
      146 +        return_ACPI_STATUS (AE_OK);
      147 +    }
      148 +
 133  149      if (AcpiHwGetMode() == ACPI_SYS_MODE_LEGACY)
 134  150      {
 135  151          ACPI_DEBUG_PRINT ((ACPI_DB_INIT,
 136  152              "System is already in legacy (non-ACPI) mode\n"));
 137  153      }
 138  154      else
 139  155      {
 140  156          /* Transition to LEGACY mode */
 141  157  
 142  158          Status = AcpiHwSetMode (ACPI_SYS_MODE_LEGACY);
↓ open down ↓ 227 lines elided ↑ open up ↑ 
 370  386      /* Get the status of the requested fixed event */
 371  387  
 372  388      Status = AcpiReadBitRegister (
 373  389                  AcpiGbl_FixedEventInfo[Event].StatusRegisterId, EventStatus);
 374  390  
 375  391      return_ACPI_STATUS (Status);
 376  392  }
 377  393  
 378  394  ACPI_EXPORT_SYMBOL (AcpiGetEventStatus)
 379  395  
 380      -
      396 +#endif /* !ACPI_REDUCED_HARDWARE */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX