Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi/acpica/Subsystem Resolve conflicts from acpica-...



details:   https://anonhg.NetBSD.org/src/rev/7443c8752cfa
branches:  trunk
changeset: 532791:7443c8752cfa
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jun 15 01:47:07 2002 +0000

description:
Resolve conflicts from acpica-unix-20020612 import.

diffstat:

 sys/dev/acpi/acpica/Subsystem/acconfig.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/acdebug.h  |     2 +-
 sys/dev/acpi/acpica/Subsystem/acdispat.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/acenv.h    |   184 +++-
 sys/dev/acpi/acpica/Subsystem/acevents.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/acexcep.h  |     2 +-
 sys/dev/acpi/acpica/Subsystem/acgcc.h    |   126 +---
 sys/dev/acpi/acpica/Subsystem/acglobal.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/achware.h  |     2 +-
 sys/dev/acpi/acpica/Subsystem/acinterp.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/aclocal.h  |     2 +-
 sys/dev/acpi/acpica/Subsystem/acmacros.h |   449 ++++++------
 sys/dev/acpi/acpica/Subsystem/acnamesp.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/acobject.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/acoutput.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/acparser.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/acpi.h     |     4 +-
 sys/dev/acpi/acpica/Subsystem/acpiosxf.h |    45 +-
 sys/dev/acpi/acpica/Subsystem/acresrc.h  |     2 +-
 sys/dev/acpi/acpica/Subsystem/acstruct.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/actables.h |     2 +-
 sys/dev/acpi/acpica/Subsystem/actbl.h    |     2 +-
 sys/dev/acpi/acpica/Subsystem/actbl1.h   |     2 +-
 sys/dev/acpi/acpica/Subsystem/actbl2.h   |     2 +-
 sys/dev/acpi/acpica/Subsystem/actbl71.h  |     2 +-
 sys/dev/acpi/acpica/Subsystem/actypes.h  |   497 +++++++++----
 sys/dev/acpi/acpica/Subsystem/acutils.h  |     2 +-
 sys/dev/acpi/acpica/Subsystem/amlcode.h  |     2 +-
 sys/dev/acpi/acpica/Subsystem/dbcmds.c   |   311 ++++++--
 sys/dev/acpi/acpica/Subsystem/dbdisasm.c |   424 ++++++-----
 sys/dev/acpi/acpica/Subsystem/dbdisply.c |   220 +++---
 sys/dev/acpi/acpica/Subsystem/dbexec.c   |    75 +-
 sys/dev/acpi/acpica/Subsystem/dbfileio.c |   129 +-
 sys/dev/acpi/acpica/Subsystem/dbhistry.c |    34 +-
 sys/dev/acpi/acpica/Subsystem/dbinput.c  |   158 +--
 sys/dev/acpi/acpica/Subsystem/dbstats.c  |    96 +-
 sys/dev/acpi/acpica/Subsystem/dbutils.c  |    94 +-
 sys/dev/acpi/acpica/Subsystem/dbxface.c  |   235 ++++-
 sys/dev/acpi/acpica/Subsystem/dsfield.c  |   649 +++++++++++------
 sys/dev/acpi/acpica/Subsystem/dsmethod.c |   245 +++---
 sys/dev/acpi/acpica/Subsystem/dsmthdat.c |   583 ++++++---------
 sys/dev/acpi/acpica/Subsystem/dsobject.c |   692 ++++++++++--------
 sys/dev/acpi/acpica/Subsystem/dsopcode.c |  1073 +++++++++++++++++------------
 sys/dev/acpi/acpica/Subsystem/dsutils.c  |   474 +++----------
 sys/dev/acpi/acpica/Subsystem/dswexec.c  |   619 +++++++---------
 sys/dev/acpi/acpica/Subsystem/dswload.c  |   806 ++++++++++-----------
 sys/dev/acpi/acpica/Subsystem/dswscope.c |    25 +-
 sys/dev/acpi/acpica/Subsystem/dswstate.c |   224 ++++-
 sys/dev/acpi/acpica/Subsystem/evevent.c  |   797 ++++++++++++---------
 sys/dev/acpi/acpica/Subsystem/evmisc.c   |   305 ++++++--
 sys/dev/acpi/acpica/Subsystem/evregion.c |   231 ++++--
 sys/dev/acpi/acpica/Subsystem/evrgnini.c |   252 ++++--
 sys/dev/acpi/acpica/Subsystem/evsci.c    |   207 +----
 sys/dev/acpi/acpica/Subsystem/evxface.c  |   350 ++++-----
 sys/dev/acpi/acpica/Subsystem/evxfevnt.c |   343 +++------
 sys/dev/acpi/acpica/Subsystem/evxfregn.c |   184 ++--
 sys/dev/acpi/acpica/Subsystem/exconfig.c |   517 +++++++++----
 sys/dev/acpi/acpica/Subsystem/exconvrt.c |   244 ++---
 sys/dev/acpi/acpica/Subsystem/excreate.c |   639 ++++++-----------
 sys/dev/acpi/acpica/Subsystem/exdump.c   |   728 ++++++++-----------
 sys/dev/acpi/acpica/Subsystem/exfield.c  |   455 +++---------
 sys/dev/acpi/acpica/Subsystem/exfldio.c  |   913 ++++++++++++++-----------
 sys/dev/acpi/acpica/Subsystem/exmisc.c   |   811 ++++++++++++----------
 sys/dev/acpi/acpica/Subsystem/exmutex.c  |   111 +-
 sys/dev/acpi/acpica/Subsystem/exnames.c  |    92 +-
 sys/dev/acpi/acpica/Subsystem/exprep.c   |   577 ++++++---------
 sys/dev/acpi/acpica/Subsystem/exregion.c |   290 ++++++-
 sys/dev/acpi/acpica/Subsystem/exresnte.c |   171 +--
 sys/dev/acpi/acpica/Subsystem/exresolv.c |   238 +-----
 sys/dev/acpi/acpica/Subsystem/exresop.c  |   256 ++++--
 sys/dev/acpi/acpica/Subsystem/exstore.c  |   482 ++++---------
 sys/dev/acpi/acpica/Subsystem/exstoren.c |   189 ++--
 sys/dev/acpi/acpica/Subsystem/exstorob.c |    43 +-
 sys/dev/acpi/acpica/Subsystem/exsystem.c |    62 +-
 sys/dev/acpi/acpica/Subsystem/exutils.c  |   199 ++---
 sys/dev/acpi/acpica/Subsystem/hwacpi.c   |   282 +------
 sys/dev/acpi/acpica/Subsystem/hwgpe.c    |   373 ++++++++-
 sys/dev/acpi/acpica/Subsystem/hwregs.c   |   953 +++++++++++--------------
 sys/dev/acpi/acpica/Subsystem/hwsleep.c  |   319 ++++++--
 sys/dev/acpi/acpica/Subsystem/hwtimer.c  |   103 +--
 sys/dev/acpi/acpica/Subsystem/nsaccess.c |   339 ++++-----
 sys/dev/acpi/acpica/Subsystem/nsalloc.c  |   242 ++---
 sys/dev/acpi/acpica/Subsystem/nsdump.c   |   508 ++++++++++---
 sys/dev/acpi/acpica/Subsystem/nseval.c   |   263 ++----
 sys/dev/acpi/acpica/Subsystem/nsinit.c   |   224 +++--
 sys/dev/acpi/acpica/Subsystem/nsload.c   |   149 ++--
 sys/dev/acpi/acpica/Subsystem/nsnames.c  |   255 +++---
 sys/dev/acpi/acpica/Subsystem/nsobject.c |   472 +++++++-----
 sys/dev/acpi/acpica/Subsystem/nssearch.c |    96 +-
 sys/dev/acpi/acpica/Subsystem/nsutils.c  |   219 ++---
 sys/dev/acpi/acpica/Subsystem/nswalk.c   |   116 +-
 sys/dev/acpi/acpica/Subsystem/nsxfname.c |   128 +-
 sys/dev/acpi/acpica/Subsystem/nsxfobj.c  |   600 +++++++++++-----
 sys/dev/acpi/acpica/Subsystem/psargs.c   |   286 ++++---
 sys/dev/acpi/acpica/Subsystem/psfind.c   |   139 ++-
 sys/dev/acpi/acpica/Subsystem/psopcode.c |   746 ++++++++++----------
 sys/dev/acpi/acpica/Subsystem/psparse.c  |  1007 +++++++++++++--------------
 sys/dev/acpi/acpica/Subsystem/psscope.c  |    22 +-
 sys/dev/acpi/acpica/Subsystem/pstree.c   |    69 +-
 sys/dev/acpi/acpica/Subsystem/psutils.c  |    76 +-
 sys/dev/acpi/acpica/Subsystem/pswalk.c   |    86 +-
 sys/dev/acpi/acpica/Subsystem/psxface.c  |   103 ++-
 sys/dev/acpi/acpica/Subsystem/rsaddr.c   |   291 +++----
 sys/dev/acpi/acpica/Subsystem/rscalc.c   |   176 ++--
 sys/dev/acpi/acpica/Subsystem/rscreate.c |   435 +++++------
 sys/dev/acpi/acpica/Subsystem/rsdump.c   |   213 ++--
 sys/dev/acpi/acpica/Subsystem/rsio.c     |   136 +-
 sys/dev/acpi/acpica/Subsystem/rsirq.c    |   207 ++--
 sys/dev/acpi/acpica/Subsystem/rslist.c   |   143 ++-
 sys/dev/acpi/acpica/Subsystem/rsmemory.c |   174 ++--
 sys/dev/acpi/acpica/Subsystem/rsmisc.c   |   201 ++---
 sys/dev/acpi/acpica/Subsystem/rsutils.c  |   207 ++---
 sys/dev/acpi/acpica/Subsystem/rsxface.c  |    80 +-
 sys/dev/acpi/acpica/Subsystem/tbconvrt.c |   613 +++++++---------
 sys/dev/acpi/acpica/Subsystem/tbget.c    |   579 ++++++++-------
 sys/dev/acpi/acpica/Subsystem/tbinstal.c |   203 +++--
 sys/dev/acpi/acpica/Subsystem/tbutils.c  |   144 +---
 sys/dev/acpi/acpica/Subsystem/tbxface.c  |   162 +--
 sys/dev/acpi/acpica/Subsystem/tbxfroot.c |   474 +++++++-----
 sys/dev/acpi/acpica/Subsystem/utalloc.c  |   876 +++++++++++++++--------
 sys/dev/acpi/acpica/Subsystem/utclib.c   |    57 +-
 sys/dev/acpi/acpica/Subsystem/utcopy.c   |   385 +++++++---
 sys/dev/acpi/acpica/Subsystem/utdebug.c  |    77 +-
 sys/dev/acpi/acpica/Subsystem/utdelete.c |   226 ++---
 sys/dev/acpi/acpica/Subsystem/uteval.c   |   176 +++-
 sys/dev/acpi/acpica/Subsystem/utglobal.c |   484 ++++++++-----
 sys/dev/acpi/acpica/Subsystem/utinit.c   |    86 +-
 sys/dev/acpi/acpica/Subsystem/utmisc.c   |   621 ++++++++++++----
 sys/dev/acpi/acpica/Subsystem/utobject.c |   284 +++----
 sys/dev/acpi/acpica/Subsystem/utxface.c  |   197 +++--
 130 files changed, 17609 insertions(+), 16674 deletions(-)

diffs (truncated from 60593 to 300 lines):

diff -r 1cf41ebae414 -r 7443c8752cfa sys/dev/acpi/acpica/Subsystem/acconfig.h
--- a/sys/dev/acpi/acpica/Subsystem/acconfig.h  Sat Jun 15 01:46:16 2002 +0000
+++ b/sys/dev/acpi/acpica/Subsystem/acconfig.h  Sat Jun 15 01:47:07 2002 +0000
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acconfig.h - Global configuration constants
- *       $Revision: 1.1.1.2 $
+ *       $Revision: 1.2 $
  *
  *****************************************************************************/
 
diff -r 1cf41ebae414 -r 7443c8752cfa sys/dev/acpi/acpica/Subsystem/acdebug.h
--- a/sys/dev/acpi/acpica/Subsystem/acdebug.h   Sat Jun 15 01:46:16 2002 +0000
+++ b/sys/dev/acpi/acpica/Subsystem/acdebug.h   Sat Jun 15 01:47:07 2002 +0000
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acdebug.h - ACPI/AML debugger
- *       $Revision: 1.1.1.2 $
+ *       $Revision: 1.2 $
  *
  *****************************************************************************/
 
diff -r 1cf41ebae414 -r 7443c8752cfa sys/dev/acpi/acpica/Subsystem/acdispat.h
--- a/sys/dev/acpi/acpica/Subsystem/acdispat.h  Sat Jun 15 01:46:16 2002 +0000
+++ b/sys/dev/acpi/acpica/Subsystem/acdispat.h  Sat Jun 15 01:47:07 2002 +0000
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acdispat.h - dispatcher (parser to interpreter interface)
- *       $Revision: 1.1.1.2 $
+ *       $Revision: 1.2 $
  *
  *****************************************************************************/
 
diff -r 1cf41ebae414 -r 7443c8752cfa sys/dev/acpi/acpica/Subsystem/acenv.h
--- a/sys/dev/acpi/acpica/Subsystem/acenv.h     Sat Jun 15 01:46:16 2002 +0000
+++ b/sys/dev/acpi/acpica/Subsystem/acenv.h     Sat Jun 15 01:47:07 2002 +0000
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acenv.h - Generation environment specific items
- *       xRevision: 76 $
+ *       $Revision: 1.3 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -142,22 +142,11 @@
 #ifdef _ACPI_ASL_COMPILER
 #define ACPI_DEBUG
 #define ACPI_APPLICATION
-#define ENABLE_DEBUGGER
+/* #define ENABLE_DEBUGGER */
 #define ACPI_USE_SYSTEM_CLIBRARY
 #endif
 
 /*
- * Memory allocation tracking.  Used only if
- * 1) This is the debug version
- * 2) This is NOT a 16-bit version of the code (not enough real-mode memory)
- */
-#ifdef ACPI_DEBUG
-#ifndef _IA16
-#define ACPI_DBG_TRACK_ALLOCATIONS
-#endif
-#endif
-
-/*
  * Environment configuration.  The purpose of this file is to interface to the
  * local generation environment.
  *
@@ -196,35 +185,87 @@
 
 /*! [Begin] no source code translation */
 
-#ifdef _LINUX
+#if defined(_LINUX)
 #include "aclinux.h"
 
-#elif _AED_EFI
+#elif defined(_AED_EFI)
 #include "acefi.h"
 
-#elif WIN32
+#elif defined(WIN32)
 #include "acwin.h"
 
-#elif __FreeBSD__
+#elif defined(WIN64)
+#include "acwin64.h"
+
+#elif defined(MSDOS)        /* Must appear after WIN32 and WIN64 check */
+#include "acdos16.h"
+
+#elif defined(__FreeBSD__)
 #include "acfreebsd.h"
 
-#elif __NetBSD__
+#elif defined(__NetBSD__)
 #include "acnetbsd.h"
 
+#elif defined(MODESTO)
+#include "acmodesto.h"
+
+#elif defined(NETWARE)
+#include "acnetware.h"
+
 #else
 
 /* All other environments */
 
 #define ACPI_USE_STANDARD_HEADERS
 
+#define COMPILER_DEPENDENT_INT64   long long
+#define COMPILER_DEPENDENT_UINT64  unsigned long long
+
+
 /* Name of host operating system (returned by the _OS_ namespace object) */
 
 #define ACPI_OS_NAME         "Intel ACPI/CA Core Subsystem"
 
+/* This macro is used to tag functions as "printf-like" because
+ * some compilers can catch printf format string problems. MSVC
+ * doesn't, so this is proprocessed away.
+ */
+#define ACPI_PRINTF_LIKE_FUNC
+
+#endif
+
+/*
+ * Memory allocation tracking.  Used only if
+ * 1) This is the debug version
+ * 2) This is NOT a 16-bit version of the code (not enough real-mode memory)
+ */
+#ifdef ACPI_DEBUG
+#if ACPI_MACHINE_WIDTH != 16
+#define ACPI_DBG_TRACK_ALLOCATIONS
+#endif
 #endif
 
+/*! [End] no source code translation !*/
 
-/*! [End] no source code translation !*/
+
+/*
+ * Debugger threading model
+ * Use single threaded if the entire subsystem is contained in an application
+ * Use multiple threaded when the subsystem is running in the kernel.
+ *
+ * By default the model is single threaded if ACPI_APPLICATION is set,
+ * multi-threaded if ACPI_APPLICATION is not set.
+ */
+#define DEBUGGER_SINGLE_THREADED    0
+#define DEBUGGER_MULTI_THREADED     1
+
+#ifdef ACPI_APPLICATION
+#define DEBUGGER_THREADING          DEBUGGER_SINGLE_THREADED
+
+#else
+#define DEBUGGER_THREADING          DEBUGGER_MULTI_THREADED
+#endif
+
 
 /******************************************************************************
  *
@@ -254,21 +295,24 @@
  * We will be linking to the standard Clib functions
  */
 
-#define STRSTR(s1,s2)   strstr((s1), (s2))
-#define STRUPR(s)       AcpiUtStrupr  ((s))
-#define STRLEN(s)       (UINT32) strlen((s))
-#define STRCPY(d,s)     strcpy((d), (s))
-#define STRNCPY(d,s,n)  strncpy((d), (s), (NATIVE_INT)(n))
-#define STRNCMP(d,s,n)  strncmp((d), (s), (NATIVE_INT)(n))
-#define STRCMP(d,s)     strcmp((d), (s))
-#define STRCAT(d,s)     strcat((d), (s))
-#define STRNCAT(d,s,n)  strncat((d), (s), (NATIVE_INT)(n))
-#define STRTOUL(d,s,n)  strtoul((d), (s), (NATIVE_INT)(n))
-#define MEMCPY(d,s,n)   memcpy((d), (s), (NATIVE_INT)(n))
-#define MEMSET(d,s,n)   memset((d), (s), (NATIVE_INT)(n))
-#define TOUPPER         toupper
-#define TOLOWER         tolower
-#define IS_XDIGIT       isxdigit
+#define ACPI_STRSTR(s1,s2)      strstr((s1), (s2))
+#define ACPI_STRUPR(s)          (void) AcpiUtStrupr ((s))
+#define ACPI_STRLEN(s)          (ACPI_SIZE) strlen((s))
+#define ACPI_STRCPY(d,s)        (void) strcpy((d), (s))
+#define ACPI_STRNCPY(d,s,n)     (void) strncpy((d), (s), (ACPI_SIZE)(n))
+#define ACPI_STRNCMP(d,s,n)     strncmp((d), (s), (ACPI_SIZE)(n))
+#define ACPI_STRCMP(d,s)        strcmp((d), (s))
+#define ACPI_STRCAT(d,s)        (void) strcat((d), (s))
+#define ACPI_STRNCAT(d,s,n)     strncat((d), (s), (ACPI_SIZE)(n))
+#define ACPI_STRTOUL(d,s,n)     strtoul((d), (s), (ACPI_SIZE)(n))
+#define ACPI_MEMCPY(d,s,n)      (void) memcpy((d), (s), (ACPI_SIZE)(n))
+#define ACPI_MEMSET(d,s,n)      (void) memset((d), (s), (ACPI_SIZE)(n))
+#define ACPI_TOUPPER            toupper
+#define ACPI_TOLOWER            tolower
+#define ACPI_IS_XDIGIT          isxdigit
+#define ACPI_IS_DIGIT           isdigit
+#define ACPI_IS_SPACE           isspace
+#define ACPI_IS_UPPER           isupper
 
 /******************************************************************************
  *
@@ -295,35 +339,35 @@
  * Storage alignment properties
  */
 
-#define  _AUPBND         (sizeof (NATIVE_INT) - 1)
-#define  _ADNBND         (sizeof (NATIVE_INT) - 1)
+#define  _AUPBND                (sizeof (NATIVE_INT) - 1)
+#define  _ADNBND                (sizeof (NATIVE_INT) - 1)
 
 /*
  * Variable argument list macro definitions
  */
 
-#define _Bnd(X, bnd)    (((sizeof (X)) + (bnd)) & (~(bnd)))
-#define va_arg(ap, T)   (*(T *)(((ap) += (_Bnd (T, _AUPBND))) - (_Bnd (T,_ADNBND))))
-#define va_end(ap)      (void) 0
-#define va_start(ap, A) (void) ((ap) = (((char *) &(A)) + (_Bnd (A,_AUPBND))))
+#define _Bnd(X, bnd)            (((sizeof (X)) + (bnd)) & (~(bnd)))
+#define va_arg(ap, T)           (*(T *)(((ap) += (_Bnd (T, _AUPBND))) - (_Bnd (T,_ADNBND))))
+#define va_end(ap)              (void) 0
+#define va_start(ap, A)         (void) ((ap) = (((char *) &(A)) + (_Bnd (A,_AUPBND))))
 
 #endif /* va_arg */
 
 
-#define STRSTR(s1,s2)    AcpiUtStrstr  ((s1), (s2))
-#define STRUPR(s)        AcpiUtStrupr  ((s))
-#define STRLEN(s)        AcpiUtStrlen  ((s))
-#define STRCPY(d,s)      AcpiUtStrcpy  ((d), (s))
-#define STRNCPY(d,s,n)   AcpiUtStrncpy ((d), (s), (n))
-#define STRNCMP(d,s,n)   AcpiUtStrncmp ((d), (s), (n))
-#define STRCMP(d,s)      AcpiUtStrcmp  ((d), (s))
-#define STRCAT(d,s)      AcpiUtStrcat  ((d), (s))
-#define STRNCAT(d,s,n)   AcpiUtStrncat ((d), (s), (n))
-#define STRTOUL(d,s,n)   AcpiUtStrtoul ((d), (s),(n))
-#define MEMCPY(d,s,n)    AcpiUtMemcpy  ((d), (s), (n))
-#define MEMSET(d,v,n)    AcpiUtMemset  ((d), (v), (n))
-#define TOUPPER          AcpiUtToUpper
-#define TOLOWER          AcpiUtToLower
+#define ACPI_STRSTR(s1,s2)      AcpiUtStrstr  ((s1), (s2))
+#define ACPI_STRUPR(s)          (void) AcpiUtStrupr ((s))
+#define ACPI_STRLEN(s)          (ACPI_SIZE) AcpiUtStrlen  ((s))
+#define ACPI_STRCPY(d,s)        (void) AcpiUtStrcpy  ((d), (s))
+#define ACPI_STRNCPY(d,s,n)     (void) AcpiUtStrncpy ((d), (s), (ACPI_SIZE)(n))
+#define ACPI_STRNCMP(d,s,n)     AcpiUtStrncmp ((d), (s), (ACPI_SIZE)(n))
+#define ACPI_STRCMP(d,s)        AcpiUtStrcmp  ((d), (s))
+#define ACPI_STRCAT(d,s)        (void) AcpiUtStrcat  ((d), (s))
+#define ACPI_STRNCAT(d,s,n)     AcpiUtStrncat ((d), (s), (ACPI_SIZE)(n))
+#define ACPI_STRTOUL(d,s,n)     AcpiUtStrtoul ((d), (s), (ACPI_SIZE)(n))
+#define ACPI_MEMCPY(d,s,n)      (void) AcpiUtMemcpy  ((d), (s), (ACPI_SIZE)(n))
+#define ACPI_MEMSET(d,v,n)      (void) AcpiUtMemset  ((d), (v), (ACPI_SIZE)(n))
+#define ACPI_TOUPPER            AcpiUtToUpper
+#define ACPI_TOLOWER            AcpiUtToLower
 
 #endif /* ACPI_USE_SYSTEM_CLIBRARY */
 
@@ -344,14 +388,26 @@
  */
 
 /* Unrecognized compiler, use defaults */
+
 #ifndef ACPI_ASM_MACROS
 
+/*
+ * 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
+
 #define ACPI_ASM_MACROS
-#define causeinterrupt(level)
 #define BREAKPOINT3
-#define disable()
-#define enable()
-#define halt()
+#define ACPI_DISABLE_IRQS()
+#define ACPI_ENABLE_IRQS()
 #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)



Home | Main Index | Thread Index | Old Index