WebSVN – Kolibri OS – Path Comparison – / – /drivers/devman/acpica/include/platform/ Rev 2215 and /drivers/devman/acpica/include/platform/ Rev 2216

Regard whitespace Rev 2215 → Rev 2216

 /drivers/devman/acpica/include/platform/accygwin.h
 ,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
 ,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
 ,14 → 150,13
 #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 */
 #include "acgcc.h"

 /drivers/devman/acpica/include/platform/acefi.h
 ,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

 /drivers/devman/acpica/include/platform/acenv.h
 ,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
 ,9 → 148,10
 #define ACPI_CONSTANT_EVAL_ONLY
 #define ACPI_LARGE_NAMESPACE_NODE
 #define ACPI_DATA_TABLE_DISASSEMBLY
+#define ACPI_SINGLE_THREADED
 #endif
-/* AcpiExec configuration */
+/* AcpiExec configuration. Multithreaded with full AML debugger */
 #ifdef ACPI_EXEC_APP
 #define ACPI_APPLICATION
 ,6 → 160,30
 #define ACPI_DBG_TRACK_ALLOCATIONS
 #endif
+/* AcpiNames configuration. Single threaded with debugger output enabled. */
+#ifdef ACPI_NAMES_APP
+#define ACPI_DEBUGGER
+#define ACPI_APPLICATION
+#define ACPI_SINGLE_THREADED
+#endif
+/*
+ * AcpiBin/AcpiHelp/AcpiSrc configuration. All single threaded, with
+ * no debug output.
+ */
+#if (defined ACPI_BIN_APP)   || \
+    (defined ACPI_SRC_APP)
+#define ACPI_APPLICATION
+#define ACPI_SINGLE_THREADED
+#endif
+#ifdef ACPI_HELP_APP
+#define ACPI_DEBUG_OUTPUT
+#define ACPI_APPLICATION
+#define ACPI_SINGLE_THREADED
+#endif
 /* Linkable ACPICA library */
 #ifdef ACPI_LIBRARY
 ,6 → 260,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:
  *

 /drivers/devman/acpica/include/platform/acfreebsd.h
 ,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
 ,7 → 139,6
 #include "opt_acpi.h"
-#define ACPI_THREAD_ID      lwpid_t
 #define ACPI_MUTEX_TYPE     ACPI_OSL_MUTEX
 #ifdef ACPI_DEBUG
 ,7 → 165,7
 #include <ctype.h>
 #endif
-#define ACPI_THREAD_ID      pthread_t
+#define ACPI_CAST_PTHREAD_T(pthread)    ((ACPI_THREAD_ID) ACPI_TO_INTEGER (pthread))
 #define ACPI_USE_STANDARD_HEADERS

 /drivers/devman/acpica/include/platform/acgcc.h
 ,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
 ,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__

 /drivers/devman/acpica/include/platform/acintel.h
 ,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
 ,12 → 116,12
 #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 ACPI_INLINE                 __inline
-#define inline                  __inline
 /*
  * Calling conventions:
  *
 ,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)

 /drivers/devman/acpica/include/platform/ackolibri.h
 ,7 → 1,5
 /******************************************************************************
  *
- * Name: achaiku.h - OS specific defines, etc.
- *       $Revision: 1.1 $
  *
  *****************************************************************************/
 ,7 → 132,6
 #define asm         __asm__
 #define ACPI_USE_DO_WHILE_0
-#define ACPI_THREAD_ID              UINT32
 #define ACPI_USE_NATIVE_DIVIDE

/drivers/devman/acpica/include/platform/aclinux.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
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,17 → 159,18
/* Host-dependent types and defines for user-space ACPICA */

#define ACPI_FLUSH_CPU_CACHE()
#define ACPI_THREAD_ID pthread_t

#if defined(__ia64__) \|\| defined(__x86_64__)
#define ACPI_MACHINE_WIDTH 64
#define COMPILER_DEPENDENT_INT64 long
#define COMPILER_DEPENDENT_UINT64 unsigned long
#define ACPI_CAST_PTHREAD_T(pthread) ((ACPI_THREAD_ID) (pthread))
#else
#define ACPI_MACHINE_WIDTH 32
#define COMPILER_DEPENDENT_INT64 long long
#define COMPILER_DEPENDENT_UINT64 unsigned long long
#define ACPI_USE_NATIVE_DIVIDE
#define ACPI_CAST_PTHREAD_T(pthread) ((ACPI_THREAD_ID) (UINT32) (void *) (pthread))
#endif

#ifndef __cdecl

 /drivers/devman/acpica/include/platform/acmsvc.h
 ,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
 ,8 → 116,43
 #ifndef __ACMSVC_H__
 #define __ACMSVC_H__
+/*
+ * Map low I/O functions for MS. This allows us to disable MS language
+ * extensions for maximum portability.
+ */
+#define open            _open
+#define read            _read
+#define write           _write
+#define close           _close
+#define stat            _stat
+#define fstat           _fstat
+#define mkdir           _mkdir
+#define strlwr          _strlwr
+#define O_RDONLY        _O_RDONLY
+#define O_BINARY        _O_BINARY
+#define O_CREAT         _O_CREAT
+#define O_WRONLY        _O_WRONLY
+#define O_TRUNC         _O_TRUNC
+#define S_IREAD         _S_IREAD
+#define S_IWRITE        _S_IWRITE
+#define S_IFDIR         _S_IFDIR
+/* Eliminate warnings for "old" (non-secure) versions of clib functions */
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+/* Eliminate warnings for POSIX clib function names (open, write, etc.) */
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif
 #define COMPILER_DEPENDENT_INT64   __int64
 #define COMPILER_DEPENDENT_UINT64  unsigned __int64
+#define ACPI_INLINE                 __inline
 /*
  * Calling conventions:
 ,5 → 214,8
 /* warn C4131: uses old-style declarator (iASL compiler only) */
 #pragma warning(disable:4131)
+#if _MSC_VER > 1200 /* Versions above VC++ 6 */
+#pragma warning( disable : 4295 ) /* needed for acpredef.h array */
+#endif
 #endif /* __ACMSVC_H__ */

 /drivers/devman/acpica/include/platform/acnetbsd.h
 ,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

 /drivers/devman/acpica/include/platform/acos2.h
 ,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
 ,12 → 158,6
     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

 /drivers/devman/acpica/include/platform/acwin.h
 ,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
 ,8 → 126,6
 #define ACPI_MACHINE_WIDTH      32
-#define inline                  __inline
 #define ACPI_USE_STANDARD_HEADERS
 #ifdef ACPI_DEFINE_ALTERNATE_TYPES

 /drivers/devman/acpica/include/platform/acwin64.h
 ,6 → 1,6
 /******************************************************************************
  *
- * Name: acwin.h - OS specific defines, etc.
+ * Name: acwin64.h - OS specific defines, etc.
  *
  *****************************************************************************/
 ,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

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2215 → Rev 2216