Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1498 → Rev 2216

/drivers/devman/acpica/include/aclocal.h
8,7 → 8,7
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
* All rights reserved.
*
* 2. License
165,26 → 165,7
#define ACPI_MAX_MUTEX 7
#define ACPI_NUM_MUTEX ACPI_MAX_MUTEX+1
 
#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
#ifdef DEFINE_ACPI_GLOBALS
 
/* Debug names for the mutexes above */
 
static char *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
{
"ACPI_MTX_Interpreter",
"ACPI_MTX_Namespace",
"ACPI_MTX_Tables",
"ACPI_MTX_Events",
"ACPI_MTX_Caches",
"ACPI_MTX_Memory",
"ACPI_MTX_CommandComplete",
"ACPI_MTX_CommandReady"
};
 
#endif
#endif
 
/* Lock structure for reader/writer interfaces */
 
typedef struct acpi_rw_lock
502,6 → 483,7
char *Pathname;
const ACPI_PREDEFINED_INFO *Predefined;
union acpi_operand_object *ParentPackage;
ACPI_NAMESPACE_NODE *Node;
UINT32 Flags;
UINT8 NodeFlags;
 
537,18 → 519,25
 
/* Dispatch info for each GPE -- either a method or handler, cannot be both */
 
typedef struct acpi_handler_info
typedef struct acpi_gpe_handler_info
{
ACPI_EVENT_HANDLER Address; /* Address of handler, if any */
ACPI_GPE_HANDLER Address; /* Address of handler, if any */
void *Context; /* Context to be passed to handler */
ACPI_NAMESPACE_NODE *MethodNode; /* Method node for this GPE level (saved) */
UINT8 OriginalFlags; /* Original (pre-handler) GPE info */
BOOLEAN OriginallyEnabled; /* True if GPE was originally enabled */
 
} ACPI_HANDLER_INFO;
} ACPI_GPE_HANDLER_INFO;
 
/*
* GPE dispatch info. At any time, the GPE can have at most one type
* of dispatch - Method, Handler, or Implicit Notify.
*/
typedef union acpi_gpe_dispatch_info
{
ACPI_NAMESPACE_NODE *MethodNode; /* Method node for this GPE level */
struct acpi_handler_info *Handler;
struct acpi_gpe_handler_info *Handler; /* Installed GPE handler */
ACPI_NAMESPACE_NODE *DeviceNode; /* Parent _PRW device for implicit notify */
 
} ACPI_GPE_DISPATCH_INFO;
 
563,7 → 552,6
UINT8 Flags; /* Misc info about this GPE */
UINT8 GpeNumber; /* This GPE */
UINT8 RuntimeCount; /* References to a run GPE */
UINT8 WakeupCount; /* References to a wake GPE */
 
} ACPI_GPE_EVENT_INFO;
 
595,6 → 583,7
UINT32 RegisterCount; /* Number of register pairs in block */
UINT16 GpeCount; /* Number of individual GPEs in block */
UINT8 BlockBaseNumber;/* Base GPE number for this block */
BOOLEAN Initialized; /* TRUE if this block is initialized */
 
} ACPI_GPE_BLOCK_INFO;
 
615,7 → 604,6
ACPI_GPE_BLOCK_INFO *GpeBlock;
UINT16 Count;
ACPI_OWNER_ID OwnerId;
BOOLEAN EnableThisGpe;
BOOLEAN ExecuteByOwnerId;
 
} ACPI_GPE_WALK_INFO;
1081,6 → 1069,7
ACPI_BITMASK_POWER_BUTTON_STATUS | \
ACPI_BITMASK_SLEEP_BUTTON_STATUS | \
ACPI_BITMASK_RT_CLOCK_STATUS | \
ACPI_BITMASK_PCIEXP_WAKE_STATUS | \
ACPI_BITMASK_WAKE_STATUS)
 
#define ACPI_BITMASK_TIMER_ENABLE 0x0001
1137,7 → 1126,8
#define ACPI_OSI_WIN_VISTA 0x07
#define ACPI_OSI_WINSRV_2008 0x08
#define ACPI_OSI_WIN_VISTA_SP1 0x09
#define ACPI_OSI_WIN_7 0x0A
#define ACPI_OSI_WIN_VISTA_SP2 0x0A
#define ACPI_OSI_WIN_7 0x0B
 
#define ACPI_ALWAYS_ILLEGAL 0x00
 
1144,10 → 1134,15
typedef struct acpi_interface_info
{
char *Name;
struct acpi_interface_info *Next;
UINT8 Flags;
UINT8 Value;
 
} ACPI_INTERFACE_INFO;
 
#define ACPI_OSI_INVALID 0x01
#define ACPI_OSI_DYNAMIC 0x02
 
typedef struct acpi_port_info
{
char *Name;
1247,6 → 1242,14
#define ACPI_IPATH_ALLOCATED 0x01
 
 
typedef struct acpi_external_file
{
char *Path;
struct acpi_external_file *Next;
 
} ACPI_EXTERNAL_FILE;
 
 
/*****************************************************************************
*
* Debugger
1258,7 → 1261,7
ACPI_HANDLE MainThreadGate;
ACPI_HANDLE ThreadCompleteGate;
ACPI_HANDLE InfoGate;
UINT32 *Threads;
ACPI_THREAD_ID *Threads;
UINT32 NumThreads;
UINT32 NumCreated;
UINT32 NumCompleted;
1268,6 → 1271,7
UINT32 NumLoops;
char Pathname[128];
char **Args;
ACPI_OBJECT_TYPE *Types;
 
/*
* Arguments to be passed to method for the command
1276,6 → 1280,7
* Index of current thread inside all them created.
*/
char InitArgs;
ACPI_OBJECT_TYPE ArgTypes[4];
char *Arguments[4];
char NumThreadsStr[11];
char IdOfThreadStr[11];