git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
acpi
/
acconfig.h
diff --git
a/include/acpi/acconfig.h
b/include/acpi/acconfig.h
index
e4a0f1e
..
9e6c23c
100644
(file)
--- a/
include/acpi/acconfig.h
+++ b/
include/acpi/acconfig.h
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 200
4
, R. Byron Moore
+ * Copyright (C) 2000 - 200
6
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-44,7
+44,6
@@
#ifndef _ACCONFIG_H
#define _ACCONFIG_H
#ifndef _ACCONFIG_H
#define _ACCONFIG_H
-
/******************************************************************************
*
* Configuration options
/******************************************************************************
*
* Configuration options
@@
-62,9
+61,9
@@
*
*/
*
*/
-/*
Version string
*/
+/*
Current ACPICA subsystem version in YYYYMMDD format
*/
-#define ACPI_CA_VERSION 0x200
40816
+#define ACPI_CA_VERSION 0x200
60707
/*
* OS name, used for the _OS object. The _OS object is essentially obsolete,
/*
* OS name, used for the _OS object. The _OS object is essentially obsolete,
@@
-78,19
+77,18
@@
/* Maximum objects in the various object caches */
/* Maximum objects in the various object caches */
-#define ACPI_MAX_STATE_CACHE_DEPTH
64
/* State objects */
-#define ACPI_MAX_PARSE_CACHE_DEPTH 96
/* Parse tree objects */
-#define ACPI_MAX_EXTPARSE_CACHE_DEPTH
64
/* Parse tree objects */
-#define ACPI_MAX_OBJECT_CACHE_DEPTH
64
/* Interpreter operand objects */
-#define ACPI_MAX_
WALK_CACHE_DEPTH 4 /* Objects for parse tree walk
s */
+#define ACPI_MAX_STATE_CACHE_DEPTH
96
/* State objects */
+#define ACPI_MAX_PARSE_CACHE_DEPTH 96 /* Parse tree objects */
+#define ACPI_MAX_EXTPARSE_CACHE_DEPTH
96
/* Parse tree objects */
+#define ACPI_MAX_OBJECT_CACHE_DEPTH
96
/* Interpreter operand objects */
+#define ACPI_MAX_
NAMESPACE_CACHE_DEPTH 96 /* Namespace object
s */
/*
/*
- * Should the subystem abort the loading of an ACPI table if the
+ * Should the sub
s
ystem abort the loading of an ACPI table if the
* table checksum is incorrect?
*/
#define ACPI_CHECKSUM_ABORT FALSE
* table checksum is incorrect?
*/
#define ACPI_CHECKSUM_ABORT FALSE
-
/******************************************************************************
*
* Subsystem Constants
/******************************************************************************
*
* Subsystem Constants
@@
-99,25
+97,23
@@
/* Version of ACPI supported */
/* Version of ACPI supported */
-#define ACPI_CA_SUPPORT_LEVEL 2
-
-/* String size constants */
-
-#define ACPI_MAX_STRING_LENGTH 512
-#define ACPI_PATHNAME_MAX 256 /* A full namespace pathname */
+#define ACPI_CA_SUPPORT_LEVEL 3
/* Maximum count for a semaphore object */
#define ACPI_MAX_SEMAPHORE_COUNT 256
/* Maximum count for a semaphore object */
#define ACPI_MAX_SEMAPHORE_COUNT 256
-/* Max
reference count (for debug only
) */
+/* Max
imum object reference count (detects object deletion issues
) */
-#define ACPI_MAX_REFERENCE_COUNT 0x
4
00
+#define ACPI_MAX_REFERENCE_COUNT 0x
8
00
/* Size of cached memory mapping for system memory operation region */
#define ACPI_SYSMEM_REGION_WINDOW_SIZE 4096
/* Size of cached memory mapping for system memory operation region */
#define ACPI_SYSMEM_REGION_WINDOW_SIZE 4096
+/* owner_id tracking. 8 entries allows for 255 owner_ids */
+
+#define ACPI_NUM_OWNERID_MASKS 8
/******************************************************************************
*
/******************************************************************************
*
@@
-130,23
+126,19
@@
#define ACPI_MAX_GPE_BLOCKS 2
#define ACPI_GPE_REGISTER_WIDTH 8
#define ACPI_MAX_GPE_BLOCKS 2
#define ACPI_GPE_REGISTER_WIDTH 8
-/*
- * Method info (in WALK_STATE), containing local variables and argumetns
- */
+/* Method info (in WALK_STATE), containing local variables and argumetns */
+
#define ACPI_METHOD_NUM_LOCALS 8
#define ACPI_METHOD_MAX_LOCAL 7
#define ACPI_METHOD_NUM_ARGS 7
#define ACPI_METHOD_MAX_ARG 6
#define ACPI_METHOD_NUM_LOCALS 8
#define ACPI_METHOD_MAX_LOCAL 7
#define ACPI_METHOD_NUM_ARGS 7
#define ACPI_METHOD_MAX_ARG 6
-/* Maximum length of resulting string when converting from a buffer */
-
-#define ACPI_MAX_STRING_CONVERSION 200
-
-/* Length of _HID, _UID, and _CID values */
+/* Length of _HID, _UID, _CID, and UUID values */
#define ACPI_DEVICE_ID_LENGTH 0x09
#define ACPI_MAX_CID_LENGTH 48
#define ACPI_DEVICE_ID_LENGTH 0x09
#define ACPI_MAX_CID_LENGTH 48
+#define ACPI_UUID_LENGTH 16
/*
* Operand Stack (in WALK_STATE), Must be large enough to contain METHOD_MAX_ARG
/*
* Operand Stack (in WALK_STATE), Must be large enough to contain METHOD_MAX_ARG
@@
-157,15
+149,15
@@
/* Names within the namespace are 4 bytes long */
#define ACPI_NAME_SIZE 4
/* Names within the namespace are 4 bytes long */
#define ACPI_NAME_SIZE 4
-#define ACPI_PATH_SEGMENT_LENGTH 5
/* 4 chars for name + 1 char for separator */
+#define ACPI_PATH_SEGMENT_LENGTH 5 /* 4 chars for name + 1 char for separator */
#define ACPI_PATH_SEPARATOR '.'
/* Constants used in searching for the RSDP in low memory */
#define ACPI_PATH_SEPARATOR '.'
/* Constants used in searching for the RSDP in low memory */
-#define ACPI_EBDA_PTR_LOCATION 0x0000040E /* Physical Address */
+#define ACPI_EBDA_PTR_LOCATION 0x0000040E /* Physical Address */
#define ACPI_EBDA_PTR_LENGTH 2
#define ACPI_EBDA_WINDOW_SIZE 1024
#define ACPI_EBDA_PTR_LENGTH 2
#define ACPI_EBDA_WINDOW_SIZE 1024
-#define ACPI_HI_RSDP_WINDOW_BASE 0x000E0000 /* Physical Address */
+#define ACPI_HI_RSDP_WINDOW_BASE 0x000E0000 /* Physical Address */
#define ACPI_HI_RSDP_WINDOW_SIZE 0x00020000
#define ACPI_RSDP_SCAN_STEP 16
#define ACPI_HI_RSDP_WINDOW_SIZE 0x00020000
#define ACPI_RSDP_SCAN_STEP 16
@@
-180,12
+172,7
@@
/* Array sizes. Used for range checking also */
/* Array sizes. Used for range checking also */
-#define ACPI_NUM_ACCESS_TYPES 6
-#define ACPI_NUM_UPDATE_RULES 3
-#define ACPI_NUM_LOCK_RULES 2
-#define ACPI_NUM_MATCH_OPS 6
-#define ACPI_NUM_OPCODES 256
-#define ACPI_NUM_FIELD_NAMES 2
+#define ACPI_MAX_MATCH_OPCODE 5
/* RSDP checksums */
/* RSDP checksums */
@@
-196,22
+183,15
@@
#define ACPI_SMBUS_BUFFER_SIZE 34
#define ACPI_SMBUS_BUFFER_SIZE 34
-/* Number of strings associated with the _OSI reserved method */
-
-#define ACPI_NUM_OSI_STRINGS 9
-
-
/******************************************************************************
*
* ACPI AML Debugger
*
*****************************************************************************/
/******************************************************************************
*
* ACPI AML Debugger
*
*****************************************************************************/
-#define ACPI_DEBUGGER_MAX_ARGS 8 /* Must be max method args + 1 */
+#define ACPI_DEBUGGER_MAX_ARGS 8
/* Must be max method args + 1 */
#define ACPI_DEBUGGER_COMMAND_PROMPT '-'
#define ACPI_DEBUGGER_EXECUTE_PROMPT '%'
#define ACPI_DEBUGGER_COMMAND_PROMPT '-'
#define ACPI_DEBUGGER_EXECUTE_PROMPT '%'
-
-#endif /* _ACCONFIG_H */
-
+#endif /* _ACCONFIG_H */