Print this page
update to acpica-unix2-20131218
acpica-unix2-20130823
PANKOVs restructure
*** 3,13 ****
* Module Name: evgpeblk - GPE block creation and initialization.
*
*****************************************************************************/
/*
! * 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: evgpeblk - GPE block creation and initialization.
*
*****************************************************************************/
/*
! * 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:
*** 47,56 ****
--- 47,58 ----
#include "acnamesp.h"
#define _COMPONENT ACPI_EVENTS
ACPI_MODULE_NAME ("evgpeblk")
+ #if (!ACPI_REDUCED_HARDWARE) /* Entire module */
+
/* Local prototypes */
static ACPI_STATUS
AcpiEvInstallGpeBlock (
ACPI_GPE_BLOCK_INFO *GpeBlock,
*** 93,106 ****
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
}
! GpeXruptBlock = AcpiEvGetGpeXruptBlock (InterruptNumber);
! if (!GpeXruptBlock)
{
- Status = AE_NO_MEMORY;
goto UnlockAndExit;
}
/* Install the new block at the end of the list with lock */
--- 95,107 ----
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
}
! Status = AcpiEvGetGpeXruptBlock (InterruptNumber, &GpeXruptBlock);
! if (ACPI_FAILURE (Status))
{
goto UnlockAndExit;
}
/* Install the new block at the end of the list with lock */
*** 124,134 ****
GpeBlock->XruptBlock = GpeXruptBlock;
AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags);
UnlockAndExit:
! Status = AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (Status);
}
/*******************************************************************************
--- 125,135 ----
GpeBlock->XruptBlock = GpeXruptBlock;
AcpiOsReleaseLock (AcpiGbl_GpeLock, Flags);
UnlockAndExit:
! (void) AcpiUtReleaseMutex (ACPI_MTX_EVENTS);
return_ACPI_STATUS (Status);
}
/*******************************************************************************
*** 416,425 ****
--- 417,428 ----
/* Install the new block in the global lists */
Status = AcpiEvInstallGpeBlock (GpeBlock, InterruptNumber);
if (ACPI_FAILURE (Status))
{
+ ACPI_FREE (GpeBlock->RegisterInfo);
+ ACPI_FREE (GpeBlock->EventInfo);
ACPI_FREE (GpeBlock);
return_ACPI_STATUS (Status);
}
AcpiGbl_AllGpesInitialized = FALSE;
*** 439,450 ****
if (ReturnGpeBlock)
{
(*ReturnGpeBlock) = GpeBlock;
}
! ACPI_DEBUG_PRINT ((ACPI_DB_INIT,
! "GPE %02X to %02X [%4.4s] %u regs on int 0x%X\n",
(UINT32) GpeBlock->BlockBaseNumber,
(UINT32) (GpeBlock->BlockBaseNumber + (GpeBlock->GpeCount - 1)),
GpeDevice->Name.Ascii, GpeBlock->RegisterCount,
InterruptNumber));
--- 442,453 ----
if (ReturnGpeBlock)
{
(*ReturnGpeBlock) = GpeBlock;
}
! ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
! " Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X\n",
(UINT32) GpeBlock->BlockBaseNumber,
(UINT32) (GpeBlock->BlockBaseNumber + (GpeBlock->GpeCount - 1)),
GpeDevice->Name.Ascii, GpeBlock->RegisterCount,
InterruptNumber));
*** 535,547 ****
}
}
if (GpeEnabledCount)
{
! ACPI_DEBUG_PRINT ((ACPI_DB_INIT,
! "Enabled %u GPEs in this block\n", GpeEnabledCount));
}
GpeBlock->Initialized = TRUE;
return_ACPI_STATUS (AE_OK);
}
--- 538,553 ----
}
}
if (GpeEnabledCount)
{
! ACPI_INFO ((AE_INFO,
! "Enabled %u GPEs in block %02X to %02X", GpeEnabledCount,
! (UINT32) GpeBlock->BlockBaseNumber,
! (UINT32) (GpeBlock->BlockBaseNumber + (GpeBlock->GpeCount - 1))));
}
GpeBlock->Initialized = TRUE;
return_ACPI_STATUS (AE_OK);
}
+ #endif /* !ACPI_REDUCED_HARDWARE */