Merge local changes for the 20020308 ACPI CA update.
This commit is contained in:
parent
f3964aad0d
commit
fd87aacdcc
@ -1,7 +1,7 @@
|
||||
/******************************************************************************
|
||||
*
|
||||
* Name: acconfig.h - Global configuration constants
|
||||
* $Revision: 90 $
|
||||
* $Revision: 94 $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
@ -145,7 +145,7 @@
|
||||
|
||||
/* Version string */
|
||||
|
||||
#define ACPI_CA_VERSION 0x20020214
|
||||
#define ACPI_CA_VERSION 0x20020308
|
||||
|
||||
/* Version of ACPI supported */
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
/******************************************************************************
|
||||
*
|
||||
* Name: acgcc.h - GCC specific defines, etc.
|
||||
* $Revision: 17 $
|
||||
* $Revision: 19 $
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
@ -122,9 +122,26 @@
|
||||
#define _IA64
|
||||
|
||||
#define COMPILER_DEPENDENT_UINT64 unsigned long
|
||||
|
||||
/*
|
||||
* Calling conventions:
|
||||
*
|
||||
* ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads)
|
||||
* ACPI_EXTERNAL_XFACE - External ACPI interfaces
|
||||
* ACPI_INTERNAL_XFACE - Internal ACPI interfaces
|
||||
* ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces
|
||||
*/
|
||||
#define ACPI_SYSTEM_XFACE
|
||||
#define ACPI_EXTERNAL_XFACE
|
||||
#define ACPI_INTERNAL_XFACE
|
||||
#define ACPI_INTERNAL_VAR_XFACE
|
||||
|
||||
/* Single threaded */
|
||||
|
||||
#define ACPI_APPLICATION
|
||||
|
||||
/* Asm macros */
|
||||
|
||||
#define ACPI_ASM_MACROS
|
||||
#define causeinterrupt(level)
|
||||
#define BREAKPOINT3
|
||||
@ -186,6 +203,22 @@
|
||||
#else /* DO IA32 */
|
||||
|
||||
#define COMPILER_DEPENDENT_UINT64 unsigned long long
|
||||
|
||||
/*
|
||||
* Calling conventions:
|
||||
*
|
||||
* ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads)
|
||||
* ACPI_EXTERNAL_XFACE - External ACPI interfaces
|
||||
* ACPI_INTERNAL_XFACE - Internal ACPI interfaces
|
||||
* ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces
|
||||
*/
|
||||
#define ACPI_SYSTEM_XFACE
|
||||
#define ACPI_EXTERNAL_XFACE
|
||||
#define ACPI_INTERNAL_XFACE
|
||||
#define ACPI_INTERNAL_VAR_XFACE
|
||||
|
||||
/* Asm macros */
|
||||
|
||||
#define ACPI_ASM_MACROS
|
||||
#define causeinterrupt(level)
|
||||
#define BREAKPOINT3
|
||||
|
@ -154,12 +154,12 @@ typedef struct AcpiFatalInfo
|
||||
* Types specific to the OS service interfaces
|
||||
*/
|
||||
|
||||
typedef
|
||||
UINT32 (*OSD_HANDLER) (
|
||||
typedef UINT32
|
||||
(ACPI_SYSTEM_XFACE *OSD_HANDLER) (
|
||||
void *Context);
|
||||
|
||||
typedef
|
||||
void (*OSD_EXECUTION_CALLBACK) (
|
||||
typedef void
|
||||
(ACPI_SYSTEM_XFACE *OSD_EXECUTION_CALLBACK) (
|
||||
void *Context);
|
||||
|
||||
|
||||
@ -360,7 +360,7 @@ AcpiOsSignal (
|
||||
* Debug print routines
|
||||
*/
|
||||
|
||||
void
|
||||
void ACPI_INTERNAL_VAR_XFACE
|
||||
AcpiOsPrintf (
|
||||
const NATIVE_CHAR *Format,
|
||||
...);
|
||||
|
Loading…
x
Reference in New Issue
Block a user