aboutsummaryrefslogtreecommitdiff
path: root/include/platform
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2010-09-15 20:49:34 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2010-09-15 20:49:34 +0000
commit09e3e7cd5c7eb44bd5f632149ad28aef7f2d0690 (patch)
tree41eb78500422196a69e6d775b795f5ee483d4a9e /include/platform
parent32e234a854ae3097bb902cf421f91f9c7d24b291 (diff)
Import ACPICA 20100915.vendor/acpica/20100915
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=212700 svn path=/vendor-sys/acpica/20100915/; revision=212701; tag=vendor/acpica/20100915
Diffstat (limited to 'include/platform')
-rw-r--r--include/platform/accygwin.h8
-rw-r--r--include/platform/acenv.h6
-rw-r--r--include/platform/acfreebsd.h3
-rw-r--r--include/platform/acgcc.h2
-rw-r--r--include/platform/acintel.h22
-rw-r--r--include/platform/aclinux.h3
-rw-r--r--include/platform/acmsvc.h6
-rw-r--r--include/platform/acos2.h6
-rw-r--r--include/platform/acwin.h2
-rw-r--r--include/platform/acwin64.h2
10 files changed, 20 insertions, 40 deletions
diff --git a/include/platform/accygwin.h b/include/platform/accygwin.h
index 6936024839ef..36c0d6d2cedd 100644
--- a/include/platform/accygwin.h
+++ b/include/platform/accygwin.h
@@ -121,7 +121,6 @@
*/
#define ACPI_USE_SYSTEM_CLIBRARY
#define ACPI_USE_DO_WHILE_0
-#define ACPI_THREAD_ID pthread_t
#define ACPI_FLUSH_CPU_CACHE()
/*
* This is needed since sem_timedwait does not appear to work properly
@@ -151,13 +150,12 @@
#define __cdecl
#endif
-#ifdef _ANSI
-#define inline
-#endif
-
#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) if (GLptr) Acq=1; else Acq=0;
#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Pending) Pending = 1
+/* On Cygwin, pthread_t is a pointer */
+
+#define ACPI_CAST_PTHREAD_T(pthread) ((ACPI_THREAD_ID) ACPI_TO_INTEGER (pthread))
/* Cygwin uses GCC */
diff --git a/include/platform/acenv.h b/include/platform/acenv.h
index 0567a003c6d1..c709f4423ebf 100644
--- a/include/platform/acenv.h
+++ b/include/platform/acenv.h
@@ -275,6 +275,12 @@
#define ACPI_FLUSH_CPU_CACHE()
#endif
+/* "inline" keywords - configurable since inline is not standardized */
+
+#ifndef ACPI_INLINE
+#define ACPI_INLINE
+#endif
+
/*
* Configurable calling conventions:
*
diff --git a/include/platform/acfreebsd.h b/include/platform/acfreebsd.h
index 145b7bb0de67..6c087da084f6 100644
--- a/include/platform/acfreebsd.h
+++ b/include/platform/acfreebsd.h
@@ -139,7 +139,6 @@
#include "opt_acpi.h"
-#define ACPI_THREAD_ID lwpid_t
#define ACPI_MUTEX_TYPE ACPI_OSL_MUTEX
#ifdef ACPI_DEBUG
@@ -166,8 +165,6 @@
#include <ctype.h>
#endif
-#define ACPI_THREAD_ID pthread_t
-
#define ACPI_USE_STANDARD_HEADERS
#define ACPI_FLUSH_CPU_CACHE()
diff --git a/include/platform/acgcc.h b/include/platform/acgcc.h
index d0098b1800ab..9c7c9b94441f 100644
--- a/include/platform/acgcc.h
+++ b/include/platform/acgcc.h
@@ -116,6 +116,8 @@
#ifndef __ACGCC_H__
#define __ACGCC_H__
+#define ACPI_INLINE __inline__
+
/* Function name is used for debug output. Non-ANSI, compiler-dependent */
#define ACPI_GET_FUNCTION_NAME __FUNCTION__
diff --git a/include/platform/acintel.h b/include/platform/acintel.h
index a7e75ec60313..415e9b00df43 100644
--- a/include/platform/acintel.h
+++ b/include/platform/acintel.h
@@ -116,11 +116,11 @@
#ifndef __ACINTEL_H__
#define __ACINTEL_H__
+/* Configuration specific to Intel 64-bit C compiler */
-#define COMPILER_DEPENDENT_INT64 __int64
-#define COMPILER_DEPENDENT_UINT64 unsigned __int64
-
-#define inline __inline
+#define COMPILER_DEPENDENT_INT64 __int64
+#define COMPILER_DEPENDENT_UINT64 unsigned __int64
+#define ACPI_INLINE __inline
/*
* Calling conventions:
@@ -135,20 +135,6 @@
#define ACPI_INTERNAL_XFACE
#define ACPI_INTERNAL_VAR_XFACE
-/*
- * Math helper functions
- */
-#define ACPI_DIV_64_BY_32(n, n_hi, n_lo, d32, q32, r32) \
-{ \
- q32 = n / d32; \
- r32 = n % d32; \
-}
-
-#define ACPI_SHIFT_RIGHT_64(n, n_hi, n_lo) \
-{ \
- n <<= 1; \
-}
-
/* remark 981 - operands evaluated in no particular order */
#pragma warning(disable:981)
diff --git a/include/platform/aclinux.h b/include/platform/aclinux.h
index 9009689c938d..44977468dcfa 100644
--- a/include/platform/aclinux.h
+++ b/include/platform/aclinux.h
@@ -147,7 +147,6 @@
#define ACPI_CACHE_T struct kmem_cache
#define ACPI_SPINLOCK spinlock_t *
#define ACPI_CPU_FLAGS unsigned long
-#define ACPI_THREAD_ID struct task_struct *
#else /* !__KERNEL__ */
@@ -160,7 +159,7 @@
/* Host-dependent types and defines for user-space ACPICA */
#define ACPI_FLUSH_CPU_CACHE()
-#define ACPI_THREAD_ID pthread_t
+#define ACPI_CAST_PTHREAD_T(pthread) ((ACPI_THREAD_ID) (pthread))
#if defined(__ia64__) || defined(__x86_64__)
#define ACPI_MACHINE_WIDTH 64
diff --git a/include/platform/acmsvc.h b/include/platform/acmsvc.h
index 62e69d16dc1d..28a072780fb8 100644
--- a/include/platform/acmsvc.h
+++ b/include/platform/acmsvc.h
@@ -116,8 +116,9 @@
#ifndef __ACMSVC_H__
#define __ACMSVC_H__
-#define COMPILER_DEPENDENT_INT64 __int64
-#define COMPILER_DEPENDENT_UINT64 unsigned __int64
+#define COMPILER_DEPENDENT_INT64 __int64
+#define COMPILER_DEPENDENT_UINT64 unsigned __int64
+#define ACPI_INLINE __inline
/*
* Calling conventions:
@@ -179,5 +180,4 @@
/* warn C4131: uses old-style declarator (iASL compiler only) */
#pragma warning(disable:4131)
-
#endif /* __ACMSVC_H__ */
diff --git a/include/platform/acos2.h b/include/platform/acos2.h
index 90e6b2e4914c..95f97eb81245 100644
--- a/include/platform/acos2.h
+++ b/include/platform/acos2.h
@@ -158,12 +158,6 @@ unsigned short OSPMReleaseGlobalLock (void *);
n_lo = (unsigned long)(val & 0xffffffff); \
}
-/* IBM VAC does not have inline */
-
-#if __IBMC__ || __IBMCPP__
-#define inline
-#endif
-
#ifndef ACPI_ASL_COMPILER
#define ACPI_USE_LOCAL_CACHE
#undef ACPI_DEBUGGER
diff --git a/include/platform/acwin.h b/include/platform/acwin.h
index 583f677b4751..a6ae8071a97d 100644
--- a/include/platform/acwin.h
+++ b/include/platform/acwin.h
@@ -126,8 +126,6 @@
#define ACPI_MACHINE_WIDTH 32
-#define inline __inline
-
#define ACPI_USE_STANDARD_HEADERS
#ifdef ACPI_DEFINE_ALTERNATE_TYPES
diff --git a/include/platform/acwin64.h b/include/platform/acwin64.h
index 64c1f99702a6..076f586bd005 100644
--- a/include/platform/acwin64.h
+++ b/include/platform/acwin64.h
@@ -1,6 +1,6 @@
/******************************************************************************
*
- * Name: acwin.h - OS specific defines, etc.
+ * Name: acwin64.h - OS specific defines, etc.
*
*****************************************************************************/
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-15 10:29:48 +0000