Print this page
update to acpica-unix2-20131218
acpica-unix2-20130823
PANKOVs restructure
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/uts/intel/sys/acpi/platform/acenv.h
+++ new/usr/src/common/acpica/include/platform/acenv.h
1 1 /******************************************************************************
2 2 *
3 3 * Name: acenv.h - Host and compiler configuration
4 4 *
5 5 *****************************************************************************/
6 6
7 7 /*
8 - * Copyright (C) 2000 - 2011, Intel Corp.
8 + * Copyright (C) 2000 - 2013, Intel Corp.
9 9 * All rights reserved.
10 10 *
11 11 * Redistribution and use in source and binary forms, with or without
12 12 * modification, are permitted provided that the following conditions
13 13 * are met:
14 14 * 1. Redistributions of source code must retain the above copyright
15 15 * notice, this list of conditions, and the following disclaimer,
16 16 * without modification.
17 17 * 2. Redistributions in binary form must reproduce at minimum a disclaimer
18 18 * substantially similar to the "NO WARRANTY" disclaimer below
19 19 * ("Disclaimer") and any redistribution must be conditioned upon
20 20 * including a substantially similar Disclaimer requirement for further
21 21 * binary redistribution.
22 22 * 3. Neither the names of the above-listed copyright holders nor the names
23 23 * of any contributors may be used to endorse or promote products derived
24 24 * from this software without specific prior written permission.
25 25 *
26 26 * Alternatively, this software may be distributed under the terms of the
27 27 * GNU General Public License ("GPL") version 2 as published by the Free
28 28 * Software Foundation.
29 29 *
30 30 * NO WARRANTY
31 31 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
32 32 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
33 33 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
34 34 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
35 35 * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
36 36 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
37 37 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
38 38 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
39 39 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
40 40 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
41 41 * POSSIBILITY OF SUCH DAMAGES.
42 42 */
43 43
44 44 #ifndef __ACENV_H__
45 45 #define __ACENV_H__
46 46
47 47 /*
48 48 * Environment configuration. The purpose of this file is to interface ACPICA
49 49 * to the local environment. This includes compiler-specific, OS-specific,
50 50 * and machine-specific configuration.
51 51 */
52 52
53 53 /* Types for ACPI_MUTEX_TYPE */
54 54
55 55 #define ACPI_BINARY_SEMAPHORE 0
56 56 #define ACPI_OSL_MUTEX 1
57 57
58 58 /* Types for DEBUGGER_THREADING */
59 59
60 60 #define DEBUGGER_SINGLE_THREADED 0
61 61 #define DEBUGGER_MULTI_THREADED 1
62 62
63 63
64 64 /******************************************************************************
65 65 *
66 66 * Configuration for ACPI tools and utilities
67 67 *
68 68 *****************************************************************************/
69 69
70 70 /* iASL configuration */
71 71
↓ open down ↓ |
53 lines elided |
↑ open up ↑ |
72 72 #ifdef ACPI_ASL_COMPILER
73 73 #define ACPI_APPLICATION
74 74 #define ACPI_DISASSEMBLER
75 75 #define ACPI_DEBUG_OUTPUT
76 76 #define ACPI_CONSTANT_EVAL_ONLY
77 77 #define ACPI_LARGE_NAMESPACE_NODE
78 78 #define ACPI_DATA_TABLE_DISASSEMBLY
79 79 #define ACPI_SINGLE_THREADED
80 80 #endif
81 81
82 -/* AcpiExec and AcpiBin configuration */
82 +/* AcpiExec configuration. Multithreaded with full AML debugger */
83 83
84 84 #ifdef ACPI_EXEC_APP
85 85 #define ACPI_APPLICATION
86 86 #define ACPI_FULL_DEBUG
87 87 #define ACPI_MUTEX_DEBUG
88 88 #define ACPI_DBG_TRACK_ALLOCATIONS
89 89 #endif
90 90
91 -#ifdef ACPI_BIN_APP
91 +/* AcpiNames configuration. Single threaded with debugger output enabled. */
92 +
93 +#ifdef ACPI_NAMES_APP
94 +#define ACPI_DEBUGGER
92 95 #define ACPI_APPLICATION
93 96 #define ACPI_SINGLE_THREADED
94 97 #endif
95 98
99 +/*
100 + * AcpiBin/AcpiDump/AcpiSrc/AcpiXtract/Example configuration. All single
101 + * threaded, with no debug output.
102 + */
103 +#if (defined ACPI_BIN_APP) || \
104 + (defined ACPI_DUMP_APP) || \
105 + (defined ACPI_SRC_APP) || \
106 + (defined ACPI_XTRACT_APP) || \
107 + (defined ACPI_EXAMPLE_APP)
108 +#define ACPI_APPLICATION
109 +#define ACPI_SINGLE_THREADED
110 +#endif
111 +
112 +#ifdef ACPI_HELP_APP
113 +#define ACPI_APPLICATION
114 +#define ACPI_SINGLE_THREADED
115 +#define ACPI_NO_ERROR_MESSAGES
116 +#endif
117 +
96 118 /* Linkable ACPICA library */
97 119
98 120 #ifdef ACPI_LIBRARY
99 121 #define ACPI_USE_LOCAL_CACHE
100 122 #endif
101 123
102 124 /* Common for all ACPICA applications */
103 125
104 126 #ifdef ACPI_APPLICATION
105 127 #define ACPI_USE_SYSTEM_CLIBRARY
106 128 #define ACPI_USE_LOCAL_CACHE
107 129 #endif
108 130
109 131 /* Common debug support */
110 132
111 133 #ifdef ACPI_FULL_DEBUG
112 134 #define ACPI_DEBUGGER
113 135 #define ACPI_DEBUG_OUTPUT
114 136 #define ACPI_DISASSEMBLER
115 137 #endif
116 138
117 139
118 140 /*! [Begin] no source code translation */
119 141
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
120 142 /******************************************************************************
121 143 *
122 144 * Host configuration files. The compiler configuration files are included
123 145 * by the host files.
124 146 *
125 147 *****************************************************************************/
126 148
127 149 #if defined(_LINUX) || defined(__linux__)
128 150 #include "aclinux.h"
129 151
152 +#elif defined(_APPLE) || defined(__APPLE__)
153 +#include "acmacosx.h"
154 +
130 155 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
131 156 #include "acfreebsd.h"
132 157
133 158 #elif defined(__NetBSD__)
134 159 #include "acnetbsd.h"
135 160
136 161 #elif defined(__sun)
137 162 #include "acsolaris.h"
138 163
139 164 #elif defined(MODESTO)
140 165 #include "acmodesto.h"
141 166
142 167 #elif defined(NETWARE)
143 168 #include "acnetware.h"
144 169
145 170 #elif defined(_CYGWIN)
146 171 #include "accygwin.h"
147 172
148 173 #elif defined(WIN32)
149 174 #include "acwin.h"
150 175
151 176 #elif defined(WIN64)
152 177 #include "acwin64.h"
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
153 178
154 179 #elif defined(_WRS_LIB_BUILD)
155 180 #include "acvxworks.h"
156 181
157 182 #elif defined(__OS2__)
158 183 #include "acos2.h"
159 184
160 185 #elif defined(_AED_EFI)
161 186 #include "acefi.h"
162 187
188 +#elif defined(__HAIKU__)
189 +#include "achaiku.h"
190 +
163 191 #else
164 192
165 193 /* Unknown environment */
166 194
167 195 #error Unknown target environment
168 196 #endif
169 197
170 198 /*! [End] no source code translation !*/
171 199
172 200
173 201 /******************************************************************************
174 202 *
175 203 * Setup defaults for the required symbols that were not defined in one of
176 204 * the host/compiler files above.
177 205 *
178 206 *****************************************************************************/
179 207
180 208 /* 64-bit data types */
181 209
182 210 #ifndef COMPILER_DEPENDENT_INT64
183 211 #define COMPILER_DEPENDENT_INT64 long long
184 212 #endif
185 213
186 214 #ifndef COMPILER_DEPENDENT_UINT64
187 215 #define COMPILER_DEPENDENT_UINT64 unsigned long long
188 216 #endif
189 217
190 218 /* Type of mutex supported by host. Default is binary semaphores. */
191 219
192 220 #ifndef ACPI_MUTEX_TYPE
193 221 #define ACPI_MUTEX_TYPE ACPI_BINARY_SEMAPHORE
194 222 #endif
195 223
196 224 /* Global Lock acquire/release */
197 225
198 226 #ifndef ACPI_ACQUIRE_GLOBAL_LOCK
199 227 #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acquired) Acquired = 1
200 228 #endif
201 229
202 230 #ifndef ACPI_RELEASE_GLOBAL_LOCK
203 231 #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Pending) Pending = 0
204 232 #endif
205 233
206 234 /* Flush CPU cache - used when going to sleep. Wbinvd or similar. */
207 235
208 236 #ifndef ACPI_FLUSH_CPU_CACHE
209 237 #define ACPI_FLUSH_CPU_CACHE()
210 238 #endif
211 239
212 240 /* "inline" keywords - configurable since inline is not standardized */
213 241
214 242 #ifndef ACPI_INLINE
215 243 #define ACPI_INLINE
216 244 #endif
217 245
218 246 /*
219 247 * Configurable calling conventions:
220 248 *
221 249 * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads)
222 250 * ACPI_EXTERNAL_XFACE - External ACPI interfaces
223 251 * ACPI_INTERNAL_XFACE - Internal ACPI interfaces
224 252 * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces
225 253 */
226 254 #ifndef ACPI_SYSTEM_XFACE
227 255 #define ACPI_SYSTEM_XFACE
228 256 #endif
229 257
230 258 #ifndef ACPI_EXTERNAL_XFACE
231 259 #define ACPI_EXTERNAL_XFACE
232 260 #endif
233 261
234 262 #ifndef ACPI_INTERNAL_XFACE
235 263 #define ACPI_INTERNAL_XFACE
236 264 #endif
237 265
238 266 #ifndef ACPI_INTERNAL_VAR_XFACE
239 267 #define ACPI_INTERNAL_VAR_XFACE
240 268 #endif
241 269
242 270 /*
243 271 * Debugger threading model
244 272 * Use single threaded if the entire subsystem is contained in an application
245 273 * Use multiple threaded when the subsystem is running in the kernel.
246 274 *
247 275 * By default the model is single threaded if ACPI_APPLICATION is set,
248 276 * multi-threaded if ACPI_APPLICATION is not set.
249 277 */
250 278 #ifndef DEBUGGER_THREADING
251 279 #ifdef ACPI_APPLICATION
252 280 #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED
253 281
254 282 #else
255 283 #define DEBUGGER_THREADING DEBUGGER_MULTI_THREADED
256 284 #endif
257 285 #endif /* !DEBUGGER_THREADING */
258 286
259 287
260 288 /******************************************************************************
261 289 *
262 290 * C library configuration
263 291 *
264 292 *****************************************************************************/
265 293
266 294 /*
267 295 * ACPI_USE_SYSTEM_CLIBRARY - Define this if linking to an actual C library.
268 296 * Otherwise, local versions of string/memory functions will be used.
269 297 * ACPI_USE_STANDARD_HEADERS - Define this if linking to a C library and
↓ open down ↓ |
97 lines elided |
↑ open up ↑ |
270 298 * the standard header files may be used.
271 299 *
272 300 * The ACPICA subsystem only uses low level C library functions that do not call
273 301 * operating system services and may therefore be inlined in the code.
274 302 *
275 303 * It may be necessary to tailor these include files to the target
276 304 * generation environment.
277 305 */
278 306 #ifdef ACPI_USE_SYSTEM_CLIBRARY
279 307
280 -/* Use the standard C library headers. We want to keep these to a minimum */
308 +/* Use the standard C library headers. We want to keep these to a minimum. */
281 309
282 310 #ifdef ACPI_USE_STANDARD_HEADERS
283 311
284 312 /* Use the standard headers from the standard locations */
285 313
286 314 #include <stdarg.h>
287 315 #include <stdlib.h>
288 316 #include <string.h>
289 317 #include <ctype.h>
290 318
291 319 #endif /* ACPI_USE_STANDARD_HEADERS */
292 320
293 321 /* We will be linking to the standard Clib functions */
294 322
295 323 #define ACPI_STRSTR(s1,s2) strstr((s1), (s2))
296 324 #define ACPI_STRCHR(s1,c) strchr((s1), (c))
297 325 #define ACPI_STRLEN(s) (ACPI_SIZE) strlen((s))
298 326 #define ACPI_STRCPY(d,s) (void) strcpy((d), (s))
299 327 #define ACPI_STRNCPY(d,s,n) (void) strncpy((d), (s), (ACPI_SIZE)(n))
300 328 #define ACPI_STRNCMP(d,s,n) strncmp((d), (s), (ACPI_SIZE)(n))
301 329 #define ACPI_STRCMP(d,s) strcmp((d), (s))
302 330 #define ACPI_STRCAT(d,s) (void) strcat((d), (s))
303 331 #define ACPI_STRNCAT(d,s,n) strncat((d), (s), (ACPI_SIZE)(n))
304 332 #define ACPI_STRTOUL(d,s,n) strtoul((d), (s), (ACPI_SIZE)(n))
305 333 #define ACPI_MEMCMP(s1,s2,n) memcmp((const char *)(s1), (const char *)(s2), (ACPI_SIZE)(n))
306 334 #define ACPI_MEMCPY(d,s,n) (void) memcpy((d), (s), (ACPI_SIZE)(n))
307 335 #define ACPI_MEMSET(d,s,n) (void) memset((d), (s), (ACPI_SIZE)(n))
308 336 #define ACPI_TOUPPER(i) toupper((int) (i))
309 337 #define ACPI_TOLOWER(i) tolower((int) (i))
310 338 #define ACPI_IS_XDIGIT(i) isxdigit((int) (i))
311 339 #define ACPI_IS_DIGIT(i) isdigit((int) (i))
312 340 #define ACPI_IS_SPACE(i) isspace((int) (i))
313 341 #define ACPI_IS_UPPER(i) isupper((int) (i))
314 342 #define ACPI_IS_PRINT(i) isprint((int) (i))
315 343 #define ACPI_IS_ALPHA(i) isalpha((int) (i))
316 344
317 345 #else
318 346
319 347 /******************************************************************************
320 348 *
321 349 * Not using native C library, use local implementations
322 350 *
323 351 *****************************************************************************/
324 352
325 353 /*
326 354 * Use local definitions of C library macros and functions. These function
327 355 * implementations may not be as efficient as an inline or assembly code
328 356 * implementation provided by a native C library, but they are functionally
329 357 * equivalent.
330 358 */
331 359 #ifndef va_arg
332 360
333 361 #ifndef _VALIST
334 362 #define _VALIST
335 363 typedef char *va_list;
336 364 #endif /* _VALIST */
↓ open down ↓ |
46 lines elided |
↑ open up ↑ |
337 365
338 366 /* Storage alignment properties */
339 367
340 368 #define _AUPBND (sizeof (ACPI_NATIVE_INT) - 1)
341 369 #define _ADNBND (sizeof (ACPI_NATIVE_INT) - 1)
342 370
343 371 /* Variable argument list macro definitions */
344 372
345 373 #define _Bnd(X, bnd) (((sizeof (X)) + (bnd)) & (~(bnd)))
346 374 #define va_arg(ap, T) (*(T *)(((ap) += (_Bnd (T, _AUPBND))) - (_Bnd (T,_ADNBND))))
347 -#define va_end(ap) (void) 0
375 +#define va_end(ap) (ap = (va_list) NULL)
348 376 #define va_start(ap, A) (void) ((ap) = (((char *) &(A)) + (_Bnd (A,_AUPBND))))
349 377
350 378 #endif /* va_arg */
351 379
352 380 /* Use the local (ACPICA) definitions of the clib functions */
353 381
354 382 #define ACPI_STRSTR(s1,s2) AcpiUtStrstr ((s1), (s2))
355 383 #define ACPI_STRCHR(s1,c) AcpiUtStrchr ((s1), (c))
356 384 #define ACPI_STRLEN(s) (ACPI_SIZE) AcpiUtStrlen ((s))
357 385 #define ACPI_STRCPY(d,s) (void) AcpiUtStrcpy ((d), (s))
358 386 #define ACPI_STRNCPY(d,s,n) (void) AcpiUtStrncpy ((d), (s), (ACPI_SIZE)(n))
359 387 #define ACPI_STRNCMP(d,s,n) AcpiUtStrncmp ((d), (s), (ACPI_SIZE)(n))
360 388 #define ACPI_STRCMP(d,s) AcpiUtStrcmp ((d), (s))
361 389 #define ACPI_STRCAT(d,s) (void) AcpiUtStrcat ((d), (s))
↓ open down ↓ |
4 lines elided |
↑ open up ↑ |
362 390 #define ACPI_STRNCAT(d,s,n) AcpiUtStrncat ((d), (s), (ACPI_SIZE)(n))
363 391 #define ACPI_STRTOUL(d,s,n) AcpiUtStrtoul ((d), (s), (ACPI_SIZE)(n))
364 392 #define ACPI_MEMCMP(s1,s2,n) AcpiUtMemcmp((const char *)(s1), (const char *)(s2), (ACPI_SIZE)(n))
365 393 #define ACPI_MEMCPY(d,s,n) (void) AcpiUtMemcpy ((d), (s), (ACPI_SIZE)(n))
366 394 #define ACPI_MEMSET(d,v,n) (void) AcpiUtMemset ((d), (v), (ACPI_SIZE)(n))
367 395 #define ACPI_TOUPPER(c) AcpiUtToUpper ((int) (c))
368 396 #define ACPI_TOLOWER(c) AcpiUtToLower ((int) (c))
369 397
370 398 #endif /* ACPI_USE_SYSTEM_CLIBRARY */
371 399
400 +#ifndef ACPI_FILE
401 +#ifdef ACPI_APPLICATION
402 +#include <stdio.h>
403 +#define ACPI_FILE FILE *
404 +#else
405 +#define ACPI_FILE void *
406 +#endif /* ACPI_APPLICATION */
407 +#endif /* ACPI_FILE */
408 +
372 409 #endif /* __ACENV_H__ */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX