diff options
author | Lv Zheng <lv.zheng@intel.com> | 2012-12-19 00:36:49 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-10 06:36:17 -0500 |
commit | 75c8044fb38051713000e0d151852f5f9614f77b (patch) | |
tree | 00a49eca82954bf008c47330bffc6342b687706f /include/acpi/platform | |
parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) |
ACPICA: Cleanup updated comments.
This is a cosmetic patch only. Comparison of the resulting binary showed
only line number differences.
This patch does not affect the generation of the Linux binary.
This patch decreases 558 lines of 20121018 divergence.diff.
This patch reduces the source code diff between Linux and ACPICA by
cleaning the comments that already have been updated in ACPICA.
There is no extra indentation done in this patch. Even the empty line
deletions and insertions are also splitted into another cleanup patch so
that this patch can be easily reviewed, and the binary differences can be
held to a lowest level.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi/platform')
-rw-r--r-- | include/acpi/platform/acenv.h | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index 89cee88dd2a5..e3409b6cefbd 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /****************************************************************************** | 1 | /****************************************************************************** |
2 | * | 2 | * |
3 | * Name: acenv.h - Generation environment specific items | 3 | * Name: acenv.h - Host and compiler configuration |
4 | * | 4 | * |
5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
6 | 6 | ||
@@ -60,14 +60,12 @@ | |||
60 | * | 60 | * |
61 | *****************************************************************************/ | 61 | *****************************************************************************/ |
62 | 62 | ||
63 | /* Linkable ACPICA library */ | ||
63 | #ifdef ACPI_LIBRARY | 64 | #ifdef ACPI_LIBRARY |
64 | /* | ||
65 | * Note: The non-debug version of the acpi_library does not contain any | ||
66 | * debug support, for minimal size. The debug version uses ACPI_FULL_DEBUG | ||
67 | */ | ||
68 | #define ACPI_USE_LOCAL_CACHE | 65 | #define ACPI_USE_LOCAL_CACHE |
69 | #endif | 66 | #endif |
70 | 67 | ||
68 | /* iASL configuration */ | ||
71 | #ifdef ACPI_ASL_COMPILER | 69 | #ifdef ACPI_ASL_COMPILER |
72 | #define ACPI_DEBUG_OUTPUT | 70 | #define ACPI_DEBUG_OUTPUT |
73 | #define ACPI_APPLICATION | 71 | #define ACPI_APPLICATION |
@@ -77,6 +75,7 @@ | |||
77 | #define ACPI_DATA_TABLE_DISASSEMBLY | 75 | #define ACPI_DATA_TABLE_DISASSEMBLY |
78 | #endif | 76 | #endif |
79 | 77 | ||
78 | /* acpi_exec configuration. Multithreaded with full AML debugger */ | ||
80 | #ifdef ACPI_EXEC_APP | 79 | #ifdef ACPI_EXEC_APP |
81 | #undef DEBUGGER_THREADING | 80 | #undef DEBUGGER_THREADING |
82 | #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED | 81 | #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED |
@@ -87,11 +86,13 @@ | |||
87 | #define ACPI_DBG_TRACK_ALLOCATIONS | 86 | #define ACPI_DBG_TRACK_ALLOCATIONS |
88 | #endif | 87 | #endif |
89 | 88 | ||
89 | /* Common for all ACPICA applications */ | ||
90 | #ifdef ACPI_APPLICATION | 90 | #ifdef ACPI_APPLICATION |
91 | #define ACPI_USE_SYSTEM_CLIBRARY | 91 | #define ACPI_USE_SYSTEM_CLIBRARY |
92 | #define ACPI_USE_LOCAL_CACHE | 92 | #define ACPI_USE_LOCAL_CACHE |
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | /* Common debug support */ | ||
95 | #ifdef ACPI_FULL_DEBUG | 96 | #ifdef ACPI_FULL_DEBUG |
96 | #define ACPI_DEBUGGER | 97 | #define ACPI_DEBUGGER |
97 | #define ACPI_DEBUG_OUTPUT | 98 | #define ACPI_DEBUG_OUTPUT |
@@ -186,9 +187,7 @@ | |||
186 | * | 187 | * |
187 | *****************************************************************************/ | 188 | *****************************************************************************/ |
188 | 189 | ||
189 | /* | 190 | /* Type of mutex supported by host. Default is binary semaphores. */ |
190 | * Are mutexes supported by the host? default is no, use binary semaphores. | ||
191 | */ | ||
192 | #ifndef ACPI_MUTEX_TYPE | 191 | #ifndef ACPI_MUTEX_TYPE |
193 | #define ACPI_MUTEX_TYPE ACPI_BINARY_SEMAPHORE | 192 | #define ACPI_MUTEX_TYPE ACPI_BINARY_SEMAPHORE |
194 | #endif | 193 | #endif |
@@ -230,9 +229,7 @@ | |||
230 | * We want to keep these to a minimum. | 229 | * We want to keep these to a minimum. |
231 | */ | 230 | */ |
232 | #ifdef ACPI_USE_STANDARD_HEADERS | 231 | #ifdef ACPI_USE_STANDARD_HEADERS |
233 | /* | 232 | /* Use the standard headers from the standard locations */ |
234 | * Use the standard headers from the standard locations | ||
235 | */ | ||
236 | #include <stdarg.h> | 233 | #include <stdarg.h> |
237 | #include <stdlib.h> | 234 | #include <stdlib.h> |
238 | #include <string.h> | 235 | #include <string.h> |
@@ -240,9 +237,7 @@ | |||
240 | 237 | ||
241 | #endif /* ACPI_USE_STANDARD_HEADERS */ | 238 | #endif /* ACPI_USE_STANDARD_HEADERS */ |
242 | 239 | ||
243 | /* | 240 | /* We will be linking to the standard Clib functions */ |
244 | * We will be linking to the standard Clib functions | ||
245 | */ | ||
246 | #define ACPI_STRSTR(s1,s2) strstr((s1), (s2)) | 241 | #define ACPI_STRSTR(s1,s2) strstr((s1), (s2)) |
247 | #define ACPI_STRCHR(s1,c) strchr((s1), (c)) | 242 | #define ACPI_STRCHR(s1,c) strchr((s1), (c)) |
248 | #define ACPI_STRLEN(s) (acpi_size) strlen((s)) | 243 | #define ACPI_STRLEN(s) (acpi_size) strlen((s)) |
@@ -274,12 +269,12 @@ | |||
274 | * | 269 | * |
275 | *****************************************************************************/ | 270 | *****************************************************************************/ |
276 | 271 | ||
277 | /* | 272 | /* |
278 | * Use local definitions of C library macros and functions | 273 | * Use local definitions of C library macros and functions. These function |
279 | * NOTE: The function implementations may not be as efficient | 274 | * implementations may not be as efficient as an inline or assembly code |
280 | * as an inline or assembly code implementation provided by a | 275 | * implementation provided by a native C library, but they are functionally |
281 | * native C library. | 276 | * equivalent. |
282 | */ | 277 | */ |
283 | 278 | ||
284 | #ifndef va_arg | 279 | #ifndef va_arg |
285 | 280 | ||
@@ -288,15 +283,11 @@ | |||
288 | typedef char *va_list; | 283 | typedef char *va_list; |
289 | #endif /* _VALIST */ | 284 | #endif /* _VALIST */ |
290 | 285 | ||
291 | /* | 286 | /* Storage alignment properties */ |
292 | * Storage alignment properties | ||
293 | */ | ||
294 | #define _AUPBND (sizeof (acpi_native_int) - 1) | 287 | #define _AUPBND (sizeof (acpi_native_int) - 1) |
295 | #define _ADNBND (sizeof (acpi_native_int) - 1) | 288 | #define _ADNBND (sizeof (acpi_native_int) - 1) |
296 | 289 | ||
297 | /* | 290 | /* Variable argument list macro definitions */ |
298 | * Variable argument list macro definitions | ||
299 | */ | ||
300 | #define _bnd(X, bnd) (((sizeof (X)) + (bnd)) & (~(bnd))) | 291 | #define _bnd(X, bnd) (((sizeof (X)) + (bnd)) & (~(bnd))) |
301 | #define va_arg(ap, T) (*(T *)(((ap) += (_bnd (T, _AUPBND))) - (_bnd (T,_ADNBND)))) | 292 | #define va_arg(ap, T) (*(T *)(((ap) += (_bnd (T, _AUPBND))) - (_bnd (T,_ADNBND)))) |
302 | #define va_end(ap) (void) 0 | 293 | #define va_end(ap) (void) 0 |
@@ -304,6 +295,7 @@ typedef char *va_list; | |||
304 | 295 | ||
305 | #endif /* va_arg */ | 296 | #endif /* va_arg */ |
306 | 297 | ||
298 | /* Use the local (ACPICA) definitions of the clib functions */ | ||
307 | #define ACPI_STRSTR(s1,s2) acpi_ut_strstr ((s1), (s2)) | 299 | #define ACPI_STRSTR(s1,s2) acpi_ut_strstr ((s1), (s2)) |
308 | #define ACPI_STRCHR(s1,c) acpi_ut_strchr ((s1), (c)) | 300 | #define ACPI_STRCHR(s1,c) acpi_ut_strchr ((s1), (c)) |
309 | #define ACPI_STRLEN(s) (acpi_size) acpi_ut_strlen ((s)) | 301 | #define ACPI_STRLEN(s) (acpi_size) acpi_ut_strlen ((s)) |