diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-10-19 18:47:57 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-10-19 18:47:57 +0000 |
commit | 31aa864e8c068201d58aad3a8f82ddb51df11015 (patch) | |
tree | 5e268c18ae0fa3ec73e13e2af60a3be57d8393ec | |
parent | ebef5c959a0ea58fa05c4a5a80bb93104780bf87 (diff) | |
download | src-31aa864e8c068201d58aad3a8f82ddb51df11015.tar.gz src-31aa864e8c068201d58aad3a8f82ddb51df11015.zip |
Notes
219 files changed, 4228 insertions, 2621 deletions
diff --git a/changes.txt b/changes.txt index b2793f20c0be..1aa5c8a89dbe 100644 --- a/changes.txt +++ b/changes.txt @@ -1,30 +1,115 @@ ---------------------------------------- +18 October 2012. Summary of changes for version 20121018: + + +1) ACPICA Kernel-resident Subsystem: + +Updated support for the ACPI 5.0 MPST table. Fixes some problems +introduced by late changes to the table as it was added to the ACPI 5.0 +specification. Includes header, disassembler, and data table compiler +support as well as a new version of the MPST template. + +AcpiGetObjectInfo: Enhanced the device object support to include the ACPI +5.0 _SUB method. Now calls _SUB in addition to the other PNP-related ID +methods: _HID, _CID, and _UID. + +Changed ACPI_DEVICE_ID to ACPI_PNP_DEVICE_ID. Also changed +ACPI_DEVICE_ID_LIST to ACPI_PNP_DEVICE_ID_LIST. These changes prevent +name collisions on hosts that reserve the *_DEVICE_ID (or *DeviceId) +names for their various drivers. Affects the AcpiGetObjectInfo external +interface, and other internal interfaces as well. + +Added and deployed a new macro for ACPI_NAME management: ACPI_MOVE_NAME. +This macro resolves to a simple 32-bit move of the 4-character ACPI_NAME +on machines that support non-aligned transfers. Optimizes for this case +rather than using a strncpy. With assistance from Zheng Lv. + +Resource Manager: Small fix for buffer size calculation. Fixed a one byte +error in the output buffer calculation. Feng Tang. ACPICA BZ 849. + +Added a new debug print message for AML mutex objects that are force- +released. At control method termination, any currently acquired mutex +objects are force-released. Adds a new debug-only message for each one +that is released. + +Audited/updated all ACPICA return macros and the function debug depth +counter: 1) Ensure that all functions that use the various TRACE macros +also use the appropriate ACPICA return macros. 2) Ensure that all normal +return statements surround the return expression (value) with parens to +ensure consistency across the ACPICA code base. Guan Chao, Tang Feng, +Zheng Lv, Bob Moore. ACPICA Bugzilla 972. + +Global source code changes/maintenance: All extra lines at the start and +end of each source file have been removed for consistency. Also, within +comments, all new sentences start with a single space instead of a double +space, again for consistency across the code base. + +Example Code and Data Size: These are the sizes for the OS-independent +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. + + Previous Release: + Non-Debug Version: 93.7K Code, 25.3K Data, 119.0K Total + Debug Version: 175.0K Code, 74.4K Data, 249.4K Total + Current Release: + Non-Debug Version: 93.9K Code, 25.2K Data, 119.1K Total + Debug Version: 175.5K Code, 74.5K Data, 250.0K Total + + +2) iASL Compiler/Disassembler and Tools: + +AcpiExec: Improved the algorithm used for memory leak/corruption +detection. Added some intelligence to the code that maintains the global +list of allocated memory. The list is now ordered by allocated memory +address, significantly improving performance. When running AcpiExec on +the ASLTS test suite, speed improvements of 3X to 5X are seen, depending +on the platform and/or the environment. Note, this performance +enhancement affects the AcpiExec utility only, not the kernel-resident +ACPICA code. + +Enhanced error reporting for invalid AML opcodes and bad ACPI_NAMEs. For +the disassembler, dump the 48 bytes surrounding the invalid opcode. Fix +incorrect table offset reported for invalid opcodes. Report the original +32-bit value for bad ACPI_NAMEs (as well as the repaired name.) + +Disassembler: Enhanced the -vt option to emit the binary table data in +hex format to assist with debugging. + +Fixed a potential filename buffer overflow in osunixdir.c. Increased the +size of file structure. Colin Ian King. + +---------------------------------------- 13 September 2012. Summary of changes for version 20120913: -This release is available at https://www.acpica.org/downloads The ACPI 5.0 -specification is available at www.acpi.info 1) ACPICA Kernel-resident Subsystem: ACPI 5.0: Added two new notify types for the Hardware Error Notification -Structure within the Hardware Error Source Table (HEST) table -- CMCI(5) and +Structure within the Hardware Error Source Table (HEST) table -- CMCI(5) +and MCE(6). Table Manager: Merged/removed duplicate code in the root table resize -functions. One function is external, the other is internal. Lv Zheng, ACPICA +functions. One function is external, the other is internal. Lv Zheng, +ACPICA BZ 846. Makefiles: Completely removed the obsolete "Linux" makefiles under -acpica/generate/linux. These makefiles are obsolete and have been replaced by +acpica/generate/linux. These makefiles are obsolete and have been replaced +by the generic unix makefiles under acpica/generate/unix. -Makefiles: Ensure that binary files always copied properly. Minor rule change +Makefiles: Ensure that binary files always copied properly. Minor rule +change to ensure that the final binary output files are always copied up to the appropriate binary directory (bin32 or bin64.) Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release: @@ -42,27 +127,37 @@ descriptors when a second parse is required because of the invocation of external control methods within the table. With assistance from adq@lidskialf.net. ACPICA BZ 976. -iASL: Fixed a namepath optimization problem. An error can occur if the parse -node that contains the namepath to be optimized does not have a parent node +iASL: Fixed a namepath optimization problem. An error can occur if the +parse +node that contains the namepath to be optimized does not have a parent +node that is a named object. This change fixes the problem. -iASL: Fixed a regression where the AML file is not deleted on errors. The AML -output file should be deleted if there are any errors during the compiler. The +iASL: Fixed a regression where the AML file is not deleted on errors. The +AML +output file should be deleted if there are any errors during the compiler. +The only exception is if the -f (force output) option is used. ACPICA BZ 974. -iASL: Added a feature to automatically increase internal line buffer sizes. +iASL: Added a feature to automatically increase internal line buffer +sizes. Via realloc(), automatically increase the internal line buffer sizes as -necessary to support very long source code lines. The current version of the -preprocessor requires a buffer long enough to contain full source code lines. +necessary to support very long source code lines. The current version of +the +preprocessor requires a buffer long enough to contain full source code +lines. This change increases the line buffer(s) if the input lines go beyond the -current buffer size. This eliminates errors that occurred when a source code +current buffer size. This eliminates errors that occurred when a source +code line was longer than the buffer. iASL: Fixed a problem with constant folding in method declarations. The -SyncLevel term is a ByteConstExpr, and incorrect code would be generated if a +SyncLevel term is a ByteConstExpr, and incorrect code would be generated +if a Type3 opcode was used. -Debugger: Improved command help support. For incorrect argument count, display +Debugger: Improved command help support. For incorrect argument count, +display full help for the command. For help command itself, allow an argument to specify a command. @@ -72,20 +167,24 @@ errors during execution of the suite. Guan Chao. ---------------------------------------- 16 August 2012. Summary of changes for version 20120816: -This release is available at https://www.acpica.org/downloads -The ACPI 5.0 specification is available at www.acpi.info 1) ACPICA Kernel-resident Subsystem: -Removed all use of the deprecated _GTS and _BFS predefined methods. The _GTS +Removed all use of the deprecated _GTS and _BFS predefined methods. The +_GTS (Going To Sleep) and _BFS (Back From Sleep) methods are essentially -deprecated and will probably be removed from the ACPI specification. Windows -does not invoke them, and reportedly never will. The final nail in the coffin +deprecated and will probably be removed from the ACPI specification. +Windows +does not invoke them, and reportedly never will. The final nail in the +coffin is that the ACPI specification states that these methods must be run with -interrupts off, which is not going to happen in a kernel interpreter. Note: +interrupts off, which is not going to happen in a kernel interpreter. +Note: Linux has removed all use of the methods also. It was discovered that -invoking these functions caused failures on some machines, probably because -they were never tested since Windows does not call them. Affects two external +invoking these functions caused failures on some machines, probably +because +they were never tested since Windows does not call them. Affects two +external interfaces, AcpiEnterSleepState and AcpiLeaveSleepStatePrep. Tang Feng. ACPICA BZ 969. @@ -93,20 +192,26 @@ Implemented support for complex bit-packed buffers returned from the _PLD (Physical Location of Device) predefined method. Adds a new external interface, AcpiDecodePldBuffer that parses the buffer into a more usable C structure. Note: C Bitfields cannot be used for this type of predefined -structure since the memory layout of individual bitfields is not defined by -the C language. In addition, there are endian concerns where a compiler will +structure since the memory layout of individual bitfields is not defined +by +the C language. In addition, there are endian concerns where a compiler +will change the bitfield ordering based on the machine type. The new ACPICA interface eliminates these issues, and should be called after _PLD is executed. ACPICA BZ 954. -Implemented a change to allow a scope change to root (via "Scope (\)") during +Implemented a change to allow a scope change to root (via "Scope (\)") +during execution of module-level ASL code (code that is executed at table load time.) Lin Ming. -Added the Windows8/Server2012 string for the _OSI method. This change adds a -new _OSI string, "Windows 2012" for both Windows 8 and Windows Server 2012. +Added the Windows8/Server2012 string for the _OSI method. This change adds +a +new _OSI string, "Windows 2012" for both Windows 8 and Windows Server +2012. -Added header support for the new ACPI tables DBG2 (Debug Port Table Type 2) +Added header support for the new ACPI tables DBG2 (Debug Port Table Type +2) and CSRT (Core System Resource Table). Added struct header support for the _FDE, _GRT, _GTM, and _SRT predefined @@ -118,7 +223,8 @@ internal GPE functions. Tang Feng. Removed the linux makefiles from the unix packages. The generate/linux makefiles are obsolete and have been removed from the unix tarball release -packages. The replacement makefiles are under generate/unix, and there is a +packages. The replacement makefiles are under generate/unix, and there is +a top-level makefile under the main acpica directory. ACPICA BZ 967, 912. Updates for Unix makefiles: @@ -131,7 +237,8 @@ utxface.c to improve modularity and reduce file size. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -147,7 +254,8 @@ much larger code and data size. iASL: Fixed a problem with constant folding for fixed-length constant expressions. The constant-folding code was not being invoked for constant expressions that allow the use of type 3/4/5 opcodes to generate constants -for expressions such as ByteConstExpr, WordConstExpr, etc. This could result +for expressions such as ByteConstExpr, WordConstExpr, etc. This could +result in the generation of invalid AML bytecode. ACPICA BZ 970. iASL: Fixed a generation issue on newer versions of Bison. Newer versions @@ -156,7 +264,8 @@ handles these versions in order to eliminate generation warnings. Disassembler: Added support to decode the DBG2 and CSRT ACPI tables. -Disassembler: Add support to decode _PLD buffers. The decoded buffer appears +Disassembler: Add support to decode _PLD buffers. The decoded buffer +appears within comments in the output file. Debugger: Fixed a regression with the "Threads" command where @@ -165,56 +274,71 @@ AE_BAD_PARAMETER was always returned. ---------------------------------------- 11 July 2012. Summary of changes for version 20120711: -This release is available at https://www.acpica.org/downloads The ACPI 5.0 -specification is available at www.acpi.info - 1) ACPICA Kernel-resident Subsystem: Fixed a possible fault in the return package object repair code. Fixes a problem that can occur when a lone package object is wrapped with an outer -package object in order to force conformance to the ACPI specification. Can -affect these predefined names: _ALR, _MLS, _PSS, _TRT, _TSS, _PRT, _HPX, _DLM, +package object in order to force conformance to the ACPI specification. +Can +affect these predefined names: _ALR, _MLS, _PSS, _TRT, _TSS, _PRT, _HPX, +_DLM, _CSD, _PSD, _TSD. Removed code to disable/enable bus master arbitration (ARB_DIS bit in the PM2_CNT register) in the ACPICA sleep/wake interfaces. Management of the -ARB_DIS bit must be implemented in the host-dependent C3 processor power state -support. Note, ARB_DIS is obsolete and only applies to older chipsets, both +ARB_DIS bit must be implemented in the host-dependent C3 processor power +state +support. Note, ARB_DIS is obsolete and only applies to older chipsets, +both Intel and other vendors. (for Intel: ICH4-M and earlier) -This change removes the code to disable/enable bus master arbitration during -suspend/resume. Use of the ARB_DIS bit in the optional PM2_CNT register causes -resume problems on some machines. The change has been in use for over seven +This change removes the code to disable/enable bus master arbitration +during +suspend/resume. Use of the ARB_DIS bit in the optional PM2_CNT register +causes +resume problems on some machines. The change has been in use for over +seven years within Linux. -Implemented two new external interfaces to support host-directed dynamic ACPI -table load and unload. They are intended to simplify the host implementation +Implemented two new external interfaces to support host-directed dynamic +ACPI +table load and unload. They are intended to simplify the host +implementation of hot-plug support: AcpiLoadTable: Load an SSDT from a buffer into the namespace. - AcpiUnloadParentTable: Unload an SSDT via a named object owned by the table. + AcpiUnloadParentTable: Unload an SSDT via a named object owned by the +table. See the ACPICA reference for additional details. Adds one new file, components/tables/tbxfload.c -Implemented and deployed two new interfaces for errors and warnings that are +Implemented and deployed two new interfaces for errors and warnings that +are known to be caused by BIOS/firmware issues: AcpiBiosError: Prints "ACPI Firmware Error" message. AcpiBiosWarning: Prints "ACPI Firmware Warning" message. -Deployed these new interfaces in the ACPICA Table Manager code for ACPI table -and FADT errors. Additional deployment to be completed as appropriate in the +Deployed these new interfaces in the ACPICA Table Manager code for ACPI +table +and FADT errors. Additional deployment to be completed as appropriate in +the future. The associated conditional macros are ACPI_BIOS_ERROR and -ACPI_BIOS_WARNING. See the ACPICA reference for additional details. ACPICA BZ +ACPI_BIOS_WARNING. See the ACPICA reference for additional details. ACPICA +BZ 843. Implicit notify support: ensure that no memory allocation occurs within a -critical region. This fix moves a memory allocation outside of the time that a +critical region. This fix moves a memory allocation outside of the time +that a spinlock is held. Fixes issues on systems that do not allow this behavior. Jung-uk Kim. -Split exception code utilities and tables into a new file, utilities/utexcep.c +Split exception code utilities and tables into a new file, +utilities/utexcep.c Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release: @@ -227,41 +351,50 @@ larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Fixed a parser problem for hosts where EOF is defined as -1 instead of +iASL: Fixed a parser problem for hosts where EOF is defined as -1 instead +of 0. Jung-uk Kim. -Debugger: Enhanced the "tables" command to emit additional information about +Debugger: Enhanced the "tables" command to emit additional information +about the current set of ACPI tables, including the owner ID and flags decode. Debugger: Reimplemented the "unload" command to use the new -AcpiUnloadParentTable external interface. This command was disable previously +AcpiUnloadParentTable external interface. This command was disable +previously due to need for an unload interface. -AcpiHelp: Added a new option to decode ACPICA exception codes. The -e option +AcpiHelp: Added a new option to decode ACPICA exception codes. The -e +option will decode 16-bit hex status codes (ACPI_STATUS) to name strings. ---------------------------------------- 20 June 2012. Summary of changes for version 20120620: -This release is available at https://www.acpica.org/downloads -The ACPI 5.0 specification is available at www.acpi.info 1) ACPICA Kernel-resident Subsystem: -Implemented support to expand the "implicit notify" feature to allow multiple -devices to be notified by a single GPE. This feature automatically generates a +Implemented support to expand the "implicit notify" feature to allow +multiple +devices to be notified by a single GPE. This feature automatically +generates a runtime device notification in the absence of a BIOS-provided GPE control -method (_Lxx/_Exx) or a host-installed handler for the GPE. Implicit notify is -provided by ACPICA for Windows compatibility, and is a workaround for BIOS AML -code errors. See the description of the AcpiSetupGpeForWake interface in the +method (_Lxx/_Exx) or a host-installed handler for the GPE. Implicit +notify is +provided by ACPICA for Windows compatibility, and is a workaround for BIOS +AML +code errors. See the description of the AcpiSetupGpeForWake interface in +the APCICA reference. Bob Moore, Rafael Wysocki. ACPICA BZ 918. Changed some comments and internal function names to simplify and ensure correctness of the Linux code translation. No functional changes. Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release: @@ -274,16 +407,21 @@ larger code and data size. 2) iASL Compiler/Disassembler and Tools: -Disassembler: Added support to emit short, commented descriptions for the ACPI +Disassembler: Added support to emit short, commented descriptions for the +ACPI predefined names in order to improve the readability of the disassembled output. ACPICA BZ 959. Changes include: - 1) Emit descriptions for all standard predefined names (_INI, _STA, _PRW, + 1) Emit descriptions for all standard predefined names (_INI, _STA, +_PRW, etc.) 2) Emit generic descriptions for the special names (_Exx, _Qxx, etc.) - 3) Emit descriptions for the resource descriptor names (_MIN, _LEN, etc.) + 3) Emit descriptions for the resource descriptor names (_MIN, _LEN, +etc.) -AcpiSrc: Fixed several long-standing Linux code translation issues. Argument -descriptions in function headers are now translated properly to lower case and +AcpiSrc: Fixed several long-standing Linux code translation issues. +Argument +descriptions in function headers are now translated properly to lower case +and underscores. ACPICA BZ 961. Also fixes translation problems such as these: (old -> new) i_aSL -> iASL @@ -292,16 +430,20 @@ underscores. ACPICA BZ 961. Also fixes translation problems such as these: local_fADT -> local_FADT execute_oSI -> execute_OSI -iASL: Fixed a problem where null bytes were inadvertently emitted into some +iASL: Fixed a problem where null bytes were inadvertently emitted into +some listing files. -iASL: Added the existing debug options to the standard help screen. There are +iASL: Added the existing debug options to the standard help screen. There +are no longer two different help screens. ACPICA BZ 957. -AcpiHelp: Fixed some typos in the various predefined name descriptions. Also +AcpiHelp: Fixed some typos in the various predefined name descriptions. +Also expand some of the descriptions where appropriate. -iASL: Fixed the -ot option (display compile times/statistics). Was not working +iASL: Fixed the -ot option (display compile times/statistics). Was not +working properly for standard output; only worked for the debug file case. ---------------------------------------- @@ -310,21 +452,29 @@ properly for standard output; only worked for the debug file case. 1) ACPICA Core Subsystem: -Added a new OSL interface, AcpiOsWaitEventsComplete. This interface is defined -to block until asynchronous events such as notifies and GPEs have completed. +Added a new OSL interface, AcpiOsWaitEventsComplete. This interface is +defined +to block until asynchronous events such as notifies and GPEs have +completed. Within ACPICA, it is only called before a notify or GPE handler is removed/uninstalled. It also may be useful for the host OS within related -drivers such as the Embedded Controller driver. See the ACPICA reference for +drivers such as the Embedded Controller driver. See the ACPICA reference +for additional information. ACPICA BZ 868. -ACPI Tables: Added a new error message for a possible overflow failure during -the conversion of FADT 32-bit legacy register addresses to internal common 64- -bit GAS structure representation. The GAS has a one-byte "bit length" field, +ACPI Tables: Added a new error message for a possible overflow failure +during +the conversion of FADT 32-bit legacy register addresses to internal common +64- +bit GAS structure representation. The GAS has a one-byte "bit length" +field, thus limiting the register length to 255 bits. ACPICA BZ 953. Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release: @@ -337,34 +487,44 @@ larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Added the ACPI 5.0 "PCC" keyword for use in the Register() ASL macro. +iASL: Added the ACPI 5.0 "PCC" keyword for use in the Register() ASL +macro. This keyword was added late in the ACPI 5.0 release cycle and was not implemented until now. Disassembler: Added support for Operation Region externals. Adds missing support for operation regions that are defined in another table, and -referenced locally via a Field or BankField ASL operator. Now generates the +referenced locally via a Field or BankField ASL operator. Now generates +the correct External statement. -Disassembler: Several additional fixes for the External() statement generation +Disassembler: Several additional fixes for the External() statement +generation related to some ASL operators. Also, order the External() statements -alphabetically in the disassembler output. Fixes the External() generation for +alphabetically in the disassembler output. Fixes the External() generation +for the Create* field, Alias, and Scope operators: - 1) Create* buffer field operators - fix type mismatch warning on disassembly + 1) Create* buffer field operators - fix type mismatch warning on +disassembly 2) Alias - implement missing External support 3) Scope - fix to make sure all necessary externals are emitted. -iASL: Improved pathname support. For include files, merge the prefix pathname +iASL: Improved pathname support. For include files, merge the prefix +pathname with the file pathname and eliminate unnecessary components. Convert -backslashes in all pathnames to forward slashes, for readability. Include file +backslashes in all pathnames to forward slashes, for readability. Include +file pathname changes affect both #include and Include() type operators. -iASL/DTC/Preprocessor: Gracefully handle early EOF. Handle an EOF at the end -of a valid line by inserting a newline and then returning the EOF during the +iASL/DTC/Preprocessor: Gracefully handle early EOF. Handle an EOF at the +end +of a valid line by inserting a newline and then returning the EOF during +the next call to GetNextLine. Prevents the line from being ignored due to EOF condition. -iASL: Implemented some changes to enhance the IDE support (-vi option.) Error +iASL: Implemented some changes to enhance the IDE support (-vi option.) +Error and Warning messages are now correctly recognized for both the source code browser and the global error and warning counts. @@ -374,13 +534,17 @@ browser and the global error and warning counts. 1) ACPICA Core Subsystem: -Implemented support for multiple notify handlers. This change adds support to -allow multiple system and device notify handlers on Device, Thermal Zone, and -Processor objects. This can simplify the host OS notification implementation. +Implemented support for multiple notify handlers. This change adds support +to +allow multiple system and device notify handlers on Device, Thermal Zone, +and +Processor objects. This can simplify the host OS notification +implementation. Also re-worked and restructured the entire notify support code to simplify handler installation, handler removal, notify event queuing, and notify dispatch to handler(s). Note: there can still only be two global notify -handlers - one for system notifies and one for device notifies. There are no +handlers - one for system notifies and one for device notifies. There are +no changes to the existing handler install/remove interfaces. Lin Ming, Bob Moore, Rafael Wysocki. @@ -388,12 +552,14 @@ Fixed a regression in the package repair code where the object reference count was calculated incorrectly. Regression was introduced in the commit "Support to add Package wrappers". -Fixed a couple possible memory leaks in the AML parser, in the error recovery +Fixed a couple possible memory leaks in the AML parser, in the error +recovery path. Jesper Juhl, Lin Ming. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -406,17 +572,22 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Fixed a problem with the resource descriptor support where the length +iASL: Fixed a problem with the resource descriptor support where the +length of the StartDependentFn and StartDependentFnNoPrio descriptors were not -included in cumulative descriptor offset, resulting in incorrect values for -resource tags within resource descriptors appearing after a StartDependent* +included in cumulative descriptor offset, resulting in incorrect values +for +resource tags within resource descriptors appearing after a +StartDependent* descriptor. Reported by Petr Vandrovec. ACPICA BZ 949. iASL and Preprocessor: Implemented full support for the #line directive to -correctly track original source file line numbers through the .i preprocessor +correctly track original source file line numbers through the .i +preprocessor output file - for error and warning messages. -iASL: Expand the allowable byte constants for address space IDs. Previously, +iASL: Expand the allowable byte constants for address space IDs. +Previously, the allowable range was 0x80-0xFF (user-defined spaces), now the range is 0x0A-0xFF to allow for custom and new IDs without changing the compiler. @@ -427,7 +598,8 @@ iASL: Add option to completely disable the preprocessor (-Pn). iASL: Now emit all error/warning messages to standard error (stderr) by default (instead of the previous stdout). -ASL Test Suite (ASLTS): Reduce iASL warnings due to use of Switch(). Update +ASL Test Suite (ASLTS): Reduce iASL warnings due to use of Switch(). +Update for resource descriptor offset fix above. Update/cleanup error output routines. Enable and send iASL errors/warnings to an error logfile (error.txt). Send all other iASL output to a logfile (compiler.txt). Fixed @@ -443,42 +615,60 @@ Enhanced the sleep/wake interfaces to optionally execute the _GTS method (Going To Sleep) and the _BFS method (Back From Sleep). Windows apparently does not execute these methods, and therefore these methods are often untested. It has been seen on some systems where the execution of these -methods causes errors and also prevents the machine from entering S5. It is -therefore suggested that host operating systems do not execute these methods -by default. In the future, perhaps these methods can be optionally executed -based on the age of the system and/or what is the newest version of Windows -that the BIOS asks for via _OSI. Changed interfaces: AcpiEnterSleepState and +methods causes errors and also prevents the machine from entering S5. It +is +therefore suggested that host operating systems do not execute these +methods +by default. In the future, perhaps these methods can be optionally +executed +based on the age of the system and/or what is the newest version of +Windows +that the BIOS asks for via _OSI. Changed interfaces: AcpiEnterSleepState +and AcpileaveSleepStatePrep. See the ACPICA reference and Linux BZ 13041. Lin Ming. -Fixed a problem where the length of the local/common FADT was set too early. +Fixed a problem where the length of the local/common FADT was set too +early. The local FADT table length cannot be set to the common length until the -original length has been examined. There is code that checks the table length +original length has been examined. There is code that checks the table +length and sets various fields appropriately. This can affect older machines with early FADT versions. For example, this can cause inadvertent writes to the CST_CNT register. Julian Anastasov. -Fixed a mapping issue related to a physical table override. Use the deferred -mapping mechanism for tables loaded via the physical override OSL interface. -This allows for early mapping before the virtual memory manager is available. +Fixed a mapping issue related to a physical table override. Use the +deferred +mapping mechanism for tables loaded via the physical override OSL +interface. +This allows for early mapping before the virtual memory manager is +available. Thomas Renninger, Bob Moore. -Enhanced the automatic return-object repair code: Repair a common problem with +Enhanced the automatic return-object repair code: Repair a common problem +with predefined methods that are defined to return a variable-length Package of -sub-objects. If there is only one sub-object, some BIOS ASL code mistakenly +sub-objects. If there is only one sub-object, some BIOS ASL code +mistakenly simply returns the single object instead of a Package with one sub-object. -This new support will repair this error by wrapping a Package object around -the original object, creating the correct and expected Package with one sub- -object. Names that can be repaired in this manner include: _ALR, _CSD, _HPX, -_MLS, _PLD, _PRT, _PSS, _TRT, _TSS, _BCL, _DOD, _FIX, and _Sx. ACPICA BZ 939. +This new support will repair this error by wrapping a Package object +around +the original object, creating the correct and expected Package with one +sub- +object. Names that can be repaired in this manner include: _ALR, _CSD, +_HPX, +_MLS, _PLD, _PRT, _PSS, _TRT, _TSS, _BCL, _DOD, _FIX, and _Sx. ACPICA BZ +939. Changed the exception code returned for invalid ACPI paths passed as parameters to external interfaces such as AcpiEvaluateObject. Was AE_BAD_PARAMETER, now is the more sensible AE_BAD_PATHNAME. Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release: @@ -491,11 +681,15 @@ larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Added the infrastructure and initial implementation of a integrated C- -like preprocessor. This will simplify BIOS development process by eliminating -the need for a separate preprocessing step during builds. On Windows, it also +iASL: Added the infrastructure and initial implementation of a integrated +C- +like preprocessor. This will simplify BIOS development process by +eliminating +the need for a separate preprocessing step during builds. On Windows, it +also eliminates the need to install a separate C compiler. ACPICA BZ 761. Some -features including full #define() macro support are still under development. +features including full #define() macro support are still under +development. These preprocessor directives are supported: #define #elif @@ -514,11 +708,14 @@ In addition, these new command line options are supported: -li Create preprocessed output file (*.i) -P Preprocess only and create preprocessor output file (*.i) -Table Compiler: Fixed a problem where the equals operator within an expression +Table Compiler: Fixed a problem where the equals operator within an +expression did not work properly. -Updated iASL to use the current versions of Bison/Flex. Updated the Windows -project file to invoke these tools from the standard location. ACPICA BZ 904. +Updated iASL to use the current versions of Bison/Flex. Updated the +Windows +project file to invoke these tools from the standard location. ACPICA BZ +904. Versions supported: Flex for Windows: V2.5.4 Bison for Windows: V2.4.1 @@ -534,25 +731,33 @@ described below (a - e). a) The AcpiLeaveSleepState has been split into two interfaces, similar to AcpiEnterSleepStatePrep and AcpiEnterSleepState. The new interface is -AcpiLeaveSleepStatePrep. This allows the host to perform actions between the -time the _BFS method is called and the _WAK method is called. NOTE: all hosts -must update their wake/resume code or else sleep/wake will not work properly. +AcpiLeaveSleepStatePrep. This allows the host to perform actions between +the +time the _BFS method is called and the _WAK method is called. NOTE: all +hosts +must update their wake/resume code or else sleep/wake will not work +properly. Rafael Wysocki. -b) In AcpiLeaveSleepState, now enable all runtime GPEs before calling the _WAK -method. Some machines require that the GPEs are enabled before the _WAK method +b) In AcpiLeaveSleepState, now enable all runtime GPEs before calling the +_WAK +method. Some machines require that the GPEs are enabled before the _WAK +method is executed. Thomas Renninger. c) In AcpiLeaveSleepState, now always clear the WAK_STS (wake status) bit. -Some BIOS code assumes that WAK_STS will be cleared on resume and use it to +Some BIOS code assumes that WAK_STS will be cleared on resume and use it +to determine whether the system is rebooting or resuming. Matthew Garrett. -d) Move the invocations of _GTS (Going To Sleep) and _BFS (Back From Sleep) to +d) Move the invocations of _GTS (Going To Sleep) and _BFS (Back From +Sleep) to match the ACPI specification requirement. Rafael Wysocki. e) Implemented full support for the ACPI 5.0 SleepStatus and SleepControl registers within the V5 FADT. This support adds two new files: -hardware/hwesleep.c implements the support for the new registers. Moved all +hardware/hwesleep.c implements the support for the new registers. Moved +all sleep/wake external interfaces to hardware/hwxfsleep.c. @@ -560,17 +765,22 @@ Added a new OSL interface for ACPI table overrides, AcpiOsPhysicalTableOverride. This interface allows the host to override a table via a physical address, instead of the logical address required by AcpiOsTableOverride. This simplifies the host implementation. Initial -implementation by Thomas Renninger. The ACPICA implementation creates a single +implementation by Thomas Renninger. The ACPICA implementation creates a +single shared function for table overrides that attempts both a logical and a physical override. Expanded the OSL memory read/write interfaces to 64-bit data (AcpiOsReadMemory, AcpiOsWriteMemory.) This enables full 64-bit memory -transfer support for GAS register structures passed to AcpiRead and AcpiWrite. - -Implemented the ACPI_REDUCED_HARDWARE option to allow the creation of a custom -build of ACPICA that supports only the ACPI 5.0 reduced hardware (SoC) model. -See the ACPICA reference for details. ACPICA BZ 942. This option removes about +transfer support for GAS register structures passed to AcpiRead and +AcpiWrite. + +Implemented the ACPI_REDUCED_HARDWARE option to allow the creation of a +custom +build of ACPICA that supports only the ACPI 5.0 reduced hardware (SoC) +model. +See the ACPICA reference for details. ACPICA BZ 942. This option removes +about 10% of the code and 5% of the static data, and the following hardware ACPI features become unavailable: PM Event and Control registers @@ -581,19 +791,24 @@ features become unavailable: ACPI PM timer FACS table (Waking vectors and Global Lock) -Updated the unix tarball directory structure to match the ACPICA git source +Updated the unix tarball directory structure to match the ACPICA git +source tree. This ensures that the generic unix makefiles work properly (in generate/unix). Also updated the Linux makefiles to match. ACPICA BZ 867. -Updated the return value of the _REV predefined method to integer value 5 to +Updated the return value of the _REV predefined method to integer value 5 +to reflect ACPI 5.0 support. -Moved the external ACPI PM timer interface prototypes to the public acpixf.h +Moved the external ACPI PM timer interface prototypes to the public +acpixf.h file where they belong. Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release: @@ -619,26 +834,36 @@ specification. 1) ACPICA Core Subsystem: -Implemented a new mechanism to allow host device drivers to check for address -range conflicts with ACPI Operation Regions. Both SystemMemory and SystemIO -address spaces are supported. A new external interface, AcpiCheckAddressRange, -allows drivers to check an address range against the ACPI namespace. See the +Implemented a new mechanism to allow host device drivers to check for +address +range conflicts with ACPI Operation Regions. Both SystemMemory and +SystemIO +address spaces are supported. A new external interface, +AcpiCheckAddressRange, +allows drivers to check an address range against the ACPI namespace. See +the ACPICA reference for additional details. Adds one new file, utilities/utaddress.c. Lin Ming, Bob Moore. -Fixed several issues with the ACPI 5.0 FADT support: Add the sleep Control and +Fixed several issues with the ACPI 5.0 FADT support: Add the sleep Control +and Status registers, update the ACPI 5.0 flags, and update internal data -structures to handle an FADT larger than 256 bytes. The size of the ACPI 5.0 +structures to handle an FADT larger than 256 bytes. The size of the ACPI +5.0 FADT is 268 bytes. -Updated all ACPICA copyrights and signons to 2012. Added the 2012 copyright to +Updated all ACPICA copyrights and signons to 2012. Added the 2012 +copyright to all module headers and signons, including the standard Linux header. This -affects virtually every file in the ACPICA core subsystem, iASL compiler, and +affects virtually every file in the ACPICA core subsystem, iASL compiler, +and all ACPICA utilities. Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release: @@ -653,13 +878,18 @@ larger code and data size. Disassembler: fixed a problem with the automatic resource tag generation support. Fixes a problem where the resource tags are inadvertently not -constructed if the table being disassembled contains external references to -control methods. Moved the actual construction of the tags to after the final -namespace is constructed (after 2nd parse is invoked due to external control +constructed if the table being disassembled contains external references +to +control methods. Moved the actual construction of the tags to after the +final +namespace is constructed (after 2nd parse is invoked due to external +control method references.) ACPICA BZ 941. -Table Compiler: Make all "generic" operators caseless. These are the operators -like UINT8, String, etc. Making these caseless improves ease-of-use. ACPICA BZ +Table Compiler: Make all "generic" operators caseless. These are the +operators +like UINT8, String, etc. Making these caseless improves ease-of-use. +ACPICA BZ 934. ---------------------------------------- @@ -674,8 +904,10 @@ Reduced Hardware Support: ------------------------- This support allows for ACPI systems without the usual ACPI hardware. This -support is enabled by a flag in the revision 5 FADT. If it is set, ACPICA will -not attempt to initialize or use any of the usual ACPI hardware. Note, when +support is enabled by a flag in the revision 5 FADT. If it is set, ACPICA +will +not attempt to initialize or use any of the usual ACPI hardware. Note, +when this flag is set, all of the following ACPI hardware is assumed to be not present and is not initialized or accessed: @@ -707,7 +939,8 @@ Operation Regions/SpaceIDs: --------------------------- All new operation regions are fully supported by the iASL compiler, the -disassembler, and the ACPICA runtime code (for dispatch to region handlers.) +disassembler, and the ACPICA runtime code (for dispatch to region +handlers.) The new operation region Space IDs are: GeneralPurposeIo @@ -716,8 +949,10 @@ The new operation region Space IDs are: Resource Descriptors: --------------------- -All new ASL resource descriptors are fully supported by the iASL compiler, the -ASL/AML disassembler, and the ACPICA runtime Resource Manager code (including +All new ASL resource descriptors are fully supported by the iASL compiler, +the +ASL/AML disassembler, and the ACPICA runtime Resource Manager code +(including all new predefined resource tags). New descriptors are: FixedDma @@ -730,9 +965,11 @@ all new predefined resource tags). New descriptors are: ASL/AML Operators, New and Modified: ------------------------------------ -One new operator is added, the Connection operator, which is used to associate +One new operator is added, the Connection operator, which is used to +associate a GeneralPurposeIo or GenericSerialBus resource descriptor with individual -field objects within an operation region. Several new protocols are associated +field objects within an operation region. Several new protocols are +associated with the AccessAs operator. All are fully supported by the iASL compiler, disassembler, and runtime ACPICA AML interpreter: @@ -740,13 +977,16 @@ disassembler, and runtime ACPICA AML interpreter: AccessAs: AttribBytes (n) // Read/Write N-Bytes Protocol AccessAs: AttribRawBytes (n) // Raw Read/Write N-Bytes Protocol AccessAs: AttribRawProcessBytes (n) // Raw Process Call Protocol - RawDataBuffer // Data type for Vendor Data fields + RawDataBuffer // Data type for Vendor Data +fields Predefined ASL/AML Objects: --------------------------- -All new predefined objects/control-methods are supported by the iASL compiler -and the ACPICA runtime validation/repair (arguments and return values.) New +All new predefined objects/control-methods are supported by the iASL +compiler +and the ACPICA runtime validation/repair (arguments and return values.) +New predefined names include the following: Standard Predefined Names (Objects or Control Methods): @@ -767,25 +1007,33 @@ ACPICA External Interfaces: Several new interfaces have been defined for use by ACPI-related device drivers and other host OS services: -AcpiAcquireMutex and AcpiReleaseMutex: These interfaces allow the host OS to +AcpiAcquireMutex and AcpiReleaseMutex: These interfaces allow the host OS +to acquire and release AML mutexes that are defined in the DSDT/SSDT tables provided by the BIOS. They are intended to be used in conjunction with the ACPI 5.0 _DLM (Device Lock Method) in order to provide transaction-level mutual exclusion with the AML code/interpreter. -AcpiGetEventResources: Returns the (formatted) resource descriptors as defined -by the ACPI 5.0 _AEI object (ACPI Event Information). This object provides -resource descriptors associated with hardware-reduced platform events, similar +AcpiGetEventResources: Returns the (formatted) resource descriptors as +defined +by the ACPI 5.0 _AEI object (ACPI Event Information). This object +provides +resource descriptors associated with hardware-reduced platform events, +similar to the AcpiGetCurrentResources interface. Operation Region Handlers: For General Purpose IO and Generic Serial Bus -operation regions, information about the Connection() object and any optional +operation regions, information about the Connection() object and any +optional length information is passed to the region handler within the Context parameter. -AcpiBufferToResource: This interface converts a raw AML buffer containing a -resource template or resource descriptor to the ACPI_RESOURCE internal format -suitable for use by device drivers. Can be used by an operation region handler +AcpiBufferToResource: This interface converts a raw AML buffer containing +a +resource template or resource descriptor to the ACPI_RESOURCE internal +format +suitable for use by device drivers. Can be used by an operation region +handler to convert the Connection() buffer object into a ACPI_RESOURCE. Miscellaneous/Tools/TestSuites: @@ -799,7 +1047,8 @@ Fully updated documentation (ACPICA and iASL reference documents.) ACPI Table Definition Language: ------------------------------- -Support for this language was implemented and released as a subsystem of the +Support for this language was implemented and released as a subsystem of +the iASL compiler in 2010. (See the iASL compiler User Guide.) @@ -808,11 +1057,14 @@ Non-ACPI 5.0 changes for this release: 1) ACPICA Core Subsystem: -Fix a problem with operation region declarations where a failure can occur if +Fix a problem with operation region declarations where a failure can occur +if the region name and an argument that evaluates to an object (such as the -region address) are in different namespace scopes. Lin Ming, ACPICA BZ 937. +region address) are in different namespace scopes. Lin Ming, ACPICA BZ +937. -Do not abort an ACPI table load if an invalid space ID is found within. This +Do not abort an ACPI table load if an invalid space ID is found within. +This will be caught later if the offending method is executed. ACPICA BZ 925. Fixed an issue with the FFixedHW space ID where the ID was not always @@ -821,15 +1073,18 @@ recognized properly (Both ACPICA and iASL). ACPICA BZ 926. Fixed a problem with the 32-bit generation of the unix-specific OSL (osunixxf.c). Lin Ming, ACPICA BZ 936. -Several changes made to enable generation with the GCC 4.6 compiler. ACPICA BZ +Several changes made to enable generation with the GCC 4.6 compiler. +ACPICA BZ 935. -New error messages: Unsupported I/O requests (not 8/16/32 bit), and Index/Bank +New error messages: Unsupported I/O requests (not 8/16/32 bit), and +Index/Bank field registers out-of-range. 2) iASL Compiler/Disassembler and Tools: -iASL: Implemented the __PATH__ operator, which returns the full pathname of +iASL: Implemented the __PATH__ operator, which returns the full pathname +of the current source file. AcpiHelp: Automatically display expanded keyword information for all ASL @@ -841,24 +1096,29 @@ buffers. Added a new master script to generate and execute the ASLTS test suite. Automatically handles 32- and 64-bit generation. See tests/aslts.sh -iASL: Fix problem with listing generation during processing of the Switch() +iASL: Fix problem with listing generation during processing of the +Switch() operator where AML listing was disabled until the entire Switch block was completed. iASL: Improve support for semicolon statement terminators. Fix "invalid -character" message for some cases when the semicolon is used. Semicolons are +character" message for some cases when the semicolon is used. Semicolons +are now allowed after every <Term> grammar element. ACPICA BZ 927. -iASL: Fixed some possible aliasing warnings during generation. ACPICA BZ 923. +iASL: Fixed some possible aliasing warnings during generation. ACPICA BZ +923. Disassembler: Fix problem with disassembly of the DataTableRegion operator -where an inadvertent "Unhandled deferred opcode" message could be generated. +where an inadvertent "Unhandled deferred opcode" message could be +generated. 3) Example Code and Data Size These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug version of the code -includes the debug output trace mechanism and has a much larger code and data +includes the debug output trace mechanism and has a much larger code and +data size. Previous Release: @@ -873,7 +1133,8 @@ size. 0) ACPI 5.0 News: -Support for ACPI 5.0 in ACPICA has been underway for several months and will +Support for ACPI 5.0 in ACPICA has been underway for several months and +will be released at the same time that ACPI 5.0 is officially released. The ACPI 5.0 specification is on track for release in the next few months. @@ -885,41 +1146,54 @@ intended to be limited to two seconds, but was inadvertently limited to 20 seconds instead. Linux and Unix makefiles: Added header file dependencies to ensure correct -generation of ACPICA core code and utilities. Also simplified the makefiles -considerably through the use of the vpath variable to specify search paths. +generation of ACPICA core code and utilities. Also simplified the +makefiles +considerably through the use of the vpath variable to specify search +paths. ACPICA BZ 924. 2) iASL Compiler/Disassembler and Tools: -iASL: Implemented support to check the access length for all fields created to -access named Resource Descriptor fields. For example, if a resource field is +iASL: Implemented support to check the access length for all fields +created to +access named Resource Descriptor fields. For example, if a resource field +is defined to be two bits, a warning is issued if a CreateXxxxField() is used with an incorrect bit length. This is implemented for all current resource descriptor names. ACPICA BZ 930. -Disassembler: Fixed a byte ordering problem with the output of 24-bit and 56- +Disassembler: Fixed a byte ordering problem with the output of 24-bit and +56- bit integers. iASL: Fixed a couple of issues associated with variable-length package -objects. 1) properly handle constants like One, Ones, Zero -- do not make a -VAR_PACKAGE when these are used as a package length. 2) Allow the VAR_PACKAGE -opcode (in addition to PACKAGE) when validating object types for predefined +objects. 1) properly handle constants like One, Ones, Zero -- do not make +a +VAR_PACKAGE when these are used as a package length. 2) Allow the +VAR_PACKAGE +opcode (in addition to PACKAGE) when validating object types for +predefined names. -iASL: Emit statistics for all output files (instead of just the ASL input and +iASL: Emit statistics for all output files (instead of just the ASL input +and AML output). Includes listings, hex files, etc. -iASL: Added -G option to the table compiler to allow the compilation of custom -ACPI tables. The only part of a table that is required is the standard 36-byte +iASL: Added -G option to the table compiler to allow the compilation of +custom +ACPI tables. The only part of a table that is required is the standard 36- +byte ACPI header. -AcpiXtract: Ported to the standard ACPICA environment (with ACPICA headers), +AcpiXtract: Ported to the standard ACPICA environment (with ACPICA +headers), which also adds correct 64-bit support. Also, now all output filenames are completely lower case. AcpiExec: Ignore any non-AML tables (tables other than DSDT or SSDT) when loading table files. A warning is issued for any such tables. The only -exception is an FADT. This also fixes a possible fault when attempting to load +exception is an FADT. This also fixes a possible fault when attempting to +load non-AML tables. ACPICA BZ 932. AcpiHelp: Added the AccessAs and Offset operators. Fixed a problem where a @@ -932,7 +1206,8 @@ statistics. These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug version of the code -includes the debug output trace mechanism and has a much larger code and data +includes the debug output trace mechanism and has a much larger code and +data size. Previous Release (VC 9.0): @@ -948,20 +1223,29 @@ size. 1) ACPI CA Core Subsystem: -Updated the predefined name repair mechanism to not attempt repair of a _TSS -return object if a _PSS object is present. We can only sort the _TSS return -package if there is no _PSS within the same scope. This is because if _PSS is -present, the ACPI specification dictates that the _TSS Power Dissipation field -is to be ignored, and therefore some BIOSs leave garbage values in the _TSS -Power field(s). In this case, it is best to just return the _TSS package as- +Updated the predefined name repair mechanism to not attempt repair of a +_TSS +return object if a _PSS object is present. We can only sort the _TSS +return +package if there is no _PSS within the same scope. This is because if _PSS +is +present, the ACPI specification dictates that the _TSS Power Dissipation +field +is to be ignored, and therefore some BIOSs leave garbage values in the +_TSS +Power field(s). In this case, it is best to just return the _TSS package +as- is. Reported by, and fixed with assistance from Fenghua Yu. -Added an option to globally disable the control method return value validation -and repair. This runtime option can be used to disable return value repair if +Added an option to globally disable the control method return value +validation +and repair. This runtime option can be used to disable return value repair +if this is causing a problem on a particular machine. Also added an option to AcpiExec (-dr) to set this disable flag. -All makefiles and project files: Major changes to improve generation of ACPICA +All makefiles and project files: Major changes to improve generation of +ACPICA tools. ACPICA BZ 912: Reduce default optimization levels to improve compatibility For Linux, add strict-aliasing=0 for gcc 4 @@ -969,13 +1253,17 @@ tools. ACPICA BZ 912: Cleanup multithread library support Improve usage messages -Linux-specific header: update handling of THREAD_ID and pthread. For the 32- -bit case, improve casting to eliminate possible warnings, especially with the +Linux-specific header: update handling of THREAD_ID and pthread. For the +32- +bit case, improve casting to eliminate possible warnings, especially with +the acpica tools. Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release (VC 9.0): @@ -987,27 +1275,35 @@ larger code and data size. 2) iASL Compiler/Disassembler and Tools: -With this release, a new utility named "acpihelp" has been added to the ACPICA -package. This utility summarizes the ACPI specification chapters for the ASL +With this release, a new utility named "acpihelp" has been added to the +ACPICA +package. This utility summarizes the ACPI specification chapters for the +ASL and AML languages. It generates under Linux/Unix as well as Windows, and provides the following functionality: Find/display ASL operator(s) -- with description and syntax. Find/display ASL keyword(s) -- with exact spelling and descriptions. Find/display ACPI predefined name(s) -- with description, number of arguments, and the return value data type. - Find/display AML opcode name(s) -- with opcode, arguments, and grammar. + Find/display AML opcode name(s) -- with opcode, arguments, and +grammar. Decode/display AML opcode -- with opcode name, arguments, and grammar. -Service Layers: Make multi-thread support configurable. Conditionally compile -the multi-thread support so that threading libraries will not be linked if not +Service Layers: Make multi-thread support configurable. Conditionally +compile +the multi-thread support so that threading libraries will not be linked if +not necessary. The only tool that requires multi-thread support is AcpiExec. -iASL: Update yyerrror/AslCompilerError for "const" errors. Newer versions of +iASL: Update yyerrror/AslCompilerError for "const" errors. Newer versions +of Bison appear to want the interface to yyerror to be a const char * (or at -least this is a problem when generating iASL on some systems.) ACPICA BZ 923 +least this is a problem when generating iASL on some systems.) ACPICA BZ +923 Pierre Lejeune. -Tools: Fix for systems where O_BINARY is not defined. Only used for Windows +Tools: Fix for systems where O_BINARY is not defined. Only used for +Windows versions of the tools. ---------------------------------------- @@ -1015,7 +1311,8 @@ versions of the tools. 1) ACPI CA Core Subsystem: -ASL Load() operator: Reinstate most restrictions on the incoming ACPI table +ASL Load() operator: Reinstate most restrictions on the incoming ACPI +table signature. Now, only allow SSDT, OEMx, and a null signature. History: 1) Originally, we checked the table signature for "SSDT" or "PSDT". (PSDT is now obsolete.) @@ -1028,11 +1325,14 @@ signature. Now, only allow SSDT, OEMx, and a null signature. History: only SSDT, OEMx, and now, also a null signature. (05/2011). Added the missing _TDL predefined name to the global name list in order to -enable validation. Affects both the core ACPICA code and the iASL compiler. +enable validation. Affects both the core ACPICA code and the iASL +compiler. Example Code and Data Size: These are the sizes for the OS-independent -acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug -version of the code includes the debug output trace mechanism and has a much +acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The +debug +version of the code includes the debug output trace mechanism and has a +much larger code and data size. Previous Release (VC 9.0): @@ -1044,20 +1344,28 @@ larger code and data size. 2) iASL Compiler/Disassembler and Tools: -Debugger/AcpiExec: Implemented support for "complex" method arguments on the -debugger command line. This adds support beyond simple integers -- including +Debugger/AcpiExec: Implemented support for "complex" method arguments on +the +debugger command line. This adds support beyond simple integers -- +including Strings, Buffers, and Packages. Includes support for nested packages. -Increased the default command line buffer size to accommodate these arguments. +Increased the default command line buffer size to accommodate these +arguments. See the ACPICA reference for details and syntax. ACPICA BZ 917. -Debugger/AcpiExec: Implemented support for "default" method arguments for the -Execute/Debug command. Now, the debugger will always invoke a control method -with the required number of arguments -- even if the command line specifies -none or insufficient arguments. It uses default integer values for any missing +Debugger/AcpiExec: Implemented support for "default" method arguments for +the +Execute/Debug command. Now, the debugger will always invoke a control +method +with the required number of arguments -- even if the command line +specifies +none or insufficient arguments. It uses default integer values for any +missing arguments. Also fixes a bug where only six method arguments maximum were supported instead of the required seven. -Debugger/AcpiExec: Add a maximum buffer length parameter to AcpiOsGetLine and +Debugger/AcpiExec: Add a maximum buffer length parameter to AcpiOsGetLine +and also return status in order to prevent buffer overruns. See the ACPICA reference for details and syntax. ACPICA BZ 921 @@ -1065,7 +1373,8 @@ iASL: Cleaned up support for Berkeley yacc. A general cleanup of code and makefiles to simplify support for the two different but similar parser generators, bison and yacc. -Updated the generic unix makefile for gcc 4. The default gcc version is now +Updated the generic unix makefile for gcc 4. The default gcc version is +now expected to be 4 or greater, since options specific to gcc 4 are used. ---------------------------------------- @@ -1073,8 +1382,10 @@ expected to be 4 or greater, since options specific to gcc 4 are used. 1) ACPI CA Core Subsystem: -Implemented support to execute a so-called "orphan" _REG method under the EC -device. This change will force the execution of a _REG method underneath the +Implemented support to execute a so-called "orphan" _REG method under the +EC +device. This change will force the execution of a _REG method underneath +the EC device even if there is no corresponding operation region of type EmbeddedControl. Fixes a problem seen on some machines and apparently is @@ -1085,24 +1396,30 @@ element removal. This change adds another group of predefined names to the list of names that can be repaired by having NULL package elements dynamically removed. This group are those methods that return a single variable-length -package containing simple data types such as integers, buffers, strings. This -includes: _ALx, _BCL, _CID,_ DOD, _EDL, _FIX, _PCL, _PLD, _PMD, _PRx, _PSL, +package containing simple data types such as integers, buffers, strings. +This +includes: _ALx, _BCL, _CID,_ DOD, _EDL, _FIX, _PCL, _PLD, _PMD, _PRx, +_PSL, _Sx, and _TZD. ACPICA BZ 914. Split and segregated all internal global lock functions to a new file, evglock.c. -Updated internal address SpaceID for DataTable regions. Moved this internal +Updated internal address SpaceID for DataTable regions. Moved this +internal space -id in preparation for ACPI 5.0 changes that will include some new space IDs. +id in preparation for ACPI 5.0 changes that will include some new space +IDs. This change should not affect user/host code. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib -produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug version of -the code includes the debug output trace mechanism and has a much larger code +produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug +version of +the code includes the debug output trace mechanism and has a much larger +code and data size. @@ -1115,21 +1432,30 @@ data size. 2) iASL Compiler/Disassembler and Tools: -iASL/DTC: Major update for new grammar features. Allow generic data types in +iASL/DTC: Major update for new grammar features. Allow generic data types +in custom ACPI tables. Field names are now optional. Any line can be split to -multiple lines using the continuation char (\). Large buffers now use line- +multiple lines using the continuation char (\). Large buffers now use +line- continuation character(s) and no colon on the continuation lines. See the grammar -update in the iASL compiler reference. ACPI BZ 910,911. Lin Ming, Bob Moore. +update in the iASL compiler reference. ACPI BZ 910,911. Lin Ming, Bob +Moore. -iASL: Mark ASL "Return()" and the simple "Return" as "Null" return statements. -Since the parser stuffs a "zero" as the return value for these statements (due +iASL: Mark ASL "Return()" and the simple "Return" as "Null" return +statements. +Since the parser stuffs a "zero" as the return value for these statements +(due to -the underlying AML grammar), they were seen as "return with value" by the iASL -semantic checking. They are now seen correctly as "null" return statements. - -iASL: Check if a_REG declaration has a corresponding Operation Region. Adds a -check for each _REG to ensure that there is in fact a corresponding operation +the underlying AML grammar), they were seen as "return with value" by the +iASL +semantic checking. They are now seen correctly as "null" return +statements. + +iASL: Check if a_REG declaration has a corresponding Operation Region. +Adds a +check for each _REG to ensure that there is in fact a corresponding +operation region declaration in the same scope. If not, the _REG method is not very useful since it probably won't be executed. ACPICA BZ 915. @@ -1140,26 +1466,33 @@ that implements c-style operator precedence and parenthesization. ACPICA bugzilla 908. -Disassembler/DTC: Remove support for () and <> style comments in data tables. +Disassembler/DTC: Remove support for () and <> style comments in data +tables. Now -that DTC has full expression support, we don't want to have comment strings +that DTC has full expression support, we don't want to have comment +strings that -start with a parentheses or a less-than symbol. Now, only the standard /* and +start with a parentheses or a less-than symbol. Now, only the standard /* +and // comments are supported, as well as the bracket [] comments. AcpiXtract: Fix for RSDP and dynamic SSDT extraction. These tables have "unusual" -headers in the acpidump file. Update the header validation to support these +headers in the acpidump file. Update the header validation to support +these tables. Problem introduced in previous AcpiXtract version in the change to support "wrong checksum" error messages emitted by acpidump utility. -iASL: Add a * option to generate all template files (as a synonym for ALL) as +iASL: Add a * option to generate all template files (as a synonym for ALL) +as in "iasl -T *" or "iasl -T ALL". -iASL/DTC: Do not abort compiler on fatal errors. We do not want to completely -abort the compiler on "fatal" errors, simply should abort the current compile. +iASL/DTC: Do not abort compiler on fatal errors. We do not want to +completely +abort the compiler on "fatal" errors, simply should abort the current +compile. This allows multiple compiles with a single (possibly wildcard) compiler invocation. @@ -1168,20 +1501,27 @@ invocation. 1) ACPI CA Core Subsystem: -Fixed a problem caused by a _PRW method appearing at the namespace root scope -during the setup of wake GPEs. A fault could occur if a _PRW directly under +Fixed a problem caused by a _PRW method appearing at the namespace root +scope +during the setup of wake GPEs. A fault could occur if a _PRW directly +under the root object was passed to the AcpiSetupGpeForWake interface. Lin Ming. -Implemented support for "spurious" Global Lock interrupts. On some systems, a -global lock interrupt can occur without the pending flag being set. Upon a GL -interrupt, we now ensure that a thread is actually waiting for the lock before +Implemented support for "spurious" Global Lock interrupts. On some +systems, a +global lock interrupt can occur without the pending flag being set. Upon a +GL +interrupt, we now ensure that a thread is actually waiting for the lock +before signaling GL availability. Rafael Wysocki, Bob Moore. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib -produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug version of -the code includes the debug output trace mechanism and has a much larger code +produced by the Microsoft Visual C++ 9.0 32-bit compiler. The debug +version of +the code includes the debug output trace mechanism and has a much larger +code and data size. @@ -1194,22 +1534,27 @@ data size. 2) iASL Compiler/Disassembler and Tools: -Implemented full support for the "SLIC" ACPI table. Includes support in the -header files, disassembler, table compiler, and template generator. Bob Moore, +Implemented full support for the "SLIC" ACPI table. Includes support in +the +header files, disassembler, table compiler, and template generator. Bob +Moore, Lin Ming. AcpiXtract: Correctly handle embedded comments and messages from AcpiDump. -Apparently some or all versions of acpidump will occasionally emit a comment +Apparently some or all versions of acpidump will occasionally emit a +comment like "Wrong checksum", etc., into the dump file. This was causing problems for AcpiXtract. ACPICA BZ 905. -iASL: Fix the Linux makefile by removing an inadvertent double file inclusion. +iASL: Fix the Linux makefile by removing an inadvertent double file +inclusion. ACPICA BZ 913. AcpiExec: Update installation of operation region handlers. Install one handler -for a user-defined address space. This is used by the ASL test suite (ASLTS). +for a user-defined address space. This is used by the ASL test suite +(ASLTS). ---------------------------------------- 11 February 2011. Summary of changes for version 20110211: @@ -1219,26 +1564,31 @@ for a user-defined address space. This is used by the ASL test suite (ASLTS). Added a mechanism to defer _REG methods for some early-installed handlers. Most user handlers should be installed before call to AcpiEnableSubsystem. However, Event handlers and region handlers should be installed after -AcpiInitializeObjects. Override handlers for the "default" regions should be +AcpiInitializeObjects. Override handlers for the "default" regions should +be installed early, however. This change executes all _REG methods for the default regions (Memory/IO/PCI/DataTable) simultaneously to prevent any chicken/egg issues between them. ACPICA BZ 848. -Implemented an optimization for GPE detection. This optimization will simply +Implemented an optimization for GPE detection. This optimization will +simply ignore GPE registers that contain no enabled GPEs -- there is no need to read the register since this information is available internally. This becomes more important on machines with a large GPE space. ACPICA bugzilla 884. Lin Ming. Suggestion from Joe Liu. Removed all use of the highly unreliable FADT revision field. The revision -number in the FADT has been found to be completely unreliable and cannot be -trusted. Only the actual table length can be used to infer the version. This +number in the FADT has been found to be completely unreliable and cannot +be +trusted. Only the actual table length can be used to infer the version. +This change updates the ACPICA core and the disassembler so that both no longer even look at the FADT version and instead depend solely upon the FADT length. Fix an unresolved name issue for the no-debug and no-error-message source -generation cases. The _AcpiModuleName was left undefined in these cases, but +generation cases. The _AcpiModuleName was left undefined in these cases, +but it is actually needed as a parameter to some interfaces. Define _AcpiModuleName as a null string in these cases. ACPICA Bugzilla 888. @@ -1251,7 +1601,8 @@ Split several large files (makefiles and project files updated) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release (VC 9.0): @@ -1267,32 +1618,41 @@ iASL: Implemented the predefined macros __LINE__, __FILE__, and __DATE__. These are useful C-style macros with the standard definitions. ACPICA bugzilla 898. -iASL/DTC: Added support for integer expressions and labels. Support for full -expressions for all integer fields in all ACPI tables. Support for labels in +iASL/DTC: Added support for integer expressions and labels. Support for +full +expressions for all integer fields in all ACPI tables. Support for labels +in "generic" portions of tables such as UEFI. See the iASL reference manual. Debugger: Added a command to display the status of global handlers. The "handlers" command will display op region, fixed event, and miscellaneous -global handlers. installation status -- and for op regions, whether default +global handlers. installation status -- and for op regions, whether +default or user-installed handler will be used. iASL: Warn if reserved method incorrectly returns a value. Many predefined -names are defined such that they do not return a value. If implemented as a +names are defined such that they do not return a value. If implemented as +a method, issue a warning if such a name explicitly returns a value. ACPICA Bugzilla 855. -iASL: Added detection of GPE method name conflicts. Detects a conflict where -there are two GPE methods of the form _Lxy and _Exy in the same scope. (For +iASL: Added detection of GPE method name conflicts. Detects a conflict +where +there are two GPE methods of the form _Lxy and _Exy in the same scope. +(For example, _L1D and _E1D in the same scope.) ACPICA bugzilla 848. iASL/DTC: Fixed a couple input scanner issues with comments and line -numbers. Comment remover could get confused and miss a comment ending. Fixed +numbers. Comment remover could get confused and miss a comment ending. +Fixed a problem with line counter maintenance. -iASL/DTC: Reduced the severity of some errors from fatal to error. There is +iASL/DTC: Reduced the severity of some errors from fatal to error. There +is no need to abort on simple errors within a field definition. -Debugger: Simplified the output of the help command. All help output now in +Debugger: Simplified the output of the help command. All help output now +in a single screen, instead of help subcommands. ACPICA Bugzilla 897. ---------------------------------------- @@ -1300,16 +1660,20 @@ a single screen, instead of help subcommands. ACPICA Bugzilla 897. 1) ACPI CA Core Subsystem: -Fixed a race condition between method execution and namespace walks that can +Fixed a race condition between method execution and namespace walks that +can possibly cause a fault. The problem was apparently introduced in version -20100528 as a result of a performance optimization that reduces the number of +20100528 as a result of a performance optimization that reduces the number +of namespace walks upon method exit by using the delete_namespace_subtree -function instead of the delete_namespace_by_owner function used previously. +function instead of the delete_namespace_by_owner function used +previously. Bug is a missing namespace lock in the delete_namespace_subtree function. dana.myers@oracle.com Fixed several issues and a possible fault with the automatic "serialized" -method support. History: This support changes a method to "serialized" on the +method support. History: This support changes a method to "serialized" on +the fly if the method generates an AE_ALREADY_EXISTS error, indicating the possibility that it cannot handle reentrancy. This fix repairs a couple of issues seen in the field, especially on machines with many cores: @@ -1325,29 +1689,36 @@ issues seen in the field, especially on machines with many cores: Lin Ming, Bob Moore. Reported by dana.myers@oracle.com. -Debugger: Now lock the namespace for duration of a namespace dump. Prevents +Debugger: Now lock the namespace for duration of a namespace dump. +Prevents issues if the namespace is changing dynamically underneath the debugger. Especially affects temporary namespace nodes, since the debugger displays these also. Updated the ordering of include files. The ACPICA headers should appear -before any compiler-specific headers (stdio.h, etc.) so that acenv.h can set -any necessary compiler-specific defines, etc. Affects the ACPI-related tools +before any compiler-specific headers (stdio.h, etc.) so that acenv.h can +set +any necessary compiler-specific defines, etc. Affects the ACPI-related +tools and utilities. -Updated all ACPICA copyrights and signons to 2011. Added the 2011 copyright -to all module headers and signons, including the Linux header. This affects +Updated all ACPICA copyrights and signons to 2011. Added the 2011 +copyright +to all module headers and signons, including the Linux header. This +affects virtually every file in the ACPICA core subsystem, iASL compiler, and all utilities. Added project files for MS Visual Studio 2008 (VC++ 9.0). The original -project files for VC++ 6.0 are now obsolete. New project files can be found +project files for VC++ 6.0 are now obsolete. New project files can be +found under acpica/generate/msvc9. See acpica/generate/msvc9/readme.txt for details. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release (VC 6.0): @@ -1359,11 +1730,13 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Added generic data types to the Data Table compiler. Add "generic" data +iASL: Added generic data types to the Data Table compiler. Add "generic" +data types such as UINT32, String, Unicode, etc., to simplify the generation of platform-defined tables such as UEFI. Lin Ming. -iASL: Added listing support for the Data Table Compiler. Adds listing support +iASL: Added listing support for the Data Table Compiler. Adds listing +support (-l) to display actual binary output for each line of input code. ---------------------------------------- @@ -1371,10 +1744,12 @@ iASL: Added listing support for the Data Table Compiler. Adds listing support 1) ACPI CA Core Subsystem: -Completed the major overhaul of the GPE support code that was begun in July +Completed the major overhaul of the GPE support code that was begun in +July 2010. Major features include: removal of _PRW execution in ACPICA (host executes _PRWs anyway), cleanup of "wake" GPE interfaces and processing, -changes to existing interfaces, simplification of GPE handler operation, and +changes to existing interfaces, simplification of GPE handler operation, +and a handful of new interfaces: AcpiUpdateAllGpes @@ -1385,23 +1760,29 @@ a handful of new interfaces: See the ACPICA Programmer Reference for full details and programming information. See the new section 4.4 "General Purpose Event (GPE) Support" -for a full overview, and section 8.7 "ACPI General Purpose Event Management" +for a full overview, and section 8.7 "ACPI General Purpose Event +Management" for programming details. ACPICA BZ 858,870,877. Matthew Garrett, Lin Ming, Bob Moore, Rafael Wysocki. -Implemented a new GPE feature for Windows compatibility, the "Implicit Wake +Implemented a new GPE feature for Windows compatibility, the "Implicit +Wake GPE Notify". This feature will automatically issue a Notify(2) on a device when a Wake GPE is received if there is no corresponding GPE method or handler. ACPICA BZ 870. -Fixed a problem with the Scope() operator during table parse and load phase. -During load phase (table load or method execution), the scope operator should -not enter the target into the namespace. Instead, it should open a new scope +Fixed a problem with the Scope() operator during table parse and load +phase. +During load phase (table load or method execution), the scope operator +should +not enter the target into the namespace. Instead, it should open a new +scope at the target location. Linux BZ 19462, ACPICA BZ 882. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1413,26 +1794,32 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Relax the alphanumeric restriction on _CID strings. These strings are -"bus-specific" per the ACPI specification, and therefore any characters are -acceptable. The only checks that can be performed are for a null string and +iASL: Relax the alphanumeric restriction on _CID strings. These strings +are +"bus-specific" per the ACPI specification, and therefore any characters +are +acceptable. The only checks that can be performed are for a null string +and perhaps for a leading asterisk. ACPICA BZ 886. iASL: Fixed a problem where a syntax error that caused a premature EOF condition on the source file emitted a very confusing error message. The premature EOF is now detected correctly. ACPICA BZ 891. -Disassembler: Decode the AccessSize within a Generic Address Structure (byte +Disassembler: Decode the AccessSize within a Generic Address Structure +(byte access, word access, etc.) Note, this field does not allow arbitrary bit access, the size is encoded as 1=byte, 2=word, 3=dword, and 4=qword. -New: AcpiNames utility - Example namespace dump utility. Shows an example of +New: AcpiNames utility - Example namespace dump utility. Shows an example +of ACPICA configuration for a minimal namespace dump utility. Uses table and namespace managers, but no AML interpreter. Does not add any functionality over AcpiExec, it is a subset of AcpiExec. The purpose is to show how to partition and configure ACPICA. ACPICA BZ 883. -AML Debugger: Increased the debugger buffer size for method return objects. +AML Debugger: Increased the debugger buffer size for method return +objects. Was 4K, increased to 16K. Also enhanced error messages for debugger method execution, including the buffer overflow case. @@ -1441,26 +1828,31 @@ execution, including the buffer overflow case. 1) ACPI CA Core Subsystem: -Added support to clear the PCIEXP_WAKE event. When clearing ACPI events, now +Added support to clear the PCIEXP_WAKE event. When clearing ACPI events, +now clear the PCIEXP_WAKE_STS bit in the ACPI PM1 Status Register, via HwClearAcpiStatus. Original change from Colin King. ACPICA BZ 880. -Changed the type of the predefined namespace object _TZ from ThermalZone to +Changed the type of the predefined namespace object _TZ from ThermalZone +to Device. This was found to be confusing to the host software that processes -the various thermal zones, since _TZ is not really a ThermalZone. However, a +the various thermal zones, since _TZ is not really a ThermalZone. However, +a Notify() can still be performed on it. ACPICA BZ 876. Suggestion from Rui Zhang. Added Windows Vista SP2 to the list of supported _OSI strings. The actual string is "Windows 2006 SP2". -Eliminated duplicate code in AcpiUtExecute* functions. Now that the nsrepair +Eliminated duplicate code in AcpiUtExecute* functions. Now that the +nsrepair code automatically repairs _HID-related strings, this type of code is no longer needed in Execute_HID, Execute_CID, and Execute_UID. ACPICA BZ 878. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1473,13 +1865,17 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: iASL: Implemented additional compile-time validation for _HID strings. The -non-hex prefix (such as "PNP" or "ACPI") must be uppercase, and the length of -the string must be exactly seven or eight characters. For both _HID and _CID +non-hex prefix (such as "PNP" or "ACPI") must be uppercase, and the length +of +the string must be exactly seven or eight characters. For both _HID and +_CID strings, all characters must be alphanumeric. ACPICA BZ 874. iASL: Allow certain "null" resource descriptors. Some BIOS code creates -descriptors that are mostly or all zeros, with the expectation that they will -be filled in at runtime. iASL now allows this as long as there is a "resource +descriptors that are mostly or all zeros, with the expectation that they +will +be filled in at runtime. iASL now allows this as long as there is a +"resource tag" (name) associated with the descriptor, which gives the ASL a handle needed to modify the descriptor. ACPICA BZ 873. @@ -1489,7 +1885,8 @@ threaded ACPICA tools/applications - increasing performance. The _MULTI_THREADED option was replaced by the (reverse) ACPI_SINGLE_THREADED option. ACPICA BZ 879. -AcpiExec: several fixes for the 64-bit version. Adds XSDT support and support +AcpiExec: several fixes for the 64-bit version. Adds XSDT support and +support for 64-bit DSDT/FACS addresses in the FADT. Lin Ming. iASL: Moved all compiler messages to a new file, aslmessages.h. @@ -1499,7 +1896,8 @@ iASL: Moved all compiler messages to a new file, aslmessages.h. 1) ACPI CA Core Subsystem: -Removed the AcpiOsDerivePciId OSL interface. The various host implementations +Removed the AcpiOsDerivePciId OSL interface. The various host +implementations of this function were not OS-dependent and are now obsolete and can be removed from all host OSLs. This function has been replaced by AcpiHwDerivePciId, which is now part of the ACPICA core code. @@ -1513,29 +1911,38 @@ accordance with the ACPI specification and will simplify host driver code. ACPICA BZ 871. The ACPI_THREAD_ID type is no longer configurable, internally it is now -always UINT64. This simplifies the ACPICA code, especially any printf output. +always UINT64. This simplifies the ACPICA code, especially any printf +output. UINT64 is the only common data type for all thread_id types across all -operating systems. It is now up to the host OSL to cast the native thread_id -type to UINT64 before returning the value to ACPICA (via AcpiOsGetThreadId). +operating systems. It is now up to the host OSL to cast the native +thread_id +type to UINT64 before returning the value to ACPICA (via +AcpiOsGetThreadId). Lin Ming, Bob Moore. -Added the ACPI_INLINE type to enhance the ACPICA configuration. The "inline" -keyword is not standard across compilers, and this type allows inline to be +Added the ACPI_INLINE type to enhance the ACPICA configuration. The +"inline" +keyword is not standard across compilers, and this type allows inline to +be configured on a per-compiler basis. Lin Ming. Made the system global AcpiGbl_SystemAwakeAndRunning publically available. -Added an extern for this boolean in acpixf.h. Some hosts utilize this value +Added an extern for this boolean in acpixf.h. Some hosts utilize this +value during suspend/restore operations. ACPICA BZ 869. -All code that implements error/warning messages with the "ACPI:" prefix has +All code that implements error/warning messages with the "ACPI:" prefix +has been moved to a new module, utxferror.c. -The UINT64_OVERLAY was moved to utmath.c, which is the only module where it +The UINT64_OVERLAY was moved to utmath.c, which is the only module where +it is used. ACPICA BZ 829. Lin Ming, Bob Moore. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1548,12 +1955,14 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: iASL/Disassembler: Write ACPI errors to stderr instead of the output file. -This keeps the output files free of random error messages that may originate +This keeps the output files free of random error messages that may +originate from within the namespace/interpreter code. Used this opportunity to merge all ACPI:-style messages into a single new module, utxferror.c. ACPICA BZ 866. Lin Ming, Bob Moore. -Tools: update some printfs for ansi warnings on size_t. Handle width change +Tools: update some printfs for ansi warnings on size_t. Handle width +change of size_t on 32-bit versus 64-bit generations. Lin Ming. ---------------------------------------- @@ -1561,11 +1970,15 @@ of size_t on 32-bit versus 64-bit generations. Lin Ming. 1) ACPI CA Core Subsystem: -Designed and implemented a new host interface to the _OSI support code. This +Designed and implemented a new host interface to the _OSI support code. +This will allow the host to dynamically add or remove multiple _OSI strings, as -well as install an optional handler that is called for each _OSI invocation. -Also added a new AML debugger command, 'osi' to display and modify the global -_OSI string table, and test support in the AcpiExec utility. See the ACPICA +well as install an optional handler that is called for each _OSI +invocation. +Also added a new AML debugger command, 'osi' to display and modify the +global +_OSI string table, and test support in the AcpiExec utility. See the +ACPICA reference manual for full details. Lin Ming, Bob Moore. ACPICA BZ 836. New Functions: AcpiInstallInterface - Add an _OSI string. @@ -1577,28 +1990,37 @@ New Files: source/components/utilities/utosi.c Re-introduced the support to enable multi-byte transfers for Embedded -Controller (EC) operation regions. A reported problem was found to be a bug -in the host OS, not in the multi-byte support. Previously, the maximum data -size passed to the EC operation region handler was a single byte. There are -often EC Fields larger than one byte that need to be transferred, and it is -useful for the EC driver to lock these as a single transaction. This change +Controller (EC) operation regions. A reported problem was found to be a +bug +in the host OS, not in the multi-byte support. Previously, the maximum +data +size passed to the EC operation region handler was a single byte. There +are +often EC Fields larger than one byte that need to be transferred, and it +is +useful for the EC driver to lock these as a single transaction. This +change enables single transfers larger than 8 bits. This effectively changes the access to the EC space from ByteAcc to AnyAcc, and will probably require -changes to the host OS Embedded Controller driver to enable 16/32/64/256-bit +changes to the host OS Embedded Controller driver to enable 16/32/64/256- +bit transfers in addition to 8-bit transfers. Alexey Starikovskiy, Lin Ming. Fixed a problem with the prototype for AcpiOsReadPciConfiguration. The prototype in acpiosxf.h had the output value pointer as a (void *). It should be a (UINT64 *). This may affect some host OSL code. -Fixed a couple problems with the recently modified Linux makefiles for iASL +Fixed a couple problems with the recently modified Linux makefiles for +iASL and AcpiExec. These new makefiles place the generated object files in the -local directory so that there can be no collisions between the files that are +local directory so that there can be no collisions between the files that +are shared between them that are compiled with different options. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1612,11 +2034,13 @@ much larger code and data size. iASL/Disassembler: Added a new option (-da, "disassemble all") to load the namespace from and disassemble an entire group of AML files. Useful for -loading all of the AML tables for a given machine (DSDT, SSDT1...SSDTn) and +loading all of the AML tables for a given machine (DSDT, SSDT1...SSDTn) +and disassembling with one simple command. ACPICA BZ 865. Lin Ming. iASL: Allow multiple invocations of -e option. This change allows multiple -uses of -e on the command line: "-e ssdt1.dat -e ssdt2.dat". ACPICA BZ 834. +uses of -e on the command line: "-e ssdt1.dat -e ssdt2.dat". ACPICA BZ +834. Lin Ming. ---------------------------------------- @@ -1625,9 +2049,12 @@ Lin Ming. 1) ACPI CA Core Subsystem: Implemented several updates to the recently added GPE reference count -support. The model for "wake" GPEs is changing to give the host OS complete -control of these GPEs. Eventually, the ACPICA core will not execute any _PRW -methods, since the host already must execute them. Also, additional changes +support. The model for "wake" GPEs is changing to give the host OS +complete +control of these GPEs. Eventually, the ACPICA core will not execute any +_PRW +methods, since the host already must execute them. Also, additional +changes were made to help ensure that the reference counts are kept in proper synchronization with reality. Rafael J. Wysocki. @@ -1636,28 +2063,34 @@ synchronization with reality. Rafael J. Wysocki. 3) Do not inadvertently enable GPEs when writing GPE registers. 4) Remove the internal wake reference counter and add new AcpiGpeWakeup interface. This interface will set or clear individual GPEs for wakeup. -5) Remove GpeType argument from AcpiEnable and AcpiDisable. These interfaces +5) Remove GpeType argument from AcpiEnable and AcpiDisable. These +interfaces are now used for "runtime" GPEs only. -Changed the behavior of the GPE install/remove handler interfaces. The GPE is -no longer disabled during this process, as it was found to cause problems on +Changed the behavior of the GPE install/remove handler interfaces. The GPE +is +no longer disabled during this process, as it was found to cause problems +on some machines. Rafael J. Wysocki. Reverted a change introduced in version 20100528 to enable Embedded -Controller multi-byte transfers. This change was found to cause problems with +Controller multi-byte transfers. This change was found to cause problems +with Index Fields and possibly Bank Fields. It will be reintroduced when these problems have been resolved. Fixed a problem with references to Alias objects within Package Objects. A reference to an Alias within the definition of a Package was not always resolved properly. Aliases to objects like Processors, Thermal zones, etc. -were resolved to the actual object instead of a reference to the object as it +were resolved to the actual object instead of a reference to the object as +it should be. Package objects are only allowed to contain integer, string, buffer, package, and reference objects. Redhat bugzilla 608648. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1670,14 +2103,17 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: iASL: Implemented a new compiler subsystem to allow definition and -compilation of the non-AML ACPI tables such as FADT, MADT, SRAT, etc. These +compilation of the non-AML ACPI tables such as FADT, MADT, SRAT, etc. +These are called "ACPI Data Tables", and the new compiler is the "Data Table Compiler". This compiler is intended to simplify the existing error-prone process of creating these tables for the BIOS, as well as allowing the -disassembly, modification, recompilation, and override of existing ACPI data +disassembly, modification, recompilation, and override of existing ACPI +data tables. See the iASL User Guide for detailed information. -iASL: Implemented a new Template Generator option in support of the new Data +iASL: Implemented a new Template Generator option in support of the new +Data Table Compiler. This option will create examples of all known ACPI tables that can be used as the basis for table development. See the iASL documentation and the -T option. @@ -1701,35 +2137,53 @@ available at www.acpi.info. This is primarily an errata release. 1) ACPI CA Core Subsystem: -Undefined ACPI tables: We are looking for the definitions for the following +Undefined ACPI tables: We are looking for the definitions for the +following ACPI tables that have been seen in the field: ATKG, IEIT, GSCI. Implemented support to enable multi-byte transfers for Embedded Controller (EC) operation regions. Previously, the maximum data size passed to the EC -operation region handler was a single byte. There are often EC Fields larger -than one byte that need to be transferred, and it is useful for the EC driver -to lock these as a single transaction. This change enables single transfers -larger than 8 bits. This effectively changes the access to the EC space from -ByteAcc to AnyAcc, and will probably require changes to the host OS Embedded -Controller driver to enable 16/32/64/256-bit transfers in addition to 8-bit +operation region handler was a single byte. There are often EC Fields +larger +than one byte that need to be transferred, and it is useful for the EC +driver +to lock these as a single transaction. This change enables single +transfers +larger than 8 bits. This effectively changes the access to the EC space +from +ByteAcc to AnyAcc, and will probably require changes to the host OS +Embedded +Controller driver to enable 16/32/64/256-bit transfers in addition to 8- +bit transfers. Alexey Starikovskiy, Lin Ming -Implemented a performance enhancement for namespace search and access. This -change enhances the performance of namespace searches and walks by adding a -backpointer to the parent in each namespace node. On large namespaces, this -change can improve overall ACPI performance by up to 9X. Adding a pointer to -each namespace node increases the overall size of the internal namespace by +Implemented a performance enhancement for namespace search and access. +This +change enhances the performance of namespace searches and walks by adding +a +backpointer to the parent in each namespace node. On large namespaces, +this +change can improve overall ACPI performance by up to 9X. Adding a pointer +to +each namespace node increases the overall size of the internal namespace +by about 5%, since each namespace entry usually consists of both a namespace node and an ACPI operand object. However, this is the first growth of the namespace in ten years. ACPICA bugzilla 817. Alexey Starikovskiy. -Implemented a performance optimization that reduces the number of namespace -walks. On control method exit, only walk the namespace if the method is known -to have created namespace objects outside of its local scope. Previously, the -entire namespace was traversed on each control method exit. This change can -improve overall ACPI performance by up to 3X. Alexey Starikovskiy, Bob Moore. +Implemented a performance optimization that reduces the number of +namespace +walks. On control method exit, only walk the namespace if the method is +known +to have created namespace objects outside of its local scope. Previously, +the +entire namespace was traversed on each control method exit. This change +can +improve overall ACPI performance by up to 3X. Alexey Starikovskiy, Bob +Moore. -Added support to truncate I/O addresses to 16 bits for Windows compatibility. +Added support to truncate I/O addresses to 16 bits for Windows +compatibility. Some ASL code has been seen in the field that inadvertently has bits set above bit 15. This feature is optional and is enabled if the BIOS requests any Windows OSI strings. It can also be enabled by the host OS. Matthew @@ -1740,22 +2194,28 @@ prevent accidental deep sleeps, limit the maximum time that Sleep() will actually sleep. Configurable, the default maximum is two seconds. ACPICA bugzilla 854. -Added run-time validation support for the _WDG and_WED Microsoft predefined -methods. These objects are defined by "Windows Instrumentation", and are not +Added run-time validation support for the _WDG and_WED Microsoft +predefined +methods. These objects are defined by "Windows Instrumentation", and are +not part of the ACPI spec. ACPICA BZ 860. Expanded all statistic counters used during namespace and device -initialization from 16 to 32 bits in order to support very large namespaces. +initialization from 16 to 32 bits in order to support very large +namespaces. -Replaced all instances of %d in printf format specifiers with %u since nearly +Replaced all instances of %d in printf format specifiers with %u since +nearly all integers in ACPICA are unsigned. -Fixed the exception namestring for AE_WAKE_ONLY_GPE. Was incorrectly returned +Fixed the exception namestring for AE_WAKE_ONLY_GPE. Was incorrectly +returned as AE_NO_HANDLER. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1768,7 +2228,8 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: iASL: Added compiler support for the _WDG and_WED Microsoft predefined -methods. These objects are defined by "Windows Instrumentation", and are not +methods. These objects are defined by "Windows Instrumentation", and are +not part of the ACPI spec. ACPICA BZ 860. AcpiExec: added option to disable the memory tracking mechanism. The -dt @@ -1784,12 +2245,14 @@ AcpiExec: Restructured the command line options into -d (disable) and -e 1) ACPI CA Core Subsystem: Implemented GPE support for dynamically loaded ACPI tables. For all GPEs, -including FADT-based and GPE Block Devices, execute any _PRW methods in the +including FADT-based and GPE Block Devices, execute any _PRW methods in +the new table, and process any _Lxx/_Exx GPE methods in the new table. Any runtime GPE that is referenced by an _Lxx/_Exx method in the new table is immediately enabled. Handles the FADT-defined GPEs as well as GPE Block Devices. Provides compatibility with other ACPI implementations. Two new -files added, evgpeinit.c and evgpeutil.c. ACPICA BZ 833. Lin Ming, Bob Moore. +files added, evgpeinit.c and evgpeutil.c. ACPICA BZ 833. Lin Ming, Bob +Moore. Fixed a regression introduced in version 20100331 within the table manager where initial table loading could fail. This was introduced in the fix for @@ -1797,16 +2260,20 @@ AcpiReallocateRootTable. Also, renamed some of fields in the table manager data structures to clarify their meaning and use. Fixed a possible allocation overrun during internal object copy in -AcpiUtCopySimpleObject. The original code did not correctly handle the case -where the object to be copied was a namespace node. Lin Ming. ACPICA BZ 847. +AcpiUtCopySimpleObject. The original code did not correctly handle the +case +where the object to be copied was a namespace node. Lin Ming. ACPICA BZ +847. Updated the allocation dump routine, AcpiUtDumpAllocation and fixed a -possible access beyond end-of-allocation. Also, now fully validate descriptor +possible access beyond end-of-allocation. Also, now fully validate +descriptor (size and type) before output. Lin Ming, Bob Moore. ACPICA BZ 847 Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1823,21 +2290,27 @@ descriptors. This change implements validation for the address fields that are common to all address-type resource descriptors. These checks are implemented: Checks for valid Min/Max, length within the Min/Max window, valid granularity, Min/Max a multiple of granularity, and _MIF/_MAF as per -table 6-40 in the ACPI 4.0a specification. Also split the large aslrestype1.c +table 6-40 in the ACPI 4.0a specification. Also split the large +aslrestype1.c and aslrestype2.c files into five new files. ACPICA BZ 840. -iASL: Added support for the _Wxx predefined names. This support was missing +iASL: Added support for the _Wxx predefined names. This support was +missing and these names were not recognized by the compiler as valid predefined names. ACPICA BZ 851. -iASL: Added an error for all predefined names that are defined to return no -value and thus must be implemented as Control Methods. These include all of +iASL: Added an error for all predefined names that are defined to return +no +value and thus must be implemented as Control Methods. These include all +of the _Lxx, _Exx, _Wxx, and _Qxx names, as well as some other miscellaneous names such as _DIS, _INI, _IRC, _OFF, _ON, and _PSx. ACPICA BZ 850, 856. iASL: Implemented the -ts option to emit hex AML data in ASL format, as an -ASL Buffer. Allows ACPI tables to be easily included within ASL files, to be -dynamically loaded via the Load() operator. Also cleaned up output for the - +ASL Buffer. Allows ACPI tables to be easily included within ASL files, to +be +dynamically loaded via the Load() operator. Also cleaned up output for the +- ta and -tc options. ACPICA BZ 853. Tests: Added a new file with examples of extended iASL error checking. @@ -1849,14 +2322,18 @@ Available at tests/misc/badcode.asl. 1) ACPI CA Core Subsystem: -Completed a major update for the GPE support in order to improve support for -shared GPEs and to simplify both host OS and ACPICA code. Added a reference -count mechanism to support shared GPEs that require multiple device drivers. +Completed a major update for the GPE support in order to improve support +for +shared GPEs and to simplify both host OS and ACPICA code. Added a +reference +count mechanism to support shared GPEs that require multiple device +drivers. Several external interfaces have changed. One external interface has been removed. One new external interface was added. Most of the GPE external interfaces now use the GPE spinlock instead of the events mutex (and the Flags parameter for many GPE interfaces has been removed.) See the updated -ACPICA Programmer Reference for details. Matthew Garrett, Bob Moore, Rafael +ACPICA Programmer Reference for details. Matthew Garrett, Bob Moore, +Rafael Wysocki. ACPICA BZ 831. Changed: @@ -1866,32 +2343,42 @@ Removed: New: AcpiSetGpe -Implemented write support for DataTable operation regions. These regions are -defined via the DataTableRegion() operator. Previously, only read support was -implemented. The ACPI specification allows DataTableRegions to be read/write, +Implemented write support for DataTable operation regions. These regions +are +defined via the DataTableRegion() operator. Previously, only read support +was +implemented. The ACPI specification allows DataTableRegions to be +read/write, however. Implemented a new subsystem option to force a copy of the DSDT to local memory. Optionally copy the entire DSDT to local memory (instead of simply -mapping it.) There are some (albeit very rare) BIOSs that corrupt or replace +mapping it.) There are some (albeit very rare) BIOSs that corrupt or +replace the original DSDT, creating the need for this option. Default is FALSE, do not copy the DSDT. Implemented detection of a corrupted or replaced DSDT. This change adds -support to detect a DSDT that has been corrupted and/or replaced from outside -the OS (by firmware). This is typically catastrophic for the system, but has +support to detect a DSDT that has been corrupted and/or replaced from +outside +the OS (by firmware). This is typically catastrophic for the system, but +has been seen on some machines. Once this problem has been detected, the DSDT copy option can be enabled via system configuration. Lin Ming, Bob Moore. -Fixed two problems with AcpiReallocateRootTable during the root table copy. +Fixed two problems with AcpiReallocateRootTable during the root table +copy. When copying the root table to the new allocation, the length used was -incorrect. The new size was used instead of the current table size, meaning -too much data was copied. Also, the count of available slots for ACPI tables +incorrect. The new size was used instead of the current table size, +meaning +too much data was copied. Also, the count of available slots for ACPI +tables was not set correctly. Alexey Starikovskiy, Bob Moore. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1907,7 +2394,8 @@ iASL: Implement limited typechecking for values returned from predefined control methods. The type of any returned static (unnamed) object is now validated. For example, Return(1). ACPICA BZ 786. -iASL: Fixed a predefined name object verification regression. Fixes a problem +iASL: Fixed a predefined name object verification regression. Fixes a +problem introduced in version 20100304. An error is incorrectly generated if a predefined name is declared as a static named object with a value defined using the keywords "Zero", "One", or "Ones". Lin Ming. @@ -1915,7 +2403,8 @@ using the keywords "Zero", "One", or "Ones". Lin Ming. iASL: Added Windows 7 support for the -g option (get local ACPI tables) by reducing the requested registry access rights. ACPICA BZ 842. -Disassembler: fixed a possible fault when generating External() statements. +Disassembler: fixed a possible fault when generating External() +statements. Introduced in commit ae7d6fd: Properly handle externals with parent-prefix (carat). Fixes a string length allocation calculation. Lin Ming. @@ -1926,32 +2415,40 @@ Introduced in commit ae7d6fd: Properly handle externals with parent-prefix Fixed a possible problem with the AML Mutex handling function AcpiExReleaseMutex where the function could fault under the very rare -condition when the interpreter has blocked, the interpreter lock is released, +condition when the interpreter has blocked, the interpreter lock is +released, the interpreter is then reentered via the same thread, and attempts to -acquire an AML mutex that was previously acquired. FreeBSD report 140979. Lin +acquire an AML mutex that was previously acquired. FreeBSD report 140979. +Lin Ming. Implemented additional configuration support for the AML "Debug Object". Output from the debug object can now be enabled via a global variable, -AcpiGbl_EnableAmlDebugObject. This will assist with remote machine debugging. -This debug output is now available in the release version of ACPICA instead +AcpiGbl_EnableAmlDebugObject. This will assist with remote machine +debugging. +This debug output is now available in the release version of ACPICA +instead of just the debug version. Also, the entire debug output module can now be configured out of the ACPICA build if desired. One new file added, executer/exdebug.c. Lin Ming, Bob Moore. Added header support for the ACPI MCHI table (Management Controller Host -Interface Table). This table was added in ACPI 4.0, but the defining document +Interface Table). This table was added in ACPI 4.0, but the defining +document has only recently become available. -Standardized output of integer values for ACPICA warnings/errors. Always use -0x prefix for hex output, always use %u for unsigned integer decimal output. +Standardized output of integer values for ACPICA warnings/errors. Always +use +0x prefix for hex output, always use %u for unsigned integer decimal +output. Affects ACPI_INFO, ACPI_ERROR, ACPI_EXCEPTION, and ACPI_WARNING (about 400 invocations.) These invocations were converted from the original ACPI_DEBUG_PRINT invocations and were not consistent. ACPICA BZ 835. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -1966,7 +2463,8 @@ much larger code and data size. iASL: Implemented typechecking support for static (non-control method) predefined named objects that are declared with the Name() operator. For example, the type of this object is now validated to be of type Integer: -Name(_BBN, 1). This change migrates the compiler to using the core predefined +Name(_BBN, 1). This change migrates the compiler to using the core +predefined name table instead of maintaining a local version. Added a new file, aslpredef.c. ACPICA BZ 832. @@ -1981,34 +2479,46 @@ Added the 2010 copyright to all module headers and signons. This affects virtually every file in the ACPICA core subsystem, the iASL compiler, the tools/utilities, and the test suites. -Implemented a change to the AcpiGetDevices interface to eliminate unnecessary +Implemented a change to the AcpiGetDevices interface to eliminate +unnecessary invocations of the _STA method. In the case where a specific _HID is requested, do not run _STA until a _HID match is found. This eliminates -potentially dozens of _STA calls during a search for a particular device/HID, +potentially dozens of _STA calls during a search for a particular +device/HID, which in turn can improve boot times. ACPICA BZ 828. Lin Ming. -Implemented an additional repair for predefined method return values. Attempt -to repair unexpected NULL elements within returned Package objects. Create an -Integer of value zero, a NULL String, or a zero-length Buffer as appropriate. +Implemented an additional repair for predefined method return values. +Attempt +to repair unexpected NULL elements within returned Package objects. Create +an +Integer of value zero, a NULL String, or a zero-length Buffer as +appropriate. ACPICA BZ 818. Lin Ming, Bob Moore. -Removed the obsolete ACPI_INTEGER data type. This type was introduced as the -code was migrated from ACPI 1.0 (with 32-bit AML integers) to ACPI 2.0 (with -64-bit AML integers). It is now obsolete and this change removes it from the -ACPICA code base, replaced by UINT64. The original typedef has been retained +Removed the obsolete ACPI_INTEGER data type. This type was introduced as +the +code was migrated from ACPI 1.0 (with 32-bit AML integers) to ACPI 2.0 +(with +64-bit AML integers). It is now obsolete and this change removes it from +the +ACPICA code base, replaced by UINT64. The original typedef has been +retained for now for compatibility with existing device driver code. ACPICA BZ 824. Removed the unused UINT32_STRUCT type, and the obsolete Integer64 field in the parse tree object. -Added additional warning options for the gcc-4 generation. Updated the source -accordingly. This includes some code restructuring to eliminate unreachable +Added additional warning options for the gcc-4 generation. Updated the +source +accordingly. This includes some code restructuring to eliminate +unreachable code, elimination of some gotos, elimination of unused return values, some additional casting, and removal of redundant declarations. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2028,46 +2538,61 @@ No functional changes for this release. 1) ACPI CA Core Subsystem: Enhanced automatic data type conversions for predefined name repairs. This -change expands the automatic repairs/conversions for predefined name return -values to make Integers, Strings, and Buffers fully interchangeable. Also, a -Buffer can be converted to a Package of Integers if necessary. The nsrepair.c +change expands the automatic repairs/conversions for predefined name +return +values to make Integers, Strings, and Buffers fully interchangeable. Also, +a +Buffer can be converted to a Package of Integers if necessary. The +nsrepair.c module was completely restructured. Lin Ming, Bob Moore. -Implemented automatic removal of null package elements during predefined name +Implemented automatic removal of null package elements during predefined +name repairs. This change will automatically remove embedded and trailing NULL -package elements from returned package objects that are defined to contain a -variable number of sub-packages. The driver is then presented with a package +package elements from returned package objects that are defined to contain +a +variable number of sub-packages. The driver is then presented with a +package with no null elements to deal with. ACPICA BZ 819. Implemented a repair for the predefined _FDE and _GTM names. The expected return value for both names is a Buffer of 5 DWORDs. This repair fixes two possible problems (both seen in the field), where a package of integers is -returned, or a buffer of BYTEs is returned. With assistance from Jung-uk Kim. - -Implemented additional module-level code support. This change will properly -execute module-level code that is not at the root of the namespace (under a -Device object, etc.). Now executes the code within the current scope instead +returned, or a buffer of BYTEs is returned. With assistance from Jung-uk +Kim. + +Implemented additional module-level code support. This change will +properly +execute module-level code that is not at the root of the namespace (under +a +Device object, etc.). Now executes the code within the current scope +instead of the root. ACPICA BZ 762. Lin Ming. Fixed possible mutex acquisition errors when running _REG methods. Fixes a problem where mutex errors can occur when running a _REG method that is in the same scope as a method-defined operation region or an operation region -under a module-level IF block. This type of code is rare, so the problem has +under a module-level IF block. This type of code is rare, so the problem +has not been seen before. ACPICA BZ 826. Lin Ming, Bob Moore. Fixed a possible memory leak during module-level code execution. An object could be leaked for each block of executed module-level code if the -interpreter slack mode is enabled This change deletes any implicitly returned +interpreter slack mode is enabled This change deletes any implicitly +returned object from the module-level code block. Lin Ming. Removed messages for successful predefined repair(s). The repair mechanism -was considered too wordy. Now, messages are only unconditionally emitted if +was considered too wordy. Now, messages are only unconditionally emitted +if the return object cannot be repaired. Existing messages for successful -repairs were converted to ACPI_DEBUG_PRINT messages for now. ACPICA BZ 827. +repairs were converted to ACPI_DEBUG_PRINT messages for now. ACPICA BZ +827. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2079,12 +2604,14 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Fixed a regression introduced in 20091112 where intermediate .SRC files +iASL: Fixed a regression introduced in 20091112 where intermediate .SRC +files were no longer automatically removed at the termination of the compile. acpiexec: Implemented the -f option to specify default region fill value. This option specifies the value used to initialize buffers that simulate -operation regions. Default value is zero. Useful for debugging problems that +operation regions. Default value is zero. Useful for debugging problems +that depend on a specific initial value for a region or field. ---------------------------------------- @@ -2094,43 +2621,57 @@ depend on a specific initial value for a region or field. Implemented a post-order callback to AcpiWalkNamespace. The existing interface only has a pre-order callback. This change adds an additional -parameter for a post-order callback which will be more useful for bus scans. +parameter for a post-order callback which will be more useful for bus +scans. ACPICA BZ 779. Lin Ming. Updated the ACPICA Programmer Reference. Modified the behavior of the operation region memory mapping cache for -SystemMemory. Ensure that the memory mappings created for operation regions +SystemMemory. Ensure that the memory mappings created for operation +regions do not cross 4K page boundaries. Crossing a page boundary while mapping -regions can cause kernel warnings on some hosts if the pages have different -attributes. Such regions are probably BIOS bugs, and this is the workaround. +regions can cause kernel warnings on some hosts if the pages have +different +attributes. Such regions are probably BIOS bugs, and this is the +workaround. Linux BZ 14445. Lin Ming. Implemented an automatic repair for predefined methods that must return -sorted lists. This change will repair (by sorting) packages returned by _ALR, -_PSS, and _TSS. Drivers can now assume that the packages are correctly sorted +sorted lists. This change will repair (by sorting) packages returned by +_ALR, +_PSS, and _TSS. Drivers can now assume that the packages are correctly +sorted and do not contain NULL package elements. Adds one new file, namespace/nsrepair2.c. ACPICA BZ 784. Lin Ming, Bob Moore. -Fixed a possible fault during predefined name validation if a return Package +Fixed a possible fault during predefined name validation if a return +Package object contains NULL elements. Also adds a warning if a NULL element is -followed by any non-null elements. ACPICA BZ 813, 814. Future enhancement may +followed by any non-null elements. ACPICA BZ 813, 814. Future enhancement +may include repair or removal of all such NULL elements where possible. -Implemented additional module-level executable AML code support. This change +Implemented additional module-level executable AML code support. This +change will execute module-level code that is not at the root of the namespace -(under a Device object, etc.) at table load time. Module-level executable AML +(under a Device object, etc.) at table load time. Module-level executable +AML code has been illegal since ACPI 2.0. ACPICA BZ 762. Lin Ming. -Implemented a new internal function to create Integer objects. This function +Implemented a new internal function to create Integer objects. This +function simplifies miscellaneous object creation code. ACPICA BZ 823. Reduced the severity of predefined repair messages, Warning to Info. Since -the object was successfully repaired, a warning is too severe. Reduced to an -info message for now. These messages may eventually be changed to debug-only. +the object was successfully repaired, a warning is too severe. Reduced to +an +info message for now. These messages may eventually be changed to debug- +only. ACPICA BZ 812. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2142,20 +2683,26 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Implemented Switch() with While(1) so that Break works correctly. This -change correctly implements the Switch operator with a surrounding While(1) +iASL: Implemented Switch() with While(1) so that Break works correctly. +This +change correctly implements the Switch operator with a surrounding +While(1) so that the Break operator works as expected. ACPICA BZ 461. Lin Ming. -iASL: Added a message if a package initializer list is shorter than package -length. Adds a new remark for a Package() declaration if an initializer list +iASL: Added a message if a package initializer list is shorter than +package +length. Adds a new remark for a Package() declaration if an initializer +list exists, but is shorter than the declared length of the package. Although technically legal, this is probably a coding error and it is seen in the field. ACPICA BZ 815. Lin Ming, Bob Moore. -iASL: Fixed a problem where the compiler could fault after the maximum number +iASL: Fixed a problem where the compiler could fault after the maximum +number of errors was reached (200). -acpixtract: Fixed a possible warning for pointer cast if the compiler warning +acpixtract: Fixed a possible warning for pointer cast if the compiler +warning level set very high. ---------------------------------------- @@ -2163,8 +2710,10 @@ level set very high. 1) ACPI CA Core Subsystem: -Fixed a problem where an Operation Region _REG method could be executed more -than once. If a custom address space handler is installed by the host before +Fixed a problem where an Operation Region _REG method could be executed +more +than once. If a custom address space handler is installed by the host +before the "initialize operation regions" phase of the ACPICA initialization, any _REG methods for that address space could be executed twice. This change fixes the problem. ACPICA BZ 427. Lin Ming. @@ -2175,20 +2724,24 @@ operand object was leaked. Lin Ming. Implemented a run-time repair for the _MAT predefined method. If the _MAT return value is defined as a Field object in the AML, and the field -size is less than or equal to the default width of an integer (32 or 64),_MAT +size is less than or equal to the default width of an integer (32 or +64),_MAT can incorrectly return an Integer instead of a Buffer. ACPICA now automatically repairs this problem. ACPICA BZ 810. -Implemented a run-time repair for the _BIF and _BIX predefined methods. The +Implemented a run-time repair for the _BIF and _BIX predefined methods. +The "OEM Information" field is often incorrectly returned as an Integer with -value zero if the field is not supported by the platform. This is due to an +value zero if the field is not supported by the platform. This is due to +an ambiguity in the ACPI specification. The field should always be a string. ACPICA now automatically repairs this problem by returning a NULL string within the returned Package. ACPICA BZ 807. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2228,12 +2781,17 @@ table load time. This support is in addition to the automatic execution of \_SB._INI. Lin Ming. Fixed a possible memory leak in the interpreter for AML package objects if -the package initializer list is longer than the defined size of the package. -This apparently can only happen if the BIOS changes the package size on the +the package initializer list is longer than the defined size of the +package. +This apparently can only happen if the BIOS changes the package size on +the fly (seen in a _PSS object), as ASL compilers do not allow this. The -interpreter will truncate the package to the defined size (and issue an error -message), but previously could leave the extra objects undeleted if they were -pre-created during the argument processing (such is the case if the package +interpreter will truncate the package to the defined size (and issue an +error +message), but previously could leave the extra objects undeleted if they +were +pre-created during the argument processing (such is the case if the +package consists of a number of sub-packages as in the _PSS.) ACPICA BZ 805. Fixed a problem seen when a Buffer or String is stored to itself via ASL. @@ -2242,7 +2800,8 @@ buffer/string. Now, the operation is treated as a noop. Provides Windows compatibility. ACPICA BZ 803. Lin Ming. Removed an extraneous error message for ASL constructs of the form -Store(LocalX,LocalX) when LocalX is uninitialized. These curious statements +Store(LocalX,LocalX) when LocalX is uninitialized. These curious +statements are seen in many BIOSs and are once again treated as NOOPs and no error is emitted when they are encountered. ACPICA BZ 785. @@ -2252,7 +2811,8 @@ return type cannot be performed. ACPICA BZ 802. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2268,7 +2828,8 @@ iASL: Fixed a problem with the use of the Alias operator and Resource Templates. The correct alias is now constructed and no error is emitted. ACPICA BZ 738. -iASL: Implemented the -I option to specify additional search directories for +iASL: Implemented the -I option to specify additional search directories +for include files. Allows multiple additional search paths for include files. Directories are searched in the order specified on the command line (after the local directory is searched.) ACPICA BZ 800. @@ -2280,12 +2841,14 @@ properly. ACPICA BZ 765. iASL: Implemented the -@ option to specify a Windows-style response file containing additional command line options. ACPICA BZ 801. -AcpiExec: Added support to load multiple AML files simultaneously (such as a +AcpiExec: Added support to load multiple AML files simultaneously (such as +a DSDT and multiple SSDTs). Also added support for wildcards within the AML pathname. These features allow all machine tables to be easily loaded and debugged together. ACPICA BZ 804. -Disassembler: Added missing support for disassembly of HEST table Error Bank +Disassembler: Added missing support for disassembly of HEST table Error +Bank subtables. ---------------------------------------- @@ -2297,53 +2860,69 @@ The ACPI 4.0 implementation for ACPICA is complete with this release. ACPI 4.0: Added header file support for all new and changed ACPI tables. Completely new tables are: IBFT, IVRS, MSCT, and WAET. Tables that are new -for ACPI 4.0, but have previously been supported in ACPICA are: CPEP, BERT, -EINJ, ERST, and HEST. Other newly supported tables are: UEFI and WDAT. There +for ACPI 4.0, but have previously been supported in ACPICA are: CPEP, +BERT, +EINJ, ERST, and HEST. Other newly supported tables are: UEFI and WDAT. +There have been some ACPI 4.0 changes to other existing tables. Split the large actbl1.h header into the existing actbl2.h header. ACPICA BZ 774. -ACPI 4.0: Implemented predefined name validation for all new names. There are -31 new names in ACPI 4.0. The predefined validation module was split into two +ACPI 4.0: Implemented predefined name validation for all new names. There +are +31 new names in ACPI 4.0. The predefined validation module was split into +two files. The new file is namespace/nsrepair.c. ACPICA BZ 770. Implemented support for so-called "module-level executable code". This is -executable AML code that exists outside of any control method and is intended -to be executed at table load time. Although illegal since ACPI 2.0, this type +executable AML code that exists outside of any control method and is +intended +to be executed at table load time. Although illegal since ACPI 2.0, this +type of code still exists and is apparently still being created. Blocks of this code are now detected and executed as intended. Currently, the code blocks must exist under either an If, Else, or While construct; these are the typical cases seen in the field. ACPICA BZ 762. Lin Ming. Implemented an automatic dynamic repair for predefined names that return -nested Package objects. This applies to predefined names that are defined to +nested Package objects. This applies to predefined names that are defined +to return a variable-length Package of sub-packages. If the number of sub- -packages is one, BIOS code is occasionally seen that creates a simple single +packages is one, BIOS code is occasionally seen that creates a simple +single package with no sub-packages. This code attempts to fix the problem by -wrapping a new package object around the existing package. These methods can +wrapping a new package object around the existing package. These methods +can be repaired: _ALR, _CSD, _HPX, _MLS, _PRT, _PSS, _TRT, and _TSS. ACPICA BZ 790. -Fixed a regression introduced in 20090625 for the AcpiGetDevices interface. -The _HID/_CID matching was broken and no longer matched IDs correctly. ACPICA +Fixed a regression introduced in 20090625 for the AcpiGetDevices +interface. +The _HID/_CID matching was broken and no longer matched IDs correctly. +ACPICA BZ 793. Fixed a problem with AcpiReset where the reset would silently fail if the -register was one of the protected I/O ports. AcpiReset now bypasses the port -validation mechanism. This may eventually be driven into the AcpiRead/Write +register was one of the protected I/O ports. AcpiReset now bypasses the +port +validation mechanism. This may eventually be driven into the +AcpiRead/Write interfaces. Fixed a regression related to the recent update of the AcpiRead/Write -interfaces. A sleep/suspend could fail if the optional PM2 Control register +interfaces. A sleep/suspend could fail if the optional PM2 Control +register does not exist during an attempt to write the Bus Master Arbitration bit. (However, some hosts already delete the code that writes this bit, and the code may in fact be obsolete at this date.) ACPICA BZ 799. -Fixed a problem where AcpiTerminate could fault if inadvertently called twice +Fixed a problem where AcpiTerminate could fault if inadvertently called +twice in succession. ACPICA BZ 795. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2368,8 +2947,10 @@ continue for the next few releases. 1) ACPI CA Core Subsystem: ACPI 4.0: Implemented interpreter support for the IPMI operation region -address space. Includes support for bi-directional data buffers and an IPMI -address space handler (to be installed by an IPMI device driver.) ACPICA BZ +address space. Includes support for bi-directional data buffers and an +IPMI +address space handler (to be installed by an IPMI device driver.) ACPICA +BZ 773. Lin Ming. ACPI 4.0: Added changes for existing ACPI tables - FACS and SRAT. Includes @@ -2378,45 +2959,56 @@ support in both the header files and the disassembler. Completed a major update for the AcpiGetObjectInfo external interface. Changes include: - Support for variable, unlimited length HID, UID, and CID strings. - - Support Processor objects the same as Devices (HID,UID,CID,ADR,STA, etc.) + - Support Processor objects the same as Devices (HID,UID,CID,ADR,STA, +etc.) - Call the _SxW power methods on behalf of a device object. - Determine if a device is a PCI root bridge. - Change the ACPI_BUFFER parameter to ACPI_DEVICE_INFO. These changes will require an update to all callers of this interface. See -the updated ACPICA Programmer Reference for details. One new source file has +the updated ACPICA Programmer Reference for details. One new source file +has been added - utilities/utids.c. ACPICA BZ 368, 780. Updated the AcpiRead and AcpiWrite external interfaces to support 64-bit -transfers. The Value parameter has been extended from 32 bits to 64 bits in -order to support new ACPI 4.0 tables. These changes will require an update to +transfers. The Value parameter has been extended from 32 bits to 64 bits +in +order to support new ACPI 4.0 tables. These changes will require an update +to all callers of these interfaces. See the ACPICA Programmer Reference for details. ACPICA BZ 768. -Fixed several problems with AcpiAttachData. The handler was not invoked when -the host node was deleted. The data sub-object was not automatically deleted +Fixed several problems with AcpiAttachData. The handler was not invoked +when +the host node was deleted. The data sub-object was not automatically +deleted when the host node was deleted. The interface to the handler had an unused parameter, this was removed. ACPICA BZ 778. Enhanced the function that dumps ACPI table headers. All non-printable -characters in the string fields are now replaced with '?' (Signature, OemId, +characters in the string fields are now replaced with '?' (Signature, +OemId, OemTableId, and CompilerId.) ACPI tables with non-printable characters in these fields are occasionally seen in the field. ACPICA BZ 788. Fixed a problem with predefined method repair code where the code that attempts to repair/convert an object of incorrect type is only executed on -the first time the predefined method is called. The mechanism that disables +the first time the predefined method is called. The mechanism that +disables warnings on subsequent calls was interfering with the repair mechanism. ACPICA BZ 781. -Fixed a possible memory leak in the predefined validation/repair code when a +Fixed a possible memory leak in the predefined validation/repair code when +a buffer is automatically converted to an expected string object. -Removed obsolete 16-bit files from the distribution and from the current git +Removed obsolete 16-bit files from the distribution and from the current +git tree head. ACPICA BZ 776. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2439,8 +3031,10 @@ predefined names and control methods (31 total). ACPICA BZ 769. 1) ACPI CA Core Subsystem: -Disabled the preservation of the SCI enable bit in the PM1 control register. -The SCI enable bit (bit 0, SCI_EN) is defined by the ACPI specification to be +Disabled the preservation of the SCI enable bit in the PM1 control +register. +The SCI enable bit (bit 0, SCI_EN) is defined by the ACPI specification to +be a "preserved" bit - "OSPM always preserves this bit position", section 4.7.3.2.1. However, some machines fail if this bit is in fact preserved because the bit needs to be explicitly set by the OS as a workaround. No @@ -2451,45 +3045,59 @@ Fixed a problem in AcpiRsGetPciRoutingTableLength where an invalid or incorrectly formed _PRT package could cause a fault. Added validation to ensure that each package element is actually a sub-package. -Implemented a new interface to install or override a single control method, -AcpiInstallMethod. This interface is useful when debugging in order to repair -an existing method or to install a missing method without having to override +Implemented a new interface to install or override a single control +method, +AcpiInstallMethod. This interface is useful when debugging in order to +repair +an existing method or to install a missing method without having to +override the entire ACPI table. See the ACPICA Programmer Reference for use and examples. Lin Ming, Bob Moore. Fixed several reference count issues with the DdbHandle object that is -created from a Load or LoadTable operator. Prevent premature deletion of the +created from a Load or LoadTable operator. Prevent premature deletion of +the object. Also, mark the object as invalid once the table has been unloaded. -This is needed because the handle itself may not be deleted after the table +This is needed because the handle itself may not be deleted after the +table unload, depending on whether it has been stored in a named object by the caller. Lin Ming. Fixed a problem with Mutex Sync Levels. Fixed a problem where if multiple -mutexes of the same sync level are acquired but then not released in strict -opposite order, the internally maintained Current Sync Level becomes confused +mutexes of the same sync level are acquired but then not released in +strict +opposite order, the internally maintained Current Sync Level becomes +confused and can cause subsequent execution errors. ACPICA BZ 471. Changed the allowable release order for ASL mutex objects. The ACPI 4.0 -specification has been changed to make the SyncLevel for mutex objects more +specification has been changed to make the SyncLevel for mutex objects +more useful. When releasing a mutex, the SyncLevel of the mutex must now be the -same as the current sync level. This makes more sense than the previous rule +same as the current sync level. This makes more sense than the previous +rule (SyncLevel less than or equal). This change updates the code to match the specification. -Fixed a problem with the local version of the AcpiOsPurgeCache function. The +Fixed a problem with the local version of the AcpiOsPurgeCache function. +The (local) cache must be locked during all cache object deletions. Andrew Baumann. -Updated the Load operator to use operation region interfaces. This replaces -direct memory mapping with region access calls. Now, all region accesses go +Updated the Load operator to use operation region interfaces. This +replaces +direct memory mapping with region access calls. Now, all region accesses +go through the installed region handler as they should. -Simplified and optimized the NsGetNextNode function. Reduced parameter count +Simplified and optimized the NsGetNextNode function. Reduced parameter +count and reduced code for this frequently used function. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2501,8 +3109,10 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -Disassembler: Fixed some issues with DMAR, HEST, MADT tables. Some problems -with sub-table disassembly and handling invalid sub-tables. Attempt recovery +Disassembler: Fixed some issues with DMAR, HEST, MADT tables. Some +problems +with sub-table disassembly and handling invalid sub-tables. Attempt +recovery after an invalid sub-table ID. ---------------------------------------- @@ -2512,12 +3122,15 @@ after an invalid sub-table ID. Fixed a compatibility issue with the recently released I/O port protection mechanism. For windows compatibility, 1) On a port protection violation, -simply ignore the request and do not return an exception (allow the control +simply ignore the request and do not return an exception (allow the +control method to continue execution.) 2) If only part of the request overlaps a -protected port, read/write the individual ports that are not protected. Linux +protected port, read/write the individual ports that are not protected. +Linux BZ 13036. Lin Ming -Enhanced the execution of the ASL/AML BreakPoint operator so that it actually +Enhanced the execution of the ASL/AML BreakPoint operator so that it +actually breaks into the AML debugger if the debugger is present. This matches the ACPI-defined behavior. @@ -2527,15 +3140,19 @@ pointer with no warnings. Also fixes several warnings in printf-like statements for the 64-bit build when the type is configured as a pointer. ACPICA BZ 766, 767. -Fixed a number of possible warnings when compiling with gcc 4+ (depending on -warning options.) Examples include printf formats, aliasing, unused globals, +Fixed a number of possible warnings when compiling with gcc 4+ (depending +on +warning options.) Examples include printf formats, aliasing, unused +globals, missing prototypes, missing switch default statements, use of non-ANSI -library functions, use of non-ANSI constructs. See generate/unix/Makefile for +library functions, use of non-ANSI constructs. See generate/unix/Makefile +for a list of warning options used with gcc 3 and 4. ACPICA BZ 735. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2547,10 +3164,12 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Fixed a generation warning from Bison 2.3 and fixed several warnings on +iASL: Fixed a generation warning from Bison 2.3 and fixed several warnings +on the 64-bit build. -iASL: Fixed a problem where the Unix/Linux versions of the compiler could not +iASL: Fixed a problem where the Unix/Linux versions of the compiler could +not correctly digest Windows/DOS formatted files (with CR/LF). iASL: Added a new option for "quiet mode" (-va) that produces only the @@ -2559,16 +3178,20 @@ batch compilations. AcpiExec: Implemented a new option (-z) to enable a forced semaphore/mutex timeout that can be used to detect hang conditions during execution of AML -code (includes both internal semaphores and AML-defined mutexes and events.) +code (includes both internal semaphores and AML-defined mutexes and +events.) Added new makefiles for the generation of acpica in a generic unix-like environment. These makefiles are intended to generate the acpica tools and utilities from the original acpica git source tree structure. Test Suites: Updated and cleaned up the documentation files. Updated the -copyrights to 2009, affecting all source files. Use the new version of iASL -with quiet mode. Increased the number of available semaphores in the Windows -OSL, allowing the aslts to execute fully on Windows. For the Unix OSL, added +copyrights to 2009, affecting all source files. Use the new version of +iASL +with quiet mode. Increased the number of available semaphores in the +Windows +OSL, allowing the aslts to execute fully on Windows. For the Unix OSL, +added an alternate implementation of the semaphore timeout to allow aslts to execute fully on Cygwin. @@ -2577,25 +3200,37 @@ execute fully on Cygwin. 1) ACPI CA Core Subsystem: -Fixed a possible race condition between AcpiWalkNamespace and dynamic table -unloads. Added a reader/writer locking mechanism to allow multiple concurrent -namespace walks (readers), but block a dynamic table unload until it can gain -exclusive write access to the namespace. This fixes a problem where a table -unload could (possibly catastrophically) delete the portion of the namespace -that is currently being examined by a walk. Adds a new file, utlock.c, that +Fixed a possible race condition between AcpiWalkNamespace and dynamic +table +unloads. Added a reader/writer locking mechanism to allow multiple +concurrent +namespace walks (readers), but block a dynamic table unload until it can +gain +exclusive write access to the namespace. This fixes a problem where a +table +unload could (possibly catastrophically) delete the portion of the +namespace +that is currently being examined by a walk. Adds a new file, utlock.c, +that implements the reader/writer lock mechanism. ACPICA BZ 749. -Fixed a regression introduced in version 20090220 where a change to the FADT -handling could cause the ACPICA subsystem to access non-existent I/O ports. +Fixed a regression introduced in version 20090220 where a change to the +FADT +handling could cause the ACPICA subsystem to access non-existent I/O +ports. -Modified the handling of FADT register and table (FACS/DSDT) addresses. The +Modified the handling of FADT register and table (FACS/DSDT) addresses. +The FADT can contain both 32-bit and 64-bit versions of these addresses. -Previously, the 64-bit versions were favored, meaning that if both 32 and 64 +Previously, the 64-bit versions were favored, meaning that if both 32 and +64 versions were valid, but not equal, the 64-bit version was used. This was -found to cause some machines to fail. Now, in this case, the 32-bit version +found to cause some machines to fail. Now, in this case, the 32-bit +version is used instead. This now matches the Windows behavior. -Implemented a new mechanism to protect certain I/O ports. Provides Microsoft +Implemented a new mechanism to protect certain I/O ports. Provides +Microsoft compatibility and protects the standard PC I/O ports from access via AML code. Adds a new file, hwvalid.c @@ -2603,30 +3238,38 @@ Fixed a possible extraneous warning message from the FADT support. The message warns of a 32/64 length mismatch between the legacy and GAS definitions for a register. -Removed the obsolete AcpiOsValidateAddress OSL interface. This interface is -made obsolete by the port protection mechanism above. It was previously used -to validate the entire address range of an operation region, which could be +Removed the obsolete AcpiOsValidateAddress OSL interface. This interface +is +made obsolete by the port protection mechanism above. It was previously +used +to validate the entire address range of an operation region, which could +be incorrect if the range included illegal ports, but fields within the operation region did not actually access those ports. Validation is now performed on a per-field basis instead of the entire region. Modified the handling of the PM1 Status Register ignored bit (bit 11.) Ignored bits must be "preserved" according to the ACPI spec. Usually, this -means a read/modify/write when writing to the register. However, for status -registers, writing a one means clear the event. Writing a zero means preserve +means a read/modify/write when writing to the register. However, for +status +registers, writing a one means clear the event. Writing a zero means +preserve the event (do not clear.) This behavior is clarified in the ACPI 4.0 spec, and the ACPICA code now simply always writes a zero to the ignored bit. -Modified the handling of ignored bits for the PM1 A/B Control Registers. As +Modified the handling of ignored bits for the PM1 A/B Control Registers. +As per the ACPI specification, for the control registers, preserve -(read/modify/write) all bits that are defined as either reserved or ignored. +(read/modify/write) all bits that are defined as either reserved or +ignored. Updated the handling of write-only bits in the PM1 A/B Control Registers. When reading the register, zero the write-only bits as per the ACPI spec. ACPICA BZ 443. Lin Ming. Removed "Linux" from the list of supported _OSI strings. Linux no longer -wants to reply true to this request. The Windows strings are the only paths +wants to reply true to this request. The Windows strings are the only +paths through the AML that are tested and known to work properly. Previous Release: @@ -2638,7 +3281,8 @@ through the AML that are tested and known to work properly. 2) iASL Compiler/Disassembler and Tools: -Acpiexec: Split the large aeexec.c file into two new files, aehandlers.c and +Acpiexec: Split the large aeexec.c file into two new files, aehandlers.c +and aetables.c ---------------------------------------- @@ -2646,47 +3290,63 @@ aetables.c 1) ACPI CA Core Subsystem: -Optimized the ACPI register locking. Removed locking for reads from the ACPI +Optimized the ACPI register locking. Removed locking for reads from the +ACPI bit registers in PM1 Status, Enable, Control, and PM2 Control. The lock is not required when reading the single-bit registers. The AcpiGetRegisterUnlocked function is no longer needed and has been removed. This will improve performance for reads on these registers. ACPICA BZ 760. Fixed the parameter validation for AcpiRead/Write. Now return -AE_BAD_PARAMETER if the input register pointer is null, and AE_BAD_ADDRESS if -the register has an address of zero. Previously, these cases simply returned -AE_OK. For optional registers such as PM1B status/enable/control, the caller +AE_BAD_PARAMETER if the input register pointer is null, and AE_BAD_ADDRESS +if +the register has an address of zero. Previously, these cases simply +returned +AE_OK. For optional registers such as PM1B status/enable/control, the +caller should check for a valid register address before calling. ACPICA BZ 748. Renamed the external ACPI bit register access functions. Renamed AcpiGetRegister and AcpiSetRegister to clarify the purpose of these functions. The new names are AcpiReadBitRegister and AcpiWriteBitRegister. -Also, restructured the code for these functions by simplifying the code path +Also, restructured the code for these functions by simplifying the code +path and condensing duplicate code to reduce code size. Added new functions to transparently handle the possibly split PM1 A/B registers. AcpiHwReadMultiple and AcpiHwWriteMultiple. These two functions -now handle the split registers for PM1 Status, Enable, and Control. ACPICA BZ +now handle the split registers for PM1 Status, Enable, and Control. ACPICA +BZ 746. -Added a function to handle the PM1 control registers, AcpiHwWritePm1Control. -This function writes both of the PM1 control registers (A/B). These registers -are different than the PM1 A/B status and enable registers in that different +Added a function to handle the PM1 control registers, +AcpiHwWritePm1Control. +This function writes both of the PM1 control registers (A/B). These +registers +are different than the PM1 A/B status and enable registers in that +different values can be written to the A/B registers. Most notably, the SLP_TYP bits -can be different, as per the values returned from the _Sx predefined methods. +can be different, as per the values returned from the _Sx predefined +methods. -Removed an extra register write within AcpiHwClearAcpiStatus. This function -was writing an optional PM1B status register twice. The existing call to the -low-level AcpiHwRegisterWrite automatically handles a possibly split PM1 A/B +Removed an extra register write within AcpiHwClearAcpiStatus. This +function +was writing an optional PM1B status register twice. The existing call to +the +low-level AcpiHwRegisterWrite automatically handles a possibly split PM1 +A/B register. ACPICA BZ 751. -Split out the PM1 Status registers from the FADT. Added new globals for these +Split out the PM1 Status registers from the FADT. Added new globals for +these registers (A/B), similar to the way the PM1 Enable registers are handled. Instead of overloading the FADT Event Register blocks. This makes the code clearer and less prone to error. -Fixed the warning message for when the platform contains too many ACPI tables -for the default size of the global root table data structure. The calculation +Fixed the warning message for when the platform contains too many ACPI +tables +for the default size of the global root table data structure. The +calculation for the truncation value was incorrect. Removed the ACPI_GET_OBJECT_TYPE macro. Removed all instances of this @@ -2701,13 +3361,15 @@ Conditionally compile the AcpiSetFirmwareWakingVector64 function. This function is only needed on 64-bit host operating systems and is thus not included for 32-bit hosts. -Debug output: print the input and result for invocations of the _OSI reserved +Debug output: print the input and result for invocations of the _OSI +reserved control method via the ACPI_LV_INFO debug level. Also, reduced some of the verbosity of this debug level. Len Brown. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2731,10 +3393,14 @@ Added the 2009 copyright to all module headers and signons. This affects virtually every file in the ACPICA core subsystem, the iASL compiler, and the tools/utilities. -Implemented a change to allow the host to override any ACPI table, including -dynamically loaded tables. Previously, only the DSDT could be replaced by the -host. With this change, the AcpiOsTableOverride interface is called for each -table found in the RSDT/XSDT during ACPICA initialization, and also whenever +Implemented a change to allow the host to override any ACPI table, +including +dynamically loaded tables. Previously, only the DSDT could be replaced by +the +host. With this change, the AcpiOsTableOverride interface is called for +each +table found in the RSDT/XSDT during ACPICA initialization, and also +whenever a table is dynamically loaded via the AML Load operator. Updated FADT flag definitions, especially the Boot Architecture flags. @@ -2745,7 +3411,8 @@ with the actual namespace entry which is itself padded with underscores. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2759,11 +3426,13 @@ much larger code and data size. Fix build error under Bison-2.4. -Dissasembler: Enhanced FADT support. Added decoding of the Boot Architecture +Dissasembler: Enhanced FADT support. Added decoding of the Boot +Architecture flags. Now decode all flags, regardless of the FADT version. Flag output includes the FADT version which first defined each flag. -The iASL -g option now dumps the RSDT to a file (in addition to the FADT and +The iASL -g option now dumps the RSDT to a file (in addition to the FADT +and DSDT). Windows only. ---------------------------------------- @@ -2771,7 +3440,8 @@ DSDT). Windows only. 1) ACPI CA Core Subsystem: -The ACPICA Programmer Reference has been completely updated and revamped for +The ACPICA Programmer Reference has been completely updated and revamped +for this release. This includes updates to the external interfaces, OSL interfaces, the overview sections, and the debugger reference. @@ -2785,31 +3455,37 @@ AcpiGbl_CurrentGpeCount - Tracks the current number of available GPEs. AcpiRead - Low-level read ACPI register (was HwLowLevelRead.) AcpiWrite - Low-level write ACPI register (was HwLowLevelWrite.) -Most of the public ACPI hardware-related interfaces have been moved to a new +Most of the public ACPI hardware-related interfaces have been moved to a +new file, components/hardware/hwxface.c Enhanced the FADT parsing and low-level ACPI register access: The ACPI register lengths within the FADT are now used, and the low level ACPI register access no longer hardcodes the ACPI register lengths. Given that -there may be some risk in actually trusting the FADT register lengths, a run- +there may be some risk in actually trusting the FADT register lengths, a +run- time option was added to fall back to the default hardcoded lengths if the FADT proves to contain incorrect values - UseDefaultRegisterWidths. This -option is set to true for now, and a warning is issued if a suspicious FADT +option is set to true for now, and a warning is issued if a suspicious +FADT register length is overridden with the default value. -Fixed a reference count issue in NsRepairObject. This problem was introduced +Fixed a reference count issue in NsRepairObject. This problem was +introduced in version 20081031 as part of a fix to repair Buffer objects within Packages. Lin Ming. Added semaphore support to the Linux/Unix application OS-services layer (OSL). ACPICA BZ 448. Lin Ming. -Added the ACPI_MUTEX_TYPE configuration option to select whether mutexes will +Added the ACPI_MUTEX_TYPE configuration option to select whether mutexes +will be implemented in the OSL, or will binary semaphores be used instead. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2821,14 +3497,16 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Completed the '-e' option to include additional ACPI tables in order to +iASL: Completed the '-e' option to include additional ACPI tables in order +to aid with disassembly and External statement generation. ACPICA BZ 742. Lin Ming. iASL: Removed the "named object in while loop" error. The compiler cannot determine how many times a loop will execute. ACPICA BZ 730. -Disassembler: Implemented support for FADT revision 2 (MS extension). ACPICA +Disassembler: Implemented support for FADT revision 2 (MS extension). +ACPICA BZ 743. Disassembler: Updates for several ACPI data tables (HEST, EINJ, and MCFG). @@ -2838,24 +3516,33 @@ Disassembler: Updates for several ACPI data tables (HEST, EINJ, and MCFG). 1) ACPI CA Core Subsystem: -Restructured the ACPICA header files into public/private. acpi.h now includes -only the "public" acpica headers. All other acpica headers are "private" and -should not be included by acpica users. One new file, accommon.h is used to -include the commonly used private headers for acpica code generation. Future +Restructured the ACPICA header files into public/private. acpi.h now +includes +only the "public" acpica headers. All other acpica headers are "private" +and +should not be included by acpica users. One new file, accommon.h is used +to +include the commonly used private headers for acpica code generation. +Future plans include moving all private headers to a new subdirectory. Implemented an automatic Buffer->String return value conversion for predefined ACPI methods. For these methods (such as _BIF), added automatic -conversion for return objects that are required to be a String, but a Buffer -was found instead. This can happen when reading string battery data from an +conversion for return objects that are required to be a String, but a +Buffer +was found instead. This can happen when reading string battery data from +an operation region, because it used to be difficult to convert the data from buffer to string from within the ASL. Ensures that the host OS is provided with a valid null-terminated string. Linux BZ 11822. -Updated the FACS waking vector interfaces. Split AcpiSetFirmwareWakingVector -into two: one for the 32-bit vector, another for the 64-bit vector. This is +Updated the FACS waking vector interfaces. Split +AcpiSetFirmwareWakingVector +into two: one for the 32-bit vector, another for the 64-bit vector. This +is required because the host OS must setup the wake much differently for each -vector (real vs. protected mode, etc.) and the interface itself should not be +vector (real vs. protected mode, etc.) and the interface itself should not +be deciding which vector to use. Also, eliminated the GetFirmwareWakingVector interface, as it served no purpose (only the firmware reads the vector, OS only writes the vector.) ACPICA BZ 731. @@ -2864,7 +3551,8 @@ Implemented a mechanism to escape infinite AML While() loops. Added a loop counter to force exit from AML While loops if the count becomes too large. This can occur in poorly written AML when the hardware does not respond within a while loop and the loop does not implement a timeout. The maximum -loop count is configurable. A new exception code is returned when a loop is +loop count is configurable. A new exception code is returned when a loop +is broken, AE_AML_INFINITE_LOOP. Alexey Starikovskiy, Bob Moore. Optimized the execution of AML While loops. Previously, a control state @@ -2872,37 +3560,46 @@ object was allocated and freed for each execution of the loop. The optimization is to simply reuse the control state for each iteration. This speeds up the raw loop execution time by about 5%. -Enhanced the implicit return mechanism. For Windows compatibility, return an -implicit integer of value zero for methods that contain no executable code. +Enhanced the implicit return mechanism. For Windows compatibility, return +an +implicit integer of value zero for methods that contain no executable +code. Such methods are seen in the field as stubs (presumably), and can cause drivers to fail if they expect a return value. Lin Ming. Allow multiple backslashes as root prefixes in namepaths. In a fully -qualified namepath, allow multiple backslash prefixes. This can happen (and +qualified namepath, allow multiple backslash prefixes. This can happen +(and is seen in the field) because of the use of a double-backslash in strings (since backslash is the escape character) causing confusion. ACPICA BZ 739 Lin Ming. Emit a warning if two different FACS or DSDT tables are discovered in the -FADT. Checks if there are two valid but different addresses for the FACS and +FADT. Checks if there are two valid but different addresses for the FACS +and DSDT within the FADT (mismatch between the 32-bit and 64-bit fields.) -Consolidated the method argument count validation code. Merged the code that +Consolidated the method argument count validation code. Merged the code +that validates control method argument counts into the predefined validation -module. Eliminates possible multiple warnings for incorrect argument counts. +module. Eliminates possible multiple warnings for incorrect argument +counts. Implemented ACPICA example code. Includes code for ACPICA initialization, handler installation, and calling a control method. Available at source/tools/examples. -Added a global pointer for FACS table to simplify internal FACS access. Use -the global pointer instead of using AcpiGetTableByIndex for each FACS access. +Added a global pointer for FACS table to simplify internal FACS access. +Use +the global pointer instead of using AcpiGetTableByIndex for each FACS +access. This simplifies the code for the Global Lock and the Firmware Waking Vector(s). Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2914,14 +3611,18 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -iASL: Improved disassembly of external method calls. Added the -e option to -allow the inclusion of additional ACPI tables to help with the disassembly of +iASL: Improved disassembly of external method calls. Added the -e option +to +allow the inclusion of additional ACPI tables to help with the disassembly +of method invocations and the generation of external declarations during the disassembly. Certain external method invocations cannot be disassembled -properly without the actual declaration of the method. Use the -e option to +properly without the actual declaration of the method. Use the -e option +to include the table where the external method(s) are actually declared. Most useful for disassembling SSDTs that make method calls back to the master -DSDT. Lin Ming. Example: To disassemble an SSDT with calls to DSDT: iasl -d +DSDT. Lin Ming. Example: To disassemble an SSDT with calls to DSDT: iasl +-d -e dsdt.aml ssdt1.aml iASL: Fix to allow references to aliases within ASL namepaths. Fixes a @@ -2934,25 +3635,34 @@ references from the Alias operator itself. ACPICA BZ 738. 1) ACPI CA Core Subsystem: -Designed and implemented a mechanism to validate predefined ACPI methods and -objects. This code validates the predefined ACPI objects (objects whose names +Designed and implemented a mechanism to validate predefined ACPI methods +and +objects. This code validates the predefined ACPI objects (objects whose +names start with underscore) that appear in the namespace, at the time they are evaluated. The argument count and the type of the returned object are -validated against the ACPI specification. The purpose of this validation is -to detect problems with the BIOS-implemented predefined ACPI objects before -the results are returned to the ACPI-related drivers. Future enhancements may +validated against the ACPI specification. The purpose of this validation +is +to detect problems with the BIOS-implemented predefined ACPI objects +before +the results are returned to the ACPI-related drivers. Future enhancements +may include actual repair of incorrect return objects where possible. Two new files are nspredef.c and acpredef.h. Fixed a fault in the AML parser if a memory allocation fails during the Op completion routine AcpiPsCompleteThisOp. Lin Ming. ACPICA BZ 492. -Fixed an issue with implicit return compatibility. This change improves the -implicit return mechanism to be more compatible with the MS interpreter. Lin +Fixed an issue with implicit return compatibility. This change improves +the +implicit return mechanism to be more compatible with the MS interpreter. +Lin Ming, ACPICA BZ 349. -Implemented support for zero-length buffer-to-string conversions. Allow zero -length strings during interpreter buffer-to-string conversions. For example, +Implemented support for zero-length buffer-to-string conversions. Allow +zero +length strings during interpreter buffer-to-string conversions. For +example, during the ToDecimalString and ToHexString operators, as well as implicit conversions. Fiodor Suietov, ACPICA BZ 585. @@ -2962,18 +3672,22 @@ similar in that they use a stack of state objects in order to eliminate recursion. The stack must be fully unwound and deallocated if an error occurs. Lin Ming. ACPICA BZ 383. -Removed the unused ACPI_BITREG_WAKE_ENABLE definition and entry in the global +Removed the unused ACPI_BITREG_WAKE_ENABLE definition and entry in the +global ACPI register table. This bit does not exist and is unused. Lin Ming, Bob Moore ACPICA BZ 442. Removed the obsolete version number in module headers. Removed the -"$Revision" number that appeared in each module header. This version number -was useful under SourceSafe and CVS, but has no meaning under git. It is not +"$Revision" number that appeared in each module header. This version +number +was useful under SourceSafe and CVS, but has no meaning under git. It is +not only incorrect, it could also be misleading. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -2991,41 +3705,53 @@ much larger code and data size. Completed a major cleanup of the internal ACPI_OPERAND_OBJECT of type Reference. Changes include the elimination of cheating on the Object field for the DdbHandle subtype, addition of a reference class field to -differentiate the various reference types (instead of an AML opcode), and the +differentiate the various reference types (instead of an AML opcode), and +the cleanup of debug output for this object. Lin Ming, Bob Moore. BZ 723 Reduce an error to a warning for an incorrect method argument count. Previously aborted with an error if too few arguments were passed to a -control method via the external ACPICA interface. Now issue a warning instead +control method via the external ACPICA interface. Now issue a warning +instead and continue. Handles the case where the method inadvertently declares too -many arguments, but does not actually use the extra ones. Applies mainly to +many arguments, but does not actually use the extra ones. Applies mainly +to the predefined methods. Lin Ming. Linux BZ 11032. -Disallow the evaluation of named object types with no intrinsic value. Return -AE_TYPE for objects that have no value and therefore evaluation is undefined: -Device, Event, Mutex, Region, Thermal, and Scope. Previously, evaluation of -these types were allowed, but an exception would be generated at some point +Disallow the evaluation of named object types with no intrinsic value. +Return +AE_TYPE for objects that have no value and therefore evaluation is +undefined: +Device, Event, Mutex, Region, Thermal, and Scope. Previously, evaluation +of +these types were allowed, but an exception would be generated at some +point during the evaluation. Now, the error is generated up front. Fixed a possible memory leak in the AcpiNsGetExternalPathname function (nsnames.c). Fixes a leak in the error exit path. -Removed the obsolete debug levels ACPI_DB_WARN and ACPI_DB_ERROR. These debug -levels were made obsolete by the ACPI_WARNING, ACPI_ERROR, and ACPI_EXCEPTION +Removed the obsolete debug levels ACPI_DB_WARN and ACPI_DB_ERROR. These +debug +levels were made obsolete by the ACPI_WARNING, ACPI_ERROR, and +ACPI_EXCEPTION interfaces. Also added ACPI_DB_EVENTS to correspond with the existing ACPI_LV_EVENTS. Removed obsolete and/or unused exception codes from the acexcep.h header. -There is the possibility that certain device drivers may be affected if they +There is the possibility that certain device drivers may be affected if +they use any of these exceptions. -The ACPICA documentation has been added to the public git source tree, under +The ACPICA documentation has been added to the public git source tree, +under acpica/documents. Included are the ACPICA programmer reference, the iASL compiler reference, and the changes.txt release logfile. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3043,12 +3769,15 @@ argument. iASL now allows both definitions. iASL/disassembler: avoid infinite loop on bad ACPI tables. Check for zero- length subtables when disassembling ACPI tables. Also fixed a couple of -errors where a full 16-bit table type field was not extracted from the input +errors where a full 16-bit table type field was not extracted from the +input properly. acpisrc: Improve comment counting mechanism for generating source code -statistics. Count first and last lines of multi-line comments as whitespace, -not comment lines. Handle Linux legal header in addition to standard acpica +statistics. Count first and last lines of multi-line comments as +whitespace, +not comment lines. Handle Linux legal header in addition to standard +acpica header. ---------------------------------------- @@ -3058,41 +3787,54 @@ header. 1) ACPI CA Core Subsystem: Fix a possible deadlock in the GPE dispatch. Remove call to -AcpiHwDisableAllGpes during wake in AcpiEvGpeDispatch. This call will attempt -to acquire the GPE lock but can deadlock since the GPE lock is already held -at dispatch time. This code was introduced in version 20060831 as a response +AcpiHwDisableAllGpes during wake in AcpiEvGpeDispatch. This call will +attempt +to acquire the GPE lock but can deadlock since the GPE lock is already +held +at dispatch time. This code was introduced in version 20060831 as a +response to Linux BZ 6881 and has since been removed from Linux. -Add a function to dereference returned reference objects. Examines the return -object from a call to AcpiEvaluateObject. Any Index or RefOf references are +Add a function to dereference returned reference objects. Examines the +return +object from a call to AcpiEvaluateObject. Any Index or RefOf references +are automatically dereferenced in an attempt to return something useful (these -reference types cannot be converted into an external ACPI_OBJECT.) Provides +reference types cannot be converted into an external ACPI_OBJECT.) +Provides MS compatibility. Lin Ming, Bob Moore. Linux BZ 11105 x2APIC support: changes for MADT and SRAT ACPI tables. There are 2 new subtables for the MADT and one new subtable for the SRAT. Includes -disassembler and AcpiSrc support. Data from the Intel 64 Architecture x2APIC +disassembler and AcpiSrc support. Data from the Intel 64 Architecture +x2APIC Specification, June 2008. -Additional error checking for pathname utilities. Add error check after all +Additional error checking for pathname utilities. Add error check after +all calls to AcpiNsGetPathnameLength. Add status return from -AcpiNsBuildExternalPath and check after all calls. Add parameter validation +AcpiNsBuildExternalPath and check after all calls. Add parameter +validation to AcpiUtInitializeBuffer. Reported by and initial patch by Ingo Molnar. -Return status from the global init function AcpiUtGlobalInitialize. This is +Return status from the global init function AcpiUtGlobalInitialize. This +is used by both the kernel subsystem and the utilities such as iASL compiler. The function could possibly fail when the caches are initialized. Yang Yi. Add a function to decode reference object types to strings. Created for improved error messages. -Improve object conversion error messages. Better error messages during object -conversion from internal to the external ACPI_OBJECT. Used for external calls +Improve object conversion error messages. Better error messages during +object +conversion from internal to the external ACPI_OBJECT. Used for external +calls to AcpiEvaluateObject. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3106,7 +3848,8 @@ much larger code and data size. Debugger: fix a possible hang when evaluating non-methods. Fixes a problem introduced in version 20080701. If the object being evaluated (via execute -command) is not a method, the debugger can hang while trying to obtain non- +command) is not a method, the debugger can hang while trying to obtain +non- existent parameters. iASL: relax error for using reserved "_T_x" identifiers. These names can @@ -3114,16 +3857,21 @@ appear in a disassembled ASL file if they were emitted by the original compiler. Instead of issuing an error or warning and forcing the user to manually change these names, issue a remark instead. -iASL: error if named object created in while loop. Emit an error if any named -object is created within a While loop. If allowed, this code will generate a -run-time error on the second iteration of the loop when an attempt is made to +iASL: error if named object created in while loop. Emit an error if any +named +object is created within a While loop. If allowed, this code will generate +a +run-time error on the second iteration of the loop when an attempt is made +to create the same named object twice. ACPICA bugzilla 730. -iASL: Support absolute pathnames for include files. Add support for absolute +iASL: Support absolute pathnames for include files. Add support for +absolute pathnames within the Include operator. previously, only relative pathnames were supported. -iASL: Enforce minimum 1 interrupt in interrupt macro and Resource Descriptor. +iASL: Enforce minimum 1 interrupt in interrupt macro and Resource +Descriptor. The ACPI spec requires one interrupt minimum. BZ 423 iASL: Handle a missing ResourceSource arg, with a present SourceIndex. @@ -3131,13 +3879,16 @@ Handles the case for the Interrupt Resource Descriptor where the ResourceSource argument is omitted but ResourceSourceIndex is present. Now leave room for the Index. BZ 426 -iASL: Prevent error message if CondRefOf target does not exist. Fixes cases +iASL: Prevent error message if CondRefOf target does not exist. Fixes +cases where an error message is emitted if the target does not exist. BZ 516 iASL: Fix broken -g option (get Windows ACPI tables). Fixes the -g option -(get ACPI tables on Windows). This was apparently broken in version 20070919. +(get ACPI tables on Windows). This was apparently broken in version +20070919. -AcpiXtract: Handle EOF while extracting data. Correctly handle the case where +AcpiXtract: Handle EOF while extracting data. Correctly handle the case +where the EOF happens immediately after the last table in the input file. Print completion message. Previously, no message was displayed in this case. @@ -3152,9 +3903,12 @@ source tree. 1) ACPI CA Core Subsystem: Implemented a "careful" GPE disable in AcpiEvDisableGpe, only modify one -enable bit. Now performs a read-change-write of the enable register instead -of simply writing out the cached enable mask. This will prevent inadvertent -enabling of GPEs if a rogue GPE is received during initialization (before GPE +enable bit. Now performs a read-change-write of the enable register +instead +of simply writing out the cached enable mask. This will prevent +inadvertent +enabling of GPEs if a rogue GPE is received during initialization (before +GPE handlers are installed.) Implemented a copy for dynamically loaded tables. Previously, dynamically @@ -3164,32 +3918,41 @@ OpRegion case, added checksum verify. Use the table length from the table header, not the region length. For the Buffer case, use the table length also. Dennis Noordsij, Bob Moore. BZ 10734 -Fixed a problem where the same ACPI table could not be dynamically loaded and -unloaded more than once. Without this change, a table cannot be loaded again +Fixed a problem where the same ACPI table could not be dynamically loaded +and +unloaded more than once. Without this change, a table cannot be loaded +again once it has been loaded/unloaded one time. The current mechanism does not -unregister a table upon an unload. During a load, if the same table is found, +unregister a table upon an unload. During a load, if the same table is +found, this no longer returns an exception. BZ 722 Fixed a problem where the wrong descriptor length was calculated for the EndTag descriptor in 64-bit mode. The "minimal" descriptors such as EndTag are calculated as 12 bytes long, but the actual length in the internal -descriptor is 16 because of the round-up to 8 on the 64-bit build. Reported +descriptor is 16 because of the round-up to 8 on the 64-bit build. +Reported by Linn Crosetto. BZ 728 -Fixed a possible memory leak in the Unload operator. The DdbHandle returned -by Load() did not have its reference count decremented during unload, leading +Fixed a possible memory leak in the Unload operator. The DdbHandle +returned +by Load() did not have its reference count decremented during unload, +leading to a memory leak. Lin Ming. BZ 727 Fixed a possible memory leak when deleting thermal/processor objects. Any associated notify handlers (and objects) were not being deleted. Fiodor Suietov. BZ 506 -Fixed the ordering of the ASCII names in the global mutex table to match the -actual mutex IDs. Used by AcpiUtGetMutexName, a function used for debug only. +Fixed the ordering of the ASCII names in the global mutex table to match +the +actual mutex IDs. Used by AcpiUtGetMutexName, a function used for debug +only. Vegard Nossum. BZ 726 Enhanced the AcpiGetObjectInfo interface to return the number of required -arguments if the object is a control method. Added this call to the debugger +arguments if the object is a control method. Added this call to the +debugger so the proper number of default arguments are passed to a method. This prevents a warning when executing methods from AcpiExec. @@ -3200,7 +3963,8 @@ Fixed an extraneous warning from exconfig.c on the 64-bit build. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3215,20 +3979,26 @@ much larger code and data size. iASL: Added two missing ACPI reserved names. Added _MTP and _ASZ, both resource descriptor names. -iASL: Detect invalid ASCII characters in input (windows version). Removed the +iASL: Detect invalid ASCII characters in input (windows version). Removed +the "-CF" flag from the flex compile, enables correct detection of non-ASCII characters in the input. BZ 441 -iASL: Eliminate warning when result of LoadTable is not used. Eliminate the +iASL: Eliminate warning when result of LoadTable is not used. Eliminate +the "result of operation not used" warning when the DDB handle returned from LoadTable is not used. The warning is not needed. BZ 590 -AcpiExec: Add support for dynamic table load/unload. Now calls _CFG method to -pass address of table to the AML. Added option to disable OpRegion simulation -to allow creation of an OpRegion with a real address that was passed to _CFG. +AcpiExec: Add support for dynamic table load/unload. Now calls _CFG method +to +pass address of table to the AML. Added option to disable OpRegion +simulation +to allow creation of an OpRegion with a real address that was passed to +_CFG. All of this allows testing of the Load and Unload operators from AcpiExec. -Debugger: update tables command for unloaded tables. Handle unloaded tables +Debugger: update tables command for unloaded tables. Handle unloaded +tables and use the standard table header output routine. ---------------------------------------- @@ -3236,49 +4006,63 @@ and use the standard table header output routine. 1) ACPI CA Core Subsystem: -Implemented a workaround for reversed _PRT entries. A significant number of +Implemented a workaround for reversed _PRT entries. A significant number +of BIOSs erroneously reverse the _PRT SourceName and the SourceIndex. This -change dynamically detects and repairs this problem. Provides compatibility +change dynamically detects and repairs this problem. Provides +compatibility with MS ACPI. BZ 6859 Simplified the internal ACPI hardware interfaces to eliminate the locking flag parameter from Register Read/Write. Added a new external interface, AcpiGetRegisterUnlocked. -Fixed a problem where the invocation of a GPE control method could hang. This +Fixed a problem where the invocation of a GPE control method could hang. +This was a regression introduced in 20080514. The new method argument count validation mechanism can enter an infinite loop when a GPE method is -dispatched. Problem fixed by removing the obsolete code that passed GPE block -information to the notify handler via the control method parameter pointer. +dispatched. Problem fixed by removing the obsolete code that passed GPE +block +information to the notify handler via the control method parameter +pointer. -Fixed a problem where the _SST execution status was incorrectly returned to +Fixed a problem where the _SST execution status was incorrectly returned +to the caller of AcpiEnterSleepStatePrep. This was a regression introduced in 20080514. _SST is optional and a NOT_FOUND exception should never be returned. BZ 716 -Fixed a problem where a deleted object could be accessed from within the AML -parser. This was a regression introduced in version 20080123 as a fix for the +Fixed a problem where a deleted object could be accessed from within the +AML +parser. This was a regression introduced in version 20080123 as a fix for +the Unload operator. Lin Ming. BZ 10669 -Cleaned up the debug operand dump mechanism. Eliminated unnecessary operands +Cleaned up the debug operand dump mechanism. Eliminated unnecessary +operands and eliminated the use of a negative index in a loop. Operands are now -displayed in the correct order, not backwards. This also fixes a regression +displayed in the correct order, not backwards. This also fixes a +regression introduced in 20080514 on 64-bit systems where the elimination of -ACPI_NATIVE_UINT caused the negative index to go large and positive. BZ 715 +ACPI_NATIVE_UINT caused the negative index to go large and positive. BZ +715 -Fixed a possible memory leak in EvPciConfigRegionSetup where the error exit +Fixed a possible memory leak in EvPciConfigRegionSetup where the error +exit path did not delete a locally allocated structure. Updated definitions for the DMAR and SRAT tables to synchronize with the current specifications. Includes disassembler support. Fixed a problem in the mutex debug code (in utmutex.c) where an incorrect -loop termination value was used. Loop terminated on iteration early, missing +loop termination value was used. Loop terminated on iteration early, +missing one mutex. Linn Crosetto Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3304,38 +4088,52 @@ Disassembler: Added support for DMAR and SRAT table definition changes. Fixed a problem where GPEs were enabled too early during the ACPICA initialization. This could lead to "handler not installed" errors on some -machines. Moved GPE enable until after _REG/_STA/_INI methods are run. This -ensures that all operation regions and devices throughout the namespace have +machines. Moved GPE enable until after _REG/_STA/_INI methods are run. +This +ensures that all operation regions and devices throughout the namespace +have been initialized before GPEs are enabled. Alexey Starikovskiy, BZ 9916. Implemented a change to the enter sleep code. Moved execution of the _GTS -method to just before setting sleep enable bit. The execution was moved from +method to just before setting sleep enable bit. The execution was moved +from AcpiEnterSleepStatePrep to AcpiEnterSleepState. _GTS is now executed immediately before the SLP_EN bit is set, as per the ACPI specification. Luming Yu, BZ 1653. -Implemented a fix to disable unknown GPEs (2nd version). Now always disable +Implemented a fix to disable unknown GPEs (2nd version). Now always +disable the GPE, even if ACPICA thinks that that it is already disabled. It is -possible that the AML or some other code has enabled the GPE unbeknownst to +possible that the AML or some other code has enabled the GPE unbeknownst +to the ACPICA code. -Fixed a problem with the Field operator where zero-length fields would return -an AE_AML_NO_OPERAND exception during table load. Fix enables zero-length ASL +Fixed a problem with the Field operator where zero-length fields would +return +an AE_AML_NO_OPERAND exception during table load. Fix enables zero-length +ASL field declarations in Field(), BankField(), and IndexField(). BZ 10606. -Implemented a fix for the Load operator, now load the table at the namespace -root. This reverts a change introduced in version 20071019. The table is now +Implemented a fix for the Load operator, now load the table at the +namespace +root. This reverts a change introduced in version 20071019. The table is +now loaded at the namespace root even though this goes against the ACPI -specification. This provides compatibility with other ACPI implementations. -The ACPI specification will be updated to reflect this in ACPI 4.0. Lin Ming. +specification. This provides compatibility with other ACPI +implementations. +The ACPI specification will be updated to reflect this in ACPI 4.0. Lin +Ming. -Fixed a problem where ACPICA would not Load() tables with unusual signatures. +Fixed a problem where ACPICA would not Load() tables with unusual +signatures. Now ignore ACPI table signature for Load() operator. Only "SSDT" is acceptable to the ACPI spec, but tables are seen with OEMx and null sigs. -Therefore, signature validation is worthless. Apparently MS ACPI accepts such +Therefore, signature validation is worthless. Apparently MS ACPI accepts +such signatures, ACPICA must be compatible. BZ 10454. -Fixed a possible negative array index in AcpiUtValidateException. Added NULL +Fixed a possible negative array index in AcpiUtValidateException. Added +NULL fields to the exception string arrays to eliminate a -1 subtraction on the SubStatus field. @@ -3345,12 +4143,16 @@ instead of pointers to static strings. Jan Beulich and Bob Moore. Implemented argument count checking in control method invocation via AcpiEvaluateObject. Now emit an error if too few arguments, warning if too -many. This applies only to extern programmatic control method execution, not +many. This applies only to extern programmatic control method execution, +not method-to-method calls within the AML. Lin Ming. -Eliminated the ACPI_NATIVE_UINT type across all ACPICA code. This type is no -longer needed, especially with the removal of 16-bit support. It was replaced -mostly with UINT32, but also ACPI_SIZE where a type that changes 32/64 bit on +Eliminated the ACPI_NATIVE_UINT type across all ACPICA code. This type is +no +longer needed, especially with the removal of 16-bit support. It was +replaced +mostly with UINT32, but also ACPI_SIZE where a type that changes 32/64 bit +on 32/64-bit platforms is required. Added the C const qualifier for appropriate string constants -- mostly @@ -3358,7 +4160,8 @@ MODULE_NAME and printf format strings. Jan Beulich. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has a +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3371,7 +4174,8 @@ much larger code and data size. 2) iASL Compiler/Disassembler and Tools: Implemented ACPI table revision ID validation in the disassembler. Zero is -always invalid. For DSDTs, the ID controls the interpreter integer width. 1 +always invalid. For DSDTs, the ID controls the interpreter integer width. +1 means 32-bit and this is unusual. 2 or greater is 64-bit. ---------------------------------------- @@ -3381,45 +4185,60 @@ means 32-bit and this is unusual. 2 or greater is 64-bit. Implemented an additional change to the GPE support in order to suppress spurious or stray GPEs. The AcpiEvDisableGpe function will now permanently -disable incoming GPEs that are neither enabled nor disabled -- meaning that -the GPE is unknown to the system. This should prevent future interrupt floods +disable incoming GPEs that are neither enabled nor disabled -- meaning +that +the GPE is unknown to the system. This should prevent future interrupt +floods from that GPE. BZ 6217 (Zhang Rui) Fixed a problem where NULL package elements were not returned to the AcpiEvaluateObject interface correctly. The element was simply ignored -instead of returning a NULL ACPI_OBJECT package element, potentially causing -a buffer overflow and/or confusing the caller who expected a fixed number of +instead of returning a NULL ACPI_OBJECT package element, potentially +causing +a buffer overflow and/or confusing the caller who expected a fixed number +of elements. BZ 10132 (Lin Ming, Bob Moore) -Fixed a problem with the CreateField, CreateXXXField (Bit, Byte, Word, Dword, -Qword), Field, BankField, and IndexField operators when invoked from inside -an executing control method. In this case, these operators created namespace +Fixed a problem with the CreateField, CreateXXXField (Bit, Byte, Word, +Dword, +Qword), Field, BankField, and IndexField operators when invoked from +inside +an executing control method. In this case, these operators created +namespace nodes that were incorrectly left marked as permanent nodes instead of temporary nodes. This could cause a problem if there is race condition -between an exiting control method and a running namespace walk. (Reported by +between an exiting control method and a running namespace walk. (Reported +by Linn Crosetto) Fixed a problem where the CreateField and CreateXXXField operators would -incorrectly allow duplicate names (the name of the field) with no exception +incorrectly allow duplicate names (the name of the field) with no +exception generated. -Implemented several changes for Notify handling. Added support for new Notify +Implemented several changes for Notify handling. Added support for new +Notify values (ACPI 2.0+) and improved the Notify debug output. Notify on PowerResource objects is no longer allowed, as per the ACPI specification. (Bob Moore, Zhang Rui) -All Reference Objects returned via the AcpiEvaluateObject interface are now -marked as type "REFERENCE" instead of "ANY". The type ANY is now reserved for -NULL objects - either NULL package elements or unresolved named references. +All Reference Objects returned via the AcpiEvaluateObject interface are +now +marked as type "REFERENCE" instead of "ANY". The type ANY is now reserved +for +NULL objects - either NULL package elements or unresolved named +references. Fixed a problem where an extraneous debug message was produced for package objects (when debugging enabled). The message "Package List length larger than NumElements count" is now produced in the correct case, and is now an error message rather than a debug message. Added a debug message for the -opposite case, where NumElements is larger than the Package List (the package +opposite case, where NumElements is larger than the Package List (the +package will be padded out with NULL elements as per the ACPI spec.) -Implemented several improvements for the output of the ASL "Debug" object to +Implemented several improvements for the output of the ASL "Debug" object +to clarify and keep all data for a given object on one output line. Fixed two size calculation issues with the variable-length Start Dependent @@ -3427,7 +4246,8 @@ resource descriptor. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3443,34 +4263,45 @@ Fixed a problem with the use of the Switch operator where execution of the containing method by multiple concurrent threads could cause an AE_ALREADY_EXISTS exception. This is caused by the fact that there is no actual Switch opcode, it must be simulated with local named temporary -variables and if/else pairs. The solution chosen was to mark any method that -uses Switch as Serialized, thus preventing multiple thread entries. BZ 469. +variables and if/else pairs. The solution chosen was to mark any method +that +uses Switch as Serialized, thus preventing multiple thread entries. BZ +469. ---------------------------------------- 13 February 2008. Summary of changes for version 20080213: 1) ACPI CA Core Subsystem: -Implemented another MS compatibility design change for GPE/Notify handling. -GPEs are now cleared/enabled asynchronously to allow all pending notifies to +Implemented another MS compatibility design change for GPE/Notify +handling. +GPEs are now cleared/enabled asynchronously to allow all pending notifies +to complete first. It is expected that the OSL will queue the enable request -behind all pending notify requests (may require changes to the local host OSL +behind all pending notify requests (may require changes to the local host +OSL in AcpiOsExecute). Alexey Starikovskiy. Fixed a problem where buffer and package objects passed as arguments to a -control method via the external AcpiEvaluateObject interface could cause an +control method via the external AcpiEvaluateObject interface could cause +an AE_AML_INTERNAL exception depending on the order and type of operators executed by the target control method. Fixed a problem where resource descriptor size optimization could cause a problem when a _CRS resource template is passed to a _SRS method. The _SRS resource template must use the same descriptors (with the same size) as -returned from _CRS. This change affects the following resource descriptors: -IRQ / IRQNoFlags and StartDependendentFn / StartDependentFnNoPri. (BZ 9487) - -Fixed a problem where a CopyObject to RegionField, BankField, and IndexField -objects did not perform an implicit conversion as it should. These types must -retain their initial type permanently as per the ACPI specification. However, +returned from _CRS. This change affects the following resource +descriptors: +IRQ / IRQNoFlags and StartDependendentFn / StartDependentFnNoPri. (BZ +9487) + +Fixed a problem where a CopyObject to RegionField, BankField, and +IndexField +objects did not perform an implicit conversion as it should. These types +must +retain their initial type permanently as per the ACPI specification. +However, a CopyObject to all other object types should not perform an implicit conversion, as per the ACPI specification. (Lin Ming, Bob Moore) BZ 388 @@ -3478,7 +4309,8 @@ Fixed a problem with the AcpiGetDevices interface where the mechanism to match device CIDs did not examine the entire list of available CIDs, but instead aborted on the first non-matching CID. Andrew Patterson. -Fixed a regression introduced in version 20071114. The ACPI_HIDWORD macro was +Fixed a regression introduced in version 20071114. The ACPI_HIDWORD macro +was inadvertently changed to return a 16-bit value instead of a 32-bit value, truncating the upper dword of a 64-bit value. This macro is only used to display debug output, so no incorrect calculations were made. Also, @@ -3490,7 +4322,8 @@ statement. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3518,37 +4351,48 @@ the tools/utilities. Fixed a problem with the SizeOf operator when used with Package and Buffer objects. These objects have deferred execution for some arguments, and the -execution is now completed before the SizeOf is executed. This problem caused -unexpected AE_PACKAGE_LIMIT errors on some systems (Lin Ming, Bob Moore) BZ +execution is now completed before the SizeOf is executed. This problem +caused +unexpected AE_PACKAGE_LIMIT errors on some systems (Lin Ming, Bob Moore) +BZ 9558 -Implemented an enhancement to the interpreter "slack mode". In the absence of +Implemented an enhancement to the interpreter "slack mode". In the absence +of an explicit return or an implicitly returned object from the last executed -opcode, a control method will now implicitly return an integer of value 0 for +opcode, a control method will now implicitly return an integer of value 0 +for Microsoft compatibility. (Lin Ming) BZ 392 -Fixed a problem with the Load operator where an exception was not returned in +Fixed a problem with the Load operator where an exception was not returned +in the case where the table is already loaded. (Lin Ming) BZ 463 -Implemented support for the use of DDBHandles as an Indexed Reference, as per +Implemented support for the use of DDBHandles as an Indexed Reference, as +per the ACPI spec. (Lin Ming) BZ 486 -Implemented support for UserTerm (Method invocation) for the Unload operator +Implemented support for UserTerm (Method invocation) for the Unload +operator as per the ACPI spec. (Lin Ming) BZ 580 Fixed a problem with the LoadTable operator where the OemId and OemTableId -input strings could cause unexpected failures if they were shorter than the +input strings could cause unexpected failures if they were shorter than +the maximum lengths allowed. (Lin Ming, Bob Moore) BZ 576 -Implemented support for UserTerm (Method invocation) for the Unload operator +Implemented support for UserTerm (Method invocation) for the Unload +operator as per the ACPI spec. (Lin Ming) BZ 580 -Implemented header file support for new ACPI tables - BERT, ERST, EINJ, HEST, +Implemented header file support for new ACPI tables - BERT, ERST, EINJ, +HEST, IBFT, UEFI, WDAT. Disassembler support is forthcoming. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3560,15 +4404,19 @@ a much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -Implemented support in the disassembler for checksum validation on incoming -binary DSDTs and SSDTs. If incorrect, a message is displayed within the table +Implemented support in the disassembler for checksum validation on +incoming +binary DSDTs and SSDTs. If incorrect, a message is displayed within the +table header dump at the start of the disassembly. Implemented additional debugging information in the namespace listing file -created during compilation. In addition to the namespace hierarchy, the full +created during compilation. In addition to the namespace hierarchy, the +full pathname to each namespace object is displayed. -Fixed a problem with the disassembler where invalid ACPI tables could cause +Fixed a problem with the disassembler where invalid ACPI tables could +cause faults or infinite loops. Fixed an unexpected parse error when using the optional "parameter types" @@ -3578,7 +4426,8 @@ Fixed a problem where two External declarations with the same name did not cause an error (Lin Ming) BZ 509 Implemented support for full TermArgs (adding Argx, Localx and method -invocation) for the ParameterData parameter to the LoadTable operator. (Lin +invocation) for the ParameterData parameter to the LoadTable operator. +(Lin Ming) BZ 583,587 ---------------------------------------- @@ -3588,22 +4437,28 @@ Ming) BZ 583,587 Implemented full support for deferred execution for the TermArg string arguments for DataTableRegion. This enables forward references and full -operand resolution for the three string arguments. Similar to OperationRegion +operand resolution for the three string arguments. Similar to +OperationRegion deferred argument execution.) Lin Ming. BZ 430 Implemented full argument resolution support for the BankValue argument to -BankField. Previously, only constants were supported, now any TermArg may be +BankField. Previously, only constants were supported, now any TermArg may +be used. Lin Ming BZ 387, 393 Fixed a problem with AcpiGetDevices where the search of a branch of the device tree could be terminated prematurely. In accordance with the ACPI -specification, the search down the current branch is terminated if a device -is both not present and not functional (instead of just not present.) Yakui +specification, the search down the current branch is terminated if a +device +is both not present and not functional (instead of just not present.) +Yakui Zhao. -Fixed a problem where "unknown" GPEs could be allowed to fire repeatedly if +Fixed a problem where "unknown" GPEs could be allowed to fire repeatedly +if the underlying AML code changed the GPE enable registers. Now, any unknown -incoming GPE (no _Lxx/_Exx method and not the EC GPE) is immediately disabled +incoming GPE (no _Lxx/_Exx method and not the EC GPE) is immediately +disabled instead of simply ignored. Rui Zhang. Fixed a problem with Index Fields where the Index register was incorrectly @@ -3614,7 +4469,8 @@ the AML Interpreter slack mode is enabled. Lin Ming BZ 349 Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3631,13 +4487,15 @@ a much larger code and data size. Implemented event counters for each of the Fixed Events, the ACPI SCI (interrupt) itself, and control methods executed. Named -AcpiFixedEventCount[], AcpiSciCount, and AcpiMethodCount respectively. These +AcpiFixedEventCount[], AcpiSciCount, and AcpiMethodCount respectively. +These should be useful for debugging and statistics. Implemented a new external interface, AcpiGetStatistics, to retrieve the contents of the various event counters. Returns the current values for AcpiSciCount, AcpiGpeCount, the AcpiFixedEventCount array, and -AcpiMethodCount. The interface can be expanded in the future if new counters +AcpiMethodCount. The interface can be expanded in the future if new +counters are added. Device drivers should use this interface rather than access the counters directly. @@ -3646,22 +4504,28 @@ the ShortDivide function worked incorrectly, causing problems with the BCD functions with large input values. A truncation from 64-bit to 32-bit inadvertently occurred. Internal BZ 435. Lin Ming -Fixed a problem with Index references passed as method arguments. References -passed as arguments to control methods were dereferenced immediately (before +Fixed a problem with Index references passed as method arguments. +References +passed as arguments to control methods were dereferenced immediately +(before control was passed to the called method). The references are now correctly passed directly to the called method. BZ 5389. Lin Ming -Fixed a problem with CopyObject used in conjunction with the Index operator. -The reference was incorrectly dereferenced before the copy. The reference is +Fixed a problem with CopyObject used in conjunction with the Index +operator. +The reference was incorrectly dereferenced before the copy. The reference +is now correctly copied. BZ 5391. Lin Ming -Fixed a problem with Control Method references within Package objects. These +Fixed a problem with Control Method references within Package objects. +These references are now correctly generated. This completes the package construction overhaul that began in version 20071019. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3678,7 +4542,8 @@ The AcpiExec utility now installs handlers for all of the predefined Operation Region types. New types supported are: PCI_Config, CMOS, and PCIBARTarget. -Fixed a problem with the 64-bit version of AcpiExec where the extended (64- +Fixed a problem with the 64-bit version of AcpiExec where the extended +(64- bit) address fields for the DSDT and FACS within the FADT were not being used, causing truncation of the upper 32-bits of these addresses. Lin Ming and Bob Moore @@ -3691,12 +4556,15 @@ and Bob Moore Fixed a problem with the Alias operator when the target of the alias is a named ASL operator that opens a new scope -- Scope, Device, PowerResource, Processor, and ThermalZone. In these cases, any children of the original -operator could not be accessed via the alias, potentially causing unexpected +operator could not be accessed via the alias, potentially causing +unexpected AE_NOT_FOUND exceptions. (BZ 9067) Fixed a problem with the Package operator where all named references were -created as object references and left otherwise unresolved. According to the -ACPI specification, a Package can only contain Data Objects or references to +created as object references and left otherwise unresolved. According to +the +ACPI specification, a Package can only contain Data Objects or references +to control methods. The implication is that named references to Data Objects (Integer, Buffer, String, Package, BufferField, Field) should be resolved immediately upon package creation. This is the approach taken with this @@ -3705,11 +4573,13 @@ etc.) are all now properly created as reference objects. (BZ 5328) Reverted a change to Notify handling that was introduced in version 20070508. This version changed the Notify handling from asynchronous to -fully synchronous (Device driver Notify handling with respect to the Notify +fully synchronous (Device driver Notify handling with respect to the +Notify ASL operator). It was found that this change caused more problems than it solved and was removed by most users. -Fixed a problem with the Increment and Decrement operators where the type of +Fixed a problem with the Increment and Decrement operators where the type +of the target object could be unexpectedly and incorrectly changed. (BZ 353) Lin Ming. @@ -3720,19 +4590,24 @@ loaded into the root or current scope. Lin Ming. Fixed a problem with the Load operator when loading a table from a buffer object. The input buffer was prematurely zeroed and/or deleted. (BZ 577) -Fixed a problem with the Debug object where a store of a DdbHandle reference +Fixed a problem with the Debug object where a store of a DdbHandle +reference object to the Debug object could cause a fault. -Added a table checksum verification for the Load operator, in the case where +Added a table checksum verification for the Load operator, in the case +where the load is from a buffer. (BZ 578). -Implemented additional parameter validation for the LoadTable operator. The -length of the input strings SignatureString, OemIdString, and OemTableId are +Implemented additional parameter validation for the LoadTable operator. +The +length of the input strings SignatureString, OemIdString, and OemTableId +are now checked for maximum lengths. (BZ 582) Lin Ming. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3755,7 +4630,8 @@ version 20070917.) 1) ACPI CA Core Subsystem: Designed and implemented new external interfaces to install and remove -handlers for ACPI table-related events. Current events that are defined are +handlers for ACPI table-related events. Current events that are defined +are LOAD and UNLOAD. These interfaces allow the host to track ACPI tables as they are dynamically loaded and unloaded. See AcpiInstallTableHandler and AcpiRemoveTableHandler. (Lin Ming and Bob Moore) @@ -3770,7 +4646,8 @@ referenced from within the same control method (Lin Ming) BZ 341 Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3783,8 +4660,10 @@ a much larger code and data size. 2) iASL Compiler/Disassembler: -Implemented support to allow multiple files to be compiled/disassembled in a -single invocation. This includes command line wildcard support for both the +Implemented support to allow multiple files to be compiled/disassembled in +a +single invocation. This includes command line wildcard support for both +the Windows and Unix versions of the compiler. This feature simplifies the disassembly and compilation of multiple ACPI tables in a single directory. @@ -3793,12 +4672,14 @@ disassembly and compilation of multiple ACPI tables in a single directory. 1) ACPI CA Core Subsystem: -Implemented a Microsoft compatibility design change for the handling of the +Implemented a Microsoft compatibility design change for the handling of +the Notify AML operator. Previously, notify handlers were dispatched and executed completely asynchronously in a deferred thread. The new design still executes the notify handlers in a different thread, but the original thread that executed the Notify() now waits at a synchronization point for -the notify handler to complete. Some machines depend on a synchronous Notify +the notify handler to complete. Some machines depend on a synchronous +Notify operator in order to operate correctly. Implemented support to allow Package objects to be passed as method @@ -3807,15 +4688,18 @@ would return the AE_NOT_IMPLEMENTED exception. This feature had not been implemented since there were no reserved control methods that required it until recently. -Fixed a problem with the internal FADT conversion where ACPI 1.0 FADTs that +Fixed a problem with the internal FADT conversion where ACPI 1.0 FADTs +that contained invalid non-zero values in reserved fields could cause later failures because these fields have meaning in later revisions of the FADT. -For incoming ACPI 1.0 FADTs, these fields are now always zeroed. (The fields +For incoming ACPI 1.0 FADTs, these fields are now always zeroed. (The +fields are: Preferred_PM_Profile, PSTATE_CNT, CST_CNT, and IAPC_BOOT_FLAGS.) Fixed a problem where the Global Lock handle was not properly updated if a thread that acquired the Global Lock via executing AML code then attempted -to acquire the lock via the AcpiAcquireGlobalLock interface. Reported by Joe +to acquire the lock via the AcpiAcquireGlobalLock interface. Reported by +Joe Liu. Fixed a problem in AcpiEvDeleteGpeXrupt where the global interrupt list @@ -3824,7 +4708,8 @@ list. Reported by Linn Crosetto. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3847,41 +4732,51 @@ operand list has been parsed). The previous behavior caused several subtle incompatibilities with the Microsoft AML interpreter as well as being somewhat non-intuitive. BZ 7871, local BZ 263. Valery Podrezov. -Implemented a change to the ACPI Global Lock support. All interfaces to the +Implemented a change to the ACPI Global Lock support. All interfaces to +the global lock now allow the same thread to acquire the lock multiple times. -This affects the AcpiAcquireGlobalLock external interface to the global lock +This affects the AcpiAcquireGlobalLock external interface to the global +lock as well as the internal use of the global lock to support AML fields -- a -control method that is holding the global lock can now simultaneously access +control method that is holding the global lock can now simultaneously +access AML fields that require global lock protection. Previously, in both cases, -this would have resulted in an AE_ALREADY_ACQUIRED exception. The change to +this would have resulted in an AE_ALREADY_ACQUIRED exception. The change +to AcpiAcquireGlobalLock is of special interest to drivers for the Embedded -Controller. There is no change to the behavior of the AML Acquire operator, +Controller. There is no change to the behavior of the AML Acquire +operator, as this can already be used to acquire a mutex multiple times by the same thread. BZ 8066. With assistance from Alexey Starikovskiy. Fixed a problem where invalid objects could be referenced in the AML Interpreter after error conditions. During operand evaluation, ensure that the internal "Return Object" field is cleared on error and only valid -pointers are stored there. Caused occasional access to deleted objects that +pointers are stored there. Caused occasional access to deleted objects +that resulted in "large reference count" warning messages. Valery Podrezov. -Fixed a problem where an AE_STACK_OVERFLOW internal exception could occur on +Fixed a problem where an AE_STACK_OVERFLOW internal exception could occur +on deeply nested control method invocations. BZ 7873, local BZ 487. Valery Podrezov. Fixed an internal problem with the handling of result objects on the interpreter result stack. BZ 7872. Valery Podrezov. -Removed obsolete code that handled the case where AML_NAME_OP is the target +Removed obsolete code that handled the case where AML_NAME_OP is the +target of a reference (Reference.Opcode). This code was no longer necessary. BZ 7874. Valery Podrezov. -Removed obsolete ACPI_NO_INTEGER64_SUPPORT from two header files. This was a +Removed obsolete ACPI_NO_INTEGER64_SUPPORT from two header files. This was +a remnant from the previously discontinued 16-bit support. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3901,12 +4796,14 @@ virtually every file in the ACPICA core subsystem, the iASL compiler, and the utilities. Implemented a fix for an incorrect parameter passed to AcpiTbDeleteTable -during a table load. A bad pointer was passed in the case where the DSDT is +during a table load. A bad pointer was passed in the case where the DSDT +is overridden, causing a fault in this case. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3921,9 +4818,11 @@ a much larger code and data size. 1) ACPI CA Core Subsystem: -Support for 16-bit ACPICA has been completely removed since it is no longer +Support for 16-bit ACPICA has been completely removed since it is no +longer necessary and it clutters the code. All 16-bit macros, types, and -conditional compiles have been removed, cleaning up and simplifying the code +conditional compiles have been removed, cleaning up and simplifying the +code across the entire subsystem. DOS support is no longer needed since the bootable Linux firmware kit is now available. @@ -3933,16 +4832,20 @@ AcpiEvRemoveGlobalLockHandler function. (With assistance from Joel Bretz, HP) Implemented enhancements to the multithreading support within the debugger -to enable improved multithreading debugging and evaluation of the subsystem. +to enable improved multithreading debugging and evaluation of the +subsystem. (Valery Podrezov) -Debugger: Enhanced the Statistics/Memory command to emit the total (maximum) -memory used during the execution, as well as the maximum memory consumed by +Debugger: Enhanced the Statistics/Memory command to emit the total +(maximum) +memory used during the execution, as well as the maximum memory consumed +by each of the various object types. (Valery Podrezov) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -3969,9 +4872,11 @@ performing a bytewise read. (Region must be of type SystemMemory, see below.) Fixed the Load ASL operator for the case where the source operand is a -region field. A buffer object is also allowed as the source operand. BZ 480 +region field. A buffer object is also allowed as the source operand. BZ +480 -Fixed a problem where the Load ASL operator allowed the source operand to be +Fixed a problem where the Load ASL operator allowed the source operand to +be an operation region of any type. It is now restricted to regions of type SystemMemory, as per the ACPI specification. BZ 481 @@ -3980,13 +4885,15 @@ Additional cleanup and optimizations for the new Table Manager code. AcpiEnable will now fail if all of the required ACPI tables are not loaded (FADT, FACS, DSDT). BZ 477 -Added #pragma pack(8/4) to acobject.h to ensure that the structures in this +Added #pragma pack(8/4) to acobject.h to ensure that the structures in +this header are always compiled as aligned. The ACPI_OPERAND_OBJECT has been manually optimized to be aligned and will not work if it is byte-packed. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4017,11 +4924,14 @@ interpreter performance by ~25%, reduces code size, and reduces CPU stack use. (Valery Podrezov + interpreter changes in version 20051202 that eliminated namespace loading during the pass one parse.) -Implemented _CID support for PCI Root Bridge detection. If the _HID does not -match the predefined PCI Root Bridge IDs, the _CID list (if present) is now +Implemented _CID support for PCI Root Bridge detection. If the _HID does +not +match the predefined PCI Root Bridge IDs, the _CID list (if present) is +now obtained and also checked for an ID match. -Implemented additional support for the PCI _ADR execution: upsearch until a +Implemented additional support for the PCI _ADR execution: upsearch until +a device scope is found before executing _ADR. This allows PCI_Config operation regions to be declared locally within control methods underneath PCI device objects. @@ -4043,7 +4953,8 @@ of prefix handle and pathname. BZ 478 Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4055,7 +4966,8 @@ a much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -Ported the -g option (get local ACPI tables) to the new ACPICA Table Manager +Ported the -g option (get local ACPI tables) to the new ACPICA Table +Manager to restore original behavior. ---------------------------------------- @@ -4072,12 +4984,14 @@ obtained before it is actually obtained. The global lock semaphore was inadvertently created with one unit instead of zero units. (BZ 464) Fiodor Suietov. -Fixed a possible memory leak and fault in AcpiExResolveObjectToValue during +Fixed a possible memory leak and fault in AcpiExResolveObjectToValue +during a read from a buffer or region field. (BZ 458) Fiodor Suietov. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4091,7 +5005,8 @@ a much larger code and data size. 2) iASL Compiler/Disassembler and Tools: Fixed a compilation problem with the pre-defined Resource Descriptor field -names where an "object does not exist" error could be incorrectly generated +names where an "object does not exist" error could be incorrectly +generated if the parent ResourceTemplate pathname places the template within a different namespace scope than the current scope. (BZ 7212) @@ -4099,7 +5014,8 @@ Fixed a problem where the compiler could hang after syntax errors detected in an ElseIf construct. (BZ 453) Fixed a problem with the AmlFilename parameter to the DefinitionBlock() -operator. An incorrect output filename was produced when this parameter was +operator. An incorrect output filename was produced when this parameter +was a null string (""). Now, the original input filename is used as the AML output filename, with an ".aml" extension. @@ -4113,15 +5029,18 @@ any AML debugger command) (Valery Podrezov). Enhanced the implementation of the "serialized mode" of the interpreter (enabled via the AcpiGbl_AllMethodsSerialized flag.) When this mode is -specified, instead of creating a serialization semaphore per control method, +specified, instead of creating a serialization semaphore per control +method, the interpreter lock is simply no longer released before a blocking operation during control method execution. This effectively makes the AML Interpreter single-threaded. The overhead of a semaphore per-method is eliminated. -Fixed a regression where an error was no longer emitted if a control method +Fixed a regression where an error was no longer emitted if a control +method attempts to create 2 objects of the same name. This once again returns -AE_ALREADY_EXISTS. When this exception occurs, it invokes the mechanism that +AE_ALREADY_EXISTS. When this exception occurs, it invokes the mechanism +that will dynamically serialize the control method to possible prevent future errors. (BZ 440) @@ -4133,12 +5052,15 @@ AcpiHwInitialize function - the FADT registers are now validated when the table is loaded. Added two new warnings during FADT verification - 1) if the FADT is larger -than the largest known FADT version, and 2) if there is a mismatch between a -32-bit block address and the 64-bit X counterpart (when both are non-zero.) +than the largest known FADT version, and 2) if there is a mismatch between +a +32-bit block address and the 64-bit X counterpart (when both are non- +zero.) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4169,10 +5091,12 @@ Disassembly of ASF! table now includes all variable-length data fields at the end of some of the subtables. The disassembler now emits a comment if a buffer appears to be a -ResourceTemplate, but cannot be disassembled as such because the EndTag does +ResourceTemplate, but cannot be disassembled as such because the EndTag +does not appear at the very end of the buffer. -AcpiExec - Added the "-t" command line option to enable the serialized mode +AcpiExec - Added the "-t" command line option to enable the serialized +mode of the AML interpreter. ---------------------------------------- @@ -4188,7 +5112,8 @@ Miscellaneous fixes for the Table Manager: - Additional parameter validation for AcpiGetTable, AcpiGetTableHeader, AcpiGetTableByIndex -Change for GPE support: when a "wake" GPE is received, all wake GPEs are now +Change for GPE support: when a "wake" GPE is received, all wake GPEs are +now immediately disabled to prevent the waking GPE from firing again and to prevent other wake GPEs from interrupting the wake process. @@ -4200,7 +5125,8 @@ both the ACPICA headers and the disassembler. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4221,22 +5147,26 @@ Disassembler support for the DMAR ACPI table. 1) ACPI CA Core Subsystem: The Table Manager component has been completely redesigned and -reimplemented. The new design is much simpler, and reduces the overall code -and data size of the kernel-resident ACPICA by approximately 5%. Also, it is +reimplemented. The new design is much simpler, and reduces the overall +code +and data size of the kernel-resident ACPICA by approximately 5%. Also, it +is now possible to obtain the ACPI tables very early during kernel initialization, even before dynamic memory management is initialized. (Alexey Starikovskiy, Fiodor Suietov, Bob Moore) Obsolete ACPICA interfaces: -- AcpiGetFirmwareTable: Use AcpiGetTable instead (works at early kernel init +- AcpiGetFirmwareTable: Use AcpiGetTable instead (works at early kernel +init time). - AcpiLoadTable: Not needed. - AcpiUnloadTable: Not needed. New ACPICA interfaces: -- AcpiInitializeTables: Must be called before the table manager can be used. +- AcpiInitializeTables: Must be called before the table manager can be +used. - AcpiReallocateRootTable: Used to transfer the root table to dynamically allocated memory after it becomes available. - AcpiGetTableByIndex: Allows the host to easily enumerate all ACPI tables @@ -4244,39 +5174,49 @@ in the RSDT/XSDT. Other ACPICA changes: -- AcpiGetTableHeader returns the actual mapped table header, not a copy. Use +- AcpiGetTableHeader returns the actual mapped table header, not a copy. +Use AcpiOsUnmapMemory to free this mapping. - AcpiGetTable returns the actual mapped table. The mapping is managed internally and must not be deleted by the caller. Use of this interface causes no additional dynamic memory allocation. -- AcpiFindRootPointer: Support for physical addressing has been eliminated, +- AcpiFindRootPointer: Support for physical addressing has been +eliminated, it appeared to be unused. - The interface to AcpiOsMapMemory has changed to be consistent with the other allocation interfaces. -- The interface to AcpiOsGetRootPointer has changed to eliminate unnecessary +- The interface to AcpiOsGetRootPointer has changed to eliminate +unnecessary parameters. - ACPI_PHYSICAL_ADDRESS is now 32 bits on 32-bit platforms, 64 bits on 64- bit platforms. Was previously 64 bits on all platforms. -- The interface to the ACPI Global Lock acquire/release macros have changed +- The interface to the ACPI Global Lock acquire/release macros have +changed slightly since ACPICA no longer keeps a local copy of the FACS with a constructed pointer to the actual global lock. Porting to the new table manager: - AcpiInitializeTables: Must be called once, and can be called anytime -during the OS initialization process. It allows the host to specify an area +during the OS initialization process. It allows the host to specify an +area of memory to be used to store the internal version of the RSDT/XSDT (root -table). This allows the host to access ACPI tables before memory management +table). This allows the host to access ACPI tables before memory +management is initialized and running. -- AcpiReallocateRootTable: Can be called after memory management is running +- AcpiReallocateRootTable: Can be called after memory management is +running to copy the root table to a dynamically allocated array, freeing up the scratch memory specified in the call to AcpiInitializeTables. - AcpiSubsystemInitialize: This existing interface is independent of the Table Manager, and does not have to be called before the Table Manager can be used, it only must be called before the rest of ACPICA can be used. -- ACPI Tables: Some changes have been made to the names and structure of the -actbl.h and actbl1.h header files and may require changes to existing code. -For example, bitfields have been completely removed because of their lack of +- ACPI Tables: Some changes have been made to the names and structure of +the +actbl.h and actbl1.h header files and may require changes to existing +code. +For example, bitfields have been completely removed because of their lack +of portability across C compilers. - Update interfaces to the Global Lock acquire/release macros if local versions are used. (see acwin.h) @@ -4287,7 +5227,8 @@ New files: tbfind.c Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4309,43 +5250,51 @@ No changes for this release. The full source code for the ASL test suite used to validate the iASL compiler and the ACPICA core subsystem is being released with the ACPICA -source for the first time. The source is contained in a separate package and -consists of over 1100 files that exercise all ASL/AML operators. The package +source for the first time. The source is contained in a separate package +and +consists of over 1100 files that exercise all ASL/AML operators. The +package should appear on the Intel/ACPI web site shortly. (Valery Podrezov, Fiodor Suietov) Completed a new design and implementation for support of the ACPI Global Lock. On the OS side, the global lock is now treated as a standard AML mutex. Previously, multiple OS threads could "acquire" the global lock -simultaneously. However, this could cause the BIOS to be starved out of the +simultaneously. However, this could cause the BIOS to be starved out of +the lock - especially in cases such as the Embedded Controller driver where there is a tight coupling between the OS and the BIOS. Implemented an optimization for the ACPI Global Lock interrupt mechanism. The Global Lock interrupt handler no longer queues the execution of a -separate thread to signal the global lock semaphore. Instead, the semaphore +separate thread to signal the global lock semaphore. Instead, the +semaphore is signaled directly from the interrupt handler. Implemented support within the AML interpreter for package objects that contain a larger AML length (package list length) than the package element count. In this case, the length of the package is truncated to match the -package element count. Some BIOS code apparently modifies the package length +package element count. Some BIOS code apparently modifies the package +length on the fly, and this change supports this behavior. Provides compatibility with the MS AML interpreter. (With assistance from Fiodor Suietov) Implemented a temporary fix for the BankValue parameter of a Bank Field to support all constant values, now including the Zero and One opcodes. -Evaluation of this parameter must eventually be converted to a full TermArg +Evaluation of this parameter must eventually be converted to a full +TermArg evaluation. A not-implemented error is now returned (temporarily) for non- constant values for this parameter. Fixed problem reports (Fiodor Suietov) integrated: -- Fix for premature object deletion after CopyObject on Operation Region (BZ +- Fix for premature object deletion after CopyObject on Operation Region +(BZ 350) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4371,18 +5320,21 @@ structures - even though the hardware itself may support misaligned transfers. Some of the debug data structures are packed by default to minimize size. -Added an error message for the case where AcpiOsGetThreadId() returns zero. +Added an error message for the case where AcpiOsGetThreadId() returns +zero. A non-zero value is required by the core ACPICA code to ensure the proper operation of AML mutexes and recursive control methods. The DSDT is now the only ACPI table that determines whether the AML -interpreter is in 32-bit or 64-bit mode. Not really a functional change, but +interpreter is in 32-bit or 64-bit mode. Not really a functional change, +but the hooks for per-table 32/64 switching have been removed from the code. A clarification to the ACPI specification is forthcoming in ACPI 3.0B. Fixed a possible leak of an OwnerID in the error path of AcpiTbInitTableDescriptor (tbinstal.c), and migrated all table OwnerID -deletion to a single place in AcpiTbUninstallTable to correct possible leaks +deletion to a single place in AcpiTbUninstallTable to correct possible +leaks when using the AcpiTbDeleteTablesByType interface (with assistance from Lance Ortiz.) @@ -4390,7 +5342,8 @@ Fixed a problem with Serialized control methods where the semaphore associated with the method could be over-signaled after multiple method invocations. -Fixed two issues with the locking of the internal namespace data structure. +Fixed two issues with the locking of the internal namespace data +structure. Both the Unload() operator and AcpiUnloadTable interface now lock the namespace during the namespace deletion associated with the table unload (with assistance from Linn Crosetto.) @@ -4402,18 +5355,21 @@ Fixed problem reports (Fiodor Suietov) integrated: - Incomplete cleanup branches in AcpiTbGetTableRsdt (BZ 369) - On Address Space handler deletion, needless deactivation call (BZ 374) - AcpiRemoveAddressSpaceHandler: validate Device handle parameter (BZ 375) -- Possible memory leak, Notify sub-objects of Processor, Power, ThermalZone +- Possible memory leak, Notify sub-objects of Processor, Power, +ThermalZone (BZ 376) - AcpiRemoveAddressSpaceHandler: validate Handler parameter (BZ 378) - Minimum Length of RSDT should be validated (BZ 379) - AcpiRemoveNotifyHandler: return AE_NOT_EXIST if Processor Obj has no Handler (BZ (380) -- AcpiUnloadTable: return AE_NOT_EXIST if no table of specified type loaded +- AcpiUnloadTable: return AE_NOT_EXIST if no table of specified type +loaded (BZ 381) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4441,27 +5397,33 @@ allows the type to be customized to the host OS for improved efficiency Implemented support for "ignored" bits in the ACPI registers. According to the ACPI specification, these bits should be preserved when writing the -registers via a read/modify/write cycle. There are 3 bits preserved in this +registers via a read/modify/write cycle. There are 3 bits preserved in +this manner: PM1_CONTROL[0] (SCI_EN), PM1_CONTROL[9], and PM1_STATUS[11]. Implemented the initial deployment of new OSL mutex interfaces. Since some host operating systems have separate mutex and semaphore objects, this feature was requested. The base code now uses mutexes (and the new mutex interfaces) wherever a binary semaphore was used previously. However, for -the current release, the mutex interfaces are defined as macros to map them -to the existing semaphore interfaces. Therefore, no OSL changes are required +the current release, the mutex interfaces are defined as macros to map +them +to the existing semaphore interfaces. Therefore, no OSL changes are +required at this time. (See acpiosxf.h) Fixed several problems with the support for the control method SyncLevel parameter. The SyncLevel now works according to the ACPI specification and in concert with the Mutex SyncLevel parameter, since the current SyncLevel -is a property of the executing thread. Mutual exclusion for control methods +is a property of the executing thread. Mutual exclusion for control +methods is now implemented with a mutex instead of a semaphore. Fixed three instances of the use of the C shift operator in the bitfield support code (exfldio.c) to avoid the use of a shift value larger than the -target data width. The behavior of C compilers is undefined in this case and -can cause unpredictable results, and therefore the case must be detected and +target data width. The behavior of C compilers is undefined in this case +and +can cause unpredictable results, and therefore the case must be detected +and avoided. (Fiodor Suietov) Added an info message whenever an SSDT or OEM table is loaded dynamically @@ -4471,7 +5433,8 @@ the tables present in the RSDT/XSDT.) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4494,16 +5457,20 @@ No changes for this release. Converted the locking mutex used for the ACPI hardware to a spinlock. This change should eliminate all problems caused by attempting to acquire a semaphore at interrupt level, and it means that all ACPICA external -interfaces that directly access the ACPI hardware can be safely called from -interrupt level. OSL code that implements the semaphore interfaces should be +interfaces that directly access the ACPI hardware can be safely called +from +interrupt level. OSL code that implements the semaphore interfaces should +be able to eliminate any workarounds for being called at interrupt level. Fixed a regression introduced in 20060526 where the ACPI device -initialization could be prematurely aborted with an AE_NOT_FOUND if a device +initialization could be prematurely aborted with an AE_NOT_FOUND if a +device did not have an optional _INI method. Fixed an IndexField issue where a write to the Data Register should be -limited in size to the AccessSize (width) of the IndexField itself. (BZ 433, +limited in size to the AccessSize (width) of the IndexField itself. (BZ +433, Fiodor Suietov) Fixed problem reports (Valery Podrezov) integrated: @@ -4517,7 +5484,8 @@ used. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4545,17 +5513,20 @@ Suietov) 1) ACPI CA Core Subsystem: Restructured, flattened, and simplified the internal interfaces for -namespace object evaluation - resulting in smaller code, less CPU stack use, +namespace object evaluation - resulting in smaller code, less CPU stack +use, and fewer interfaces. (With assistance from Mikhail Kouzmich) Fixed a problem with the CopyObject operator where the first parameter was -not typed correctly for the parser, interpreter, compiler, and disassembler. +not typed correctly for the parser, interpreter, compiler, and +disassembler. Caused various errors and unexpected behavior. Fixed a problem where a ShiftLeft or ShiftRight of more than 64 bits produced incorrect results with some C compilers. Since the behavior of C compilers when the shift value is larger than the datatype width is -apparently not well defined, the interpreter now detects this condition and +apparently not well defined, the interpreter now detects this condition +and simply returns zero as expected in all such cases. (BZ 395) Fixed problem reports (Valery Podrezov) integrated: @@ -4564,20 +5535,23 @@ Fixed problem reports (Valery Podrezov) integrated: Fixed problem reports (Fiodor Suietov) integrated: - AcpiTerminate doesn't free debug memory allocation list objects (BZ 355) -- After Core Subsystem shutdown, AcpiSubsystemStatus returns AE_OK (BZ 356) +- After Core Subsystem shutdown, AcpiSubsystemStatus returns AE_OK (BZ +356) - AcpiOsUnmapMemory for RSDP can be invoked inconsistently (BZ 357) - Resource Manager should return AE_TYPE for non-device objects (BZ 358) - Incomplete cleanup branch in AcpiNsEvaluateRelative (BZ 359) - Use AcpiOsFree instead of ACPI_FREE in AcpiRsSetSrsMethodData (BZ 360) - Incomplete cleanup branch in AcpiPsParseAml (BZ 361) - Incomplete cleanup branch in AcpiDsDeleteWalkState (BZ 362) -- AcpiGetTableHeader returns AE_NO_ACPI_TABLES until DSDT is loaded (BZ 365) +- AcpiGetTableHeader returns AE_NO_ACPI_TABLES until DSDT is loaded (BZ +365) - Status of the Global Initialization Handler call not used (BZ 366) - Incorrect object parameter to Global Initialization Handler (BZ 367) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4606,14 +5580,19 @@ disassembly of some Alias operators. 1) ACPI CA Core Subsystem: Replaced the AcpiOsQueueForExecution interface with a new interface named -AcpiOsExecute. The major difference is that the new interface does not have -a Priority parameter, this appeared to be useless and has been replaced by a +AcpiOsExecute. The major difference is that the new interface does not +have +a Priority parameter, this appeared to be useless and has been replaced by +a Type parameter. The Type tells the host what type of execution is being requested, such as global lock handler, notify handler, GPE handler, etc. -This allows the host to queue and execute the request as appropriate for the -request type, possibly using different work queues and different priorities +This allows the host to queue and execute the request as appropriate for +the +request type, possibly using different work queues and different +priorities for the various request types. This enables fixes for multithreading -deadlock problems such as BZ #5534, and will require changes to all existing +deadlock problems such as BZ #5534, and will require changes to all +existing OS interface layers. (Alexey Starikovskiy and Bob Moore) Fixed a possible memory leak associated with the support for the so-called @@ -4622,11 +5601,13 @@ Suietov) Fixed a problem with the Load() operator where a table load from an operation region could overwrite an internal table buffer by up to 7 bytes -and cause alignment faults on IPF systems. (With assistance from Luming Yu) +and cause alignment faults on IPF systems. (With assistance from Luming +Yu) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4640,14 +5621,17 @@ a much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -Disassembler: Implemented support to cross reference the internal namespace -and automatically generate ASL External() statements for symbols not defined +Disassembler: Implemented support to cross reference the internal +namespace +and automatically generate ASL External() statements for symbols not +defined within the current table being disassembled. This will simplify the disassembly and recompilation of interdependent tables such as SSDTs since these statements will no longer have to be added manually. Disassembler: Implemented experimental support to automatically detect -invocations of external control methods and generate appropriate External() +invocations of external control methods and generate appropriate +External() statements. This is problematic because the AML cannot be correctly parsed until the number of arguments for each control method is known. Currently, standalone method invocations and invocations as the source operand of a @@ -4667,7 +5651,8 @@ Removed a device initialization optimization introduced in 20051216 where the _STA method was not run unless an _INI was also present for the same device. This optimization could cause problems because it could allow _INI methods to be run within a not-present device subtree. (If a not-present -device had no _INI, _STA would not be run, the not-present status would not +device had no _INI, _STA would not be run, the not-present status would +not be discovered, and the children of the device would be incorrectly traversed.) @@ -4677,7 +5662,8 @@ Selectively running _STA can significantly improve boot time on large machines (with assistance from Len Brown.) Implemented support for the device initialization case where the returned -_STA flags indicate a device not-present but functioning. In this case, _INI +_STA flags indicate a device not-present but functioning. In this case, +_INI is not run, but the device children are examined for presence, as per the ACPI specification. @@ -4705,17 +5691,20 @@ paths within DsCallControlMethod and DsTerminateControlMethod in dsmethod (with assistance from Takayoshi Kochi.) Modified the Linux source converter to ignore quoted string literals while -converting identifiers from mixed to lower case. This will correct problems +converting identifiers from mixed to lower case. This will correct +problems with the disassembler and other areas where such strings must not be modified. The ACPI_FUNCTION_* macros no longer require quotes around the function -name. This allows the Linux source converter to convert the names, now that +name. This allows the Linux source converter to convert the names, now +that the converter ignores quoted strings. Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4729,14 +5718,17 @@ a much larger code and data size. 2) iASL Compiler/Disassembler and Tools: -Implemented 3 new warnings for iASL, and implemented multiple warning levels +Implemented 3 new warnings for iASL, and implemented multiple warning +levels (w2 flag). -1) Ignored timeouts: If the TimeoutValue parameter to Wait or Acquire is not +1) Ignored timeouts: If the TimeoutValue parameter to Wait or Acquire is +not WAIT_FOREVER (0xFFFF) and the code does not examine the return value to check for the possible timeout, a warning is issued. -2) Useless operators: If an ASL operator does not specify an optional target +2) Useless operators: If an ASL operator does not specify an optional +target operand and it also does not use the function return value from the operator, a warning is issued since the operator effectively does nothing. @@ -4754,8 +5746,10 @@ expected that the OS will invoke them. 1) ACPI CA Core Subsystem: Implemented header file support for the following additional ACPI tables: -ASF!, BOOT, CPEP, DBGP, MCFG, SPCR, SPMI, TCPA, and WDRT. With this support, -all current and known ACPI tables are now defined in the ACPICA headers and +ASF!, BOOT, CPEP, DBGP, MCFG, SPCR, SPMI, TCPA, and WDRT. With this +support, +all current and known ACPI tables are now defined in the ACPICA headers +and are available for use by device drivers and other software. Implemented support to allow tables that contain ACPI names with invalid @@ -4764,7 +5758,8 @@ fail, but since there are several known cases of such tables on existing machines, this change was made to enable ACPI support for them. Also, this matches the behavior of the Microsoft ACPI implementation. -Fixed a couple regressions introduced during the memory optimization in the +Fixed a couple regressions introduced during the memory optimization in +the 20060317 release. The namespace node definition required additional reorganization and an internal datatype that had been changed to 8-bit was restored to 32-bit. (Valery Podrezov) @@ -4775,20 +5770,24 @@ null pointers are now trapped and ignored, matching the behavior of the previous implementation before the deployment of AcpiOsReleaseObject. (Valery Podrezov, Fiodor Suietov) -Fixed a memory mapping leak during the deletion of a SystemMemory operation +Fixed a memory mapping leak during the deletion of a SystemMemory +operation region where a cached memory mapping was not deleted. This became a -noticeable problem for operation regions that are defined within frequently +noticeable problem for operation regions that are defined within +frequently used control methods. (Dana Meyers) Reorganized the ACPI table header files into two main files: one for the ACPI tables consumed by the ACPICA core, and another for the miscellaneous -ACPI tables that are consumed by the drivers and other software. The various +ACPI tables that are consumed by the drivers and other software. The +various FADT definitions were merged into one common section and three different tables (ACPI 1.0, 1.0+, and 2.0) Example Code and Data Size: These are the sizes for the OS-independent acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The -debug version of the code includes the debug output trace mechanism and has +debug version of the code includes the debug output trace mechanism and +has a much larger code and data size. Previous Release: @@ -4803,16 +5802,19 @@ a much larger code and data size. Disassembler: Implemented support to decode and format all non-AML ACPI tables (tables other than DSDTs and SSDTs.) This includes the new tables -added to the ACPICA headers, therefore all current and known ACPI tables are +added to the ACPICA headers, therefore all current and known ACPI tables +are supported. Disassembler: The change to allow ACPI names with invalid characters also -enables the disassembly of such tables. Invalid characters within names are +enables the disassembly of such tables. Invalid characters within names +are changed to '*' to make the name printable; the iASL compiler will still generate an error for such names, however, since this is an invalid ACPI character. -Implemented an option for AcpiXtract (-a) to extract all tables found in the +Implemented an option for AcpiXtract (-a) to extract all tables found in +the input file. The default invocation extracts only the DSDTs and SSDTs. Fixed a couple of gcc generation issues for iASL and AcpiExec and added a @@ -4828,7 +5830,8 @@ Since there are about 1000 static nodes in a typical system, this will decrease memory use for cache implementations that minimize per-allocation overhead (such as a slab allocator.) -Removed the reference count mechanism for internal namespace nodes, since it +Removed the reference count mechanism for internal namespace nodes, since +it was deemed unnecessary. This reduces the size of each namespace node by about 5%-10% on all platforms. Nodes are now 20 bytes for the 32-bit case, and 32 bytes for the 64-bit case. @@ -4846,13 +5849,16 @@ utalloc.c to uttrack.c. This mechanism appears to be only useful for application-level code. Kernels may wish to not include uttrack.c in distributions. -Removed all remnants of the obsolete ACPI_REPORT_* macros and the associated +Removed all remnants of the obsolete ACPI_REPORT_* macros and the +associated code. (These macros have been replaced by the ACPI_ERROR and ACPI_WARNING macros.) Code and Data Size: These are the sizes for the acpica.lib produced by the -Microsoft Visual C++ 6.0 32-bit compiler. The values do not include any ACPI -driver or OSPM code. The debug version of the code includes the debug output +Microsoft Visual C++ 6.0 32-bit compiler. The values do not include any +ACPI +driver or OSPM code. The debug version of the code includes the debug +output trace mechanism and has a much larger code and data size. Note that these values will vary depending on the efficiency of the compiler and the compiler options used during generation. @@ -4888,12 +5894,15 @@ Added the ACPI_THREAD_ID type for the return value from AcpiOsGetThreadId. This allows the host to define this as necessary to simplify kernel integration. The default definition is ACPI_NATIVE_UINT. -Fixed two interpreter problems related to error processing, the deletion of +Fixed two interpreter problems related to error processing, the deletion +of objects, and placing invalid pointers onto the internal operator result stack. BZ 6028, 6151 (Valery Podrezov) -Increased the reference count threshold where a warning is emitted for large -reference counts in order to eliminate unnecessary warnings on systems with +Increased the reference count threshold where a warning is emitted for +large +reference counts in order to eliminate unnecessary warnings on systems +with large namespaces (especially 64-bit.) Increased the value from 0x400 to 0x800. @@ -4904,8 +5913,10 @@ ACPI_MEM_ALLOCATE and ACPI_MEM_FREE are renamed to ACPI_ALLOCATE and ACPI_FREE. Code and Data Size: These are the sizes for the acpica.lib produced by the -Microsoft Visual C++ 6.0 32-bit compiler. The values do not include any ACPI -driver or OSPM code. The debug version of the code includes the debug output +Microsoft Visual C++ 6.0 32-bit compiler. The values do not include any +ACPI +driver or OSPM code. The debug version of the code includes the debug +output trace mechanism and has a much larger code and data size. Note that these values will vary depending on the efficiency of the compiler and the compiler options used during generation. @@ -4921,8 +5932,10 @@ compiler options used during generation. 2) iASL Compiler/Disassembler: Disassembler: implemented support for symbolic resource descriptor -references. If a CreateXxxxField operator references a fixed offset within a -resource descriptor, a name is assigned to the descriptor and the offset is +references. If a CreateXxxxField operator references a fixed offset within +a +resource descriptor, a name is assigned to the descriptor and the offset +is translated to the appropriate resource tag and pathname. The addition of this support brings the disassembled code very close to the original ASL source code and helps eliminate run-time errors when the disassembled code @@ -4936,8 +5949,10 @@ specification, and will be added for ACPI 3.0b. Fixed a problem where the use of the "_OSI" string (versus the full path "\_OSI") caused an internal compiler error. ("No back ptr to op") -Fixed a problem with the error message that occurs when an invalid string is -used for a _HID object (such as one with an embedded asterisk: "*PNP010A".) +Fixed a problem with the error message that occurs when an invalid string +is +used for a _HID object (such as one with an embedded asterisk: +"*PNP010A".) The correct message is now displayed. ---------------------------------------- @@ -4945,8 +5960,10 @@ The correct message is now displayed. 1) ACPI CA Core Subsystem: -Implemented a change to the IndexField support to match the behavior of the -Microsoft AML interpreter. The value written to the Index register is now a +Implemented a change to the IndexField support to match the behavior of +the +Microsoft AML interpreter. The value written to the Index register is now +a byte offset, no longer an index based upon the width of the Data register. This should fix IndexField problems seen on some machines where the Data register is not exactly one byte wide. The ACPI specification will be @@ -4957,12 +5974,15 @@ internal descriptor buffer due to size miscalculation: VendorShort, VendorLong, and Interrupt. This was noticed on IA64 machines, but could affect all platforms. -Fixed a problem where individual resource descriptors were misaligned within +Fixed a problem where individual resource descriptors were misaligned +within the internal buffer, causing alignment faults on IA64 platforms. Code and Data Size: These are the sizes for the acpica.lib produced by the -Microsoft Visual C++ 6.0 32-bit compiler. The values do not include any ACPI -driver or OSPM code. The debug version of the code includes the debug output +Microsoft Visual C++ 6.0 32-bit compiler. The values do not include any +ACPI +driver or OSPM code. The debug version of the code includes the debug +output trace mechanism and has a much larger code and data size. Note that these values will vary depending on the efficiency of the compiler and the compiler options used during generation. @@ -4993,36 +6013,44 @@ Removed a couple of extraneous ACPI_ERROR messages that appeared during normal execution. These became apparent after the conversion from ACPI_DEBUG_PRINT. -Fixed a problem where the CreateField operator could hang if the BitIndex or +Fixed a problem where the CreateField operator could hang if the BitIndex +or NumBits parameter referred to a named object. (Valery Podrezov, BZ 5359) Fixed a problem where a DeRefOf operation on a buffer object incorrectly failed with an exception. This also fixes a couple of related RefOf and DeRefOf issues. (Valery Podrezov, BZ 5360/5392/5387) -Fixed a problem where the AE_BUFFER_LIMIT exception was returned instead of -AE_STRING_LIMIT on an out-of-bounds Index() operation. (Valery Podrezov, BZ +Fixed a problem where the AE_BUFFER_LIMIT exception was returned instead +of +AE_STRING_LIMIT on an out-of-bounds Index() operation. (Valery Podrezov, +BZ 5480) Implemented a memory cleanup at the end of the execution of each iteration -of an AML While() loop, preventing the accumulation of outstanding objects. +of an AML While() loop, preventing the accumulation of outstanding +objects. (Valery Podrezov, BZ 5427) -Eliminated a chunk of duplicate code in the object resolution code. (Valery +Eliminated a chunk of duplicate code in the object resolution code. +(Valery Podrezov, BZ 5336) Fixed several warnings during the 64-bit code generation. The AcpiSrc source code conversion tool now inserts one line of whitespace -after an if() statement that is followed immediately by a comment, improving +after an if() statement that is followed immediately by a comment, +improving readability of the Linux code. Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5035,7 +6063,8 @@ of the compiler and the compiler options used during generation. 2) iASL Compiler/Disassembler: -Fixed a problem with the disassembly of a BankField operator with a complex +Fixed a problem with the disassembly of a BankField operator with a +complex expression for the BankValue parameter. ---------------------------------------- @@ -5044,10 +6073,12 @@ expression for the BankValue parameter. 1) ACPI CA Core Subsystem: Implemented support in the Resource Manager to allow unresolved namestring -references within resource package objects for the _PRT method. This support +references within resource package objects for the _PRT method. This +support is in addition to the previously implemented unresolved reference support within the AML parser. If the interpreter slack mode is enabled, these -unresolved references will be passed through to the caller as a NULL package +unresolved references will be passed through to the caller as a NULL +package entry. Implemented and deployed new macros and functions for error and warning @@ -5063,10 +6094,12 @@ Acquire/Release Lock OSL interfaces. Fixed a problem where Alias ASL operators are sometimes not correctly resolved, in both the interpreter and the iASL compiler. -Fixed several problems with the implementation of the ConcatenateResTemplate +Fixed several problems with the implementation of the +ConcatenateResTemplate ASL operator. As per the ACPI specification, zero length buffers are now treated as a single EndTag. One-length buffers always cause a fatal -exception. Non-zero length buffers that do not end with a full 2-byte EndTag +exception. Non-zero length buffers that do not end with a full 2-byte +EndTag cause a fatal exception. Fixed a possible structure overwrite in the AcpiGetObjectInfo external @@ -5075,9 +6108,11 @@ interface. (With assistance from Thomas Renninger) Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5090,7 +6125,8 @@ of the compiler and the compiler options used during generation. 2) iASL Compiler/Disassembler: -Fixed an internal error that was generated for any forward references to ASL +Fixed an internal error that was generated for any forward references to +ASL Alias objects. ---------------------------------------- @@ -5106,14 +6142,17 @@ Enhanced the ACPICA error reporting in order to simplify user migration to the non-debug version of ACPICA. Replaced all instances of the ACPI_DEBUG_PRINT macro invoked at the ACPI_DB_ERROR and ACPI_DB_WARN debug levels with the ACPI_REPORT_ERROR and ACPI_REPORT_WARNING macros, -respectively. This preserves all error and warning messages in the non-debug +respectively. This preserves all error and warning messages in the non- +debug version of the ACPICA code (this has been referred to as the "debug lite" option.) Over 200 cases were converted to create a total of over 380 error/warning messages across the ACPICA code. This increases the code and -data size of the default non-debug version of the code somewhat (about 13K), +data size of the default non-debug version of the code somewhat (about +13K), but all error/warning reporting may be disabled if desired (and code eliminated) by specifying the ACPI_NO_ERROR_MESSAGES compile-time -configuration option. The size of the debug version of ACPICA remains about +configuration option. The size of the debug version of ACPICA remains +about the same. Fixed a memory leak within the AML Debugger "Set" command. One object was @@ -5122,9 +6161,11 @@ not properly deleted for every successful invocation of the command. Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5138,7 +6179,8 @@ of the compiler and the compiler options used during generation. 2) iASL Compiler/Disassembler: The compiler now officially supports the ACPI 3.0a specification that was -released on December 30, 2005. (Specification is available at www.acpi.info) +released on December 30, 2005. (Specification is available at +www.acpi.info) ---------------------------------------- 16 December 2005. Summary of changes for version 20051216: @@ -5151,14 +6193,19 @@ cannot be located in the current namespace. Enabled via the interpreter slack flag, this should eliminate AE_NOT_FOUND exceptions seen on machines that contain such code. -Implemented an optimization to the initialization sequence that can improve -boot time. During ACPI device initialization, the _STA method is now run if -and only if the _INI method exists. The _STA method is used to determine if -the device is present; An _INI can only be run if _STA returns present, but +Implemented an optimization to the initialization sequence that can +improve +boot time. During ACPI device initialization, the _STA method is now run +if +and only if the _INI method exists. The _STA method is used to determine +if +the device is present; An _INI can only be run if _STA returns present, +but it is a waste of time to run the _STA method if the _INI does not exist. (Prototype and assistance from Dong Wei) -Implemented use of the C99 uintptr_t for the pointer casting macros if it is +Implemented use of the C99 uintptr_t for the pointer casting macros if it +is available in the current compiler. Otherwise, the default (void *) cast is used as before. @@ -5182,9 +6229,11 @@ generation. Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5197,7 +6246,8 @@ of the compiler and the compiler options used during generation. 2) iASL Compiler/Disassembler: -Fixed a problem where a CPU stack overflow fault could occur if a recursive +Fixed a problem where a CPU stack overflow fault could occur if a +recursive method call was made from within a Return statement. ---------------------------------------- @@ -5210,15 +6260,19 @@ objects during the first pass of the parse. Objects are now created only during the execute phase, at the moment the namespace creation operator is encountered in the AML (Name, OperationRegion, CreateByteField, etc.) This should eliminate ALREADY_EXISTS exceptions seen on some machines where -reentrant control methods are protected by an AML mutex. The mutex will now +reentrant control methods are protected by an AML mutex. The mutex will +now correctly block multiple threads from attempting to create the same object more than once. Increased the number of available Owner Ids for namespace object tracking -from 32 to 255. This should eliminate the OWNER_ID_LIMIT exceptions seen on -some machines with a large number of ACPI tables (either static or dynamic). +from 32 to 255. This should eliminate the OWNER_ID_LIMIT exceptions seen +on +some machines with a large number of ACPI tables (either static or +dynamic). -Fixed a problem with the AcpiExec utility where a fault could occur when the +Fixed a problem with the AcpiExec utility where a fault could occur when +the -b switch (batch mode) is used. Enhanced the namespace dump routine to output the owner ID for each @@ -5227,9 +6281,11 @@ namespace object. Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5242,7 +6298,8 @@ of the compiler and the compiler options used during generation. 2) iASL Compiler/Disassembler: -Fixed a parse error during compilation of certain Switch/Case constructs. To +Fixed a parse error during compilation of certain Switch/Case constructs. +To simplify the parse, the grammar now allows for multiple Default statements and this error is now detected and flagged during the analysis phase. @@ -5256,32 +6313,41 @@ name and version of the original ASL compiler. 1) ACPI CA Core Subsystem: Fixed a problem in the AML parser where the method thread count could be -decremented below zero if any errors occurred during the method parse phase. -This should eliminate AE_AML_METHOD_LIMIT exceptions seen on some machines. +decremented below zero if any errors occurred during the method parse +phase. +This should eliminate AE_AML_METHOD_LIMIT exceptions seen on some +machines. This also fixed a related regression with the mechanism that detects and corrects methods that cannot properly handle reentrancy (related to the deployment of the new OwnerId mechanism.) Eliminated the pre-parsing of control methods (to detect errors) during -table load. Related to the problem above, this was causing unwind issues if -any errors occurred during the parse, and it seemed to be overkill. A table +table load. Related to the problem above, this was causing unwind issues +if +any errors occurred during the parse, and it seemed to be overkill. A +table load should not be aborted if there are problems with any single control method, thus rendering this feature rather pointless. -Fixed a problem with the new table-driven resource manager where an internal +Fixed a problem with the new table-driven resource manager where an +internal buffer overflow could occur for small resource templates. -Implemented a new external interface, AcpiGetVendorResource. This interface +Implemented a new external interface, AcpiGetVendorResource. This +interface will find and return a vendor-defined resource descriptor within a _CRS or -_PRS method via an ACPI 3.0 UUID match. With assistance from Bjorn Helgaas. +_PRS method via an ACPI 3.0 UUID match. With assistance from Bjorn +Helgaas. Removed the length limit (200) on string objects as per the upcoming ACPI -3.0A specification. This affects the following areas of the interpreter: 1) +3.0A specification. This affects the following areas of the interpreter: +1) any implicit conversion of a Buffer to a String, 2) a String object result of the ASL Concatentate operator, 3) the String object result of the ASL ToString operator. -Fixed a problem in the Windows OS interface layer (OSL) where a WAIT_FOREVER +Fixed a problem in the Windows OS interface layer (OSL) where a +WAIT_FOREVER on a semaphore object would incorrectly timeout. This allows the multithreading features of the AcpiExec utility to work properly under Windows. @@ -5292,9 +6358,11 @@ the recently added file named "utresrc.c". Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5308,15 +6376,18 @@ of the compiler and the compiler options used during generation. 2) iASL Compiler/Disassembler: Removed the limit (200) on string objects as per the upcoming ACPI 3.0A -specification. For the iASL compiler, this means that string literals within +specification. For the iASL compiler, this means that string literals +within the source ASL can be of any length. Enhanced the listing output to dump the AML code for resource descriptors -immediately after the ASL code for each descriptor, instead of in a block at +immediately after the ASL code for each descriptor, instead of in a block +at the end of the entire resource template. Enhanced the compiler debug output to dump the entire original parse tree -constructed during the parse phase, before any transforms are applied to the +constructed during the parse phase, before any transforms are applied to +the tree. The transformed tree is dumped also. ---------------------------------------- @@ -5325,22 +6396,26 @@ tree. The transformed tree is dumped also. 1) ACPI CA Core Subsystem: Modified the subsystem initialization sequence to improve GPE support. The -GPE initialization has been split into two parts in order to defer execution +GPE initialization has been split into two parts in order to defer +execution of the _PRW methods (Power Resources for Wake) until after the hardware is fully initialized and the SCI handler is installed. This allows the _PRW -methods to access fields protected by the Global Lock. This will fix systems +methods to access fields protected by the Global Lock. This will fix +systems where a NO_GLOBAL_LOCK exception has been seen during initialization. Converted the ACPI internal object disassemble and display code within the AML debugger to fully table-driven operation, reducing code size and increasing maintainability. -Fixed a regression with the ConcatenateResTemplate() ASL operator introduced +Fixed a regression with the ConcatenateResTemplate() ASL operator +introduced in the 20051021 release. Implemented support for "local" internal ACPI object types within the debugger "Object" command and the AcpiWalkNamespace external interfaces. -These local types include RegionFields, BankFields, IndexFields, Alias, and +These local types include RegionFields, BankFields, IndexFields, Alias, +and reference objects. Moved common AML resource handling code into a new file, "utresrc.c". This @@ -5349,9 +6424,11 @@ code is shared by both the Resource Manager and the AML Debugger. Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5364,20 +6441,25 @@ of the compiler and the compiler options used during generation. 2) iASL Compiler/Disassembler: -Fixed a problem with very large initializer lists (more than 4000 elements) +Fixed a problem with very large initializer lists (more than 4000 +elements) for both Buffer and Package objects where the parse stack could overflow. -Enhanced the pre-compile source code scan for non-ASCII characters to ignore -characters within comment fields. The scan is now always performed and is no +Enhanced the pre-compile source code scan for non-ASCII characters to +ignore +characters within comment fields. The scan is now always performed and is +no longer optional, detecting invalid characters within a source file immediately rather than during the parse phase or later. Enhanced the ASL grammar definition to force early reductions on all list- style grammar elements so that the overall parse stack usage is greatly -reduced. This should improve performance and reduce the possibility of parse +reduced. This should improve performance and reduce the possibility of +parse stack overflow. -Eliminated all reduce/reduce conflicts in the iASL parser generation. Also, +Eliminated all reduce/reduce conflicts in the iASL parser generation. +Also, with the addition of a %expected statement, the compiler generates from source with no warnings. @@ -5397,7 +6479,8 @@ hardware support for non-aligned transfers. Completed conversion of the Resource Manager to nearly full table-driven operation. Specifically, the resource conversion code (convert AML to internal format and the reverse) and the debug code to dump internal -resource descriptors are fully table-driven, reducing code and data size and +resource descriptors are fully table-driven, reducing code and data size +and improving maintainability. The OSL interfaces for Acquire and Release Lock now use a 64-bit flag word @@ -5407,7 +6490,8 @@ Alexey Starikovskiy) Implemented support within the resource conversion code for the Type- Specific byte within the various ACPI 3.0 *WordSpace macros. -Fixed some issues within the resource conversion code for the type-specific +Fixed some issues within the resource conversion code for the type- +specific flags for both Memory and I/O address resource descriptors. For Memory, implemented support for the MTP and TTP flags. For I/O, split the TRS and TTP flags into two separate fields. @@ -5415,9 +6499,11 @@ TTP flags into two separate fields. Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5434,20 +6520,24 @@ of the compiler and the compiler options used during generation. Relaxed a compiler restriction that disallowed a ResourceIndex byte if the corresponding ResourceSource string was not also present in a resource descriptor declaration. This restriction caused problems with existing -AML/ASL code that includes the Index byte without the string. When such AML +AML/ASL code that includes the Index byte without the string. When such +AML was disassembled, it could not be compiled without modification. Further, -the modified code created a resource template with a different size than the +the modified code created a resource template with a different size than +the original, breaking code that used fixed offsets into the resource template buffer. -Removed a recent feature of the disassembler to ignore a lone ResourceIndex +Removed a recent feature of the disassembler to ignore a lone +ResourceIndex byte. This byte is now emitted if present so that the exact AML can be reproduced when the disassembled code is recompiled. Improved comments and text alignment for the resource descriptor code emitted by the disassembler. -Implemented disassembler support for the ACPI 3.0 AccessSize field within a +Implemented disassembler support for the ACPI 3.0 AccessSize field within +a Register() resource descriptor. ---------------------------------------- @@ -5456,10 +6546,13 @@ Register() resource descriptor. 1) ACPI CA Core Subsystem: Completed a major overhaul of the Resource Manager code - specifically, -optimizations in the area of the AML/internal resource conversion code. The -code has been optimized to simplify and eliminate duplicated code, CPU stack +optimizations in the area of the AML/internal resource conversion code. +The +code has been optimized to simplify and eliminate duplicated code, CPU +stack use has been decreased by optimizing function parameters and local -variables, and naming conventions across the manager have been standardized +variables, and naming conventions across the manager have been +standardized for clarity and ease of maintenance (this includes function, parameter, variable, and struct/typedef names.) The update may force changes in some driver code, depending on how resources are handled by the host OS. @@ -5471,10 +6564,13 @@ created, named "rsinfo.c". The ACPI return macros (return_ACPI_STATUS, etc.) have been modified to guarantee that the argument is not evaluated twice, making them less prone to macro side-effects. However, since there exists the possibility of -additional stack use if a particular compiler cannot optimize them (such as -in the debug generation case), the original macros are optionally available. +additional stack use if a particular compiler cannot optimize them (such +as +in the debug generation case), the original macros are optionally +available. Note that some invocations of the return_VALUE macro may now cause size -mismatch warnings; the return_UINT8 and return_UINT32 macros are provided to +mismatch warnings; the return_UINT8 and return_UINT32 macros are provided +to eliminate these. (From Randy Dunlap) Implemented a new mechanism to enable debug tracing for individual control @@ -5491,9 +6587,11 @@ the behavior of AcpiUtAllocate. Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5515,11 +6613,13 @@ buffer is zero. Previously, this was a warning. 1) ACPI CA Core Subsystem: Fixed a problem within the Resource Manager where support for the Generic -Register descriptor was not fully implemented. This descriptor is now fully +Register descriptor was not fully implemented. This descriptor is now +fully recognized, parsed, disassembled, and displayed. Completely restructured the Resource Manager code to utilize table-driven -dispatch and lookup, eliminating many of the large switch() statements. This +dispatch and lookup, eliminating many of the large switch() statements. +This reduces overall subsystem code size and code complexity. Affects the resource parsing and construction, disassembly, and debug dump output. @@ -5532,9 +6632,11 @@ optional ACPI_MUTEX_DEBUG code to fail compilation if specified. Code and Data Size: The current and previous library sizes for the core subsystem are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. These -values do not include any ACPI driver or OSPM code. The debug version of the +values do not include any ACPI driver or OSPM code. The debug version of +the code includes the debug output trace mechanism and has a much larger code -and data size. Note that these values will vary depending on the efficiency +and data size. Note that these values will vary depending on the +efficiency of the compiler and the compiler options used during generation. Previous Release: @@ -5552,7 +6654,8 @@ into the ASL stream if this macro is missing in the original AML code, simplifying compilation of the resulting ASL module. Fixed a problem in the disassembler where a disassembled ResourceSource -string (within a large resource descriptor) was not surrounded by quotes and +string (within a large resource descriptor) was not surrounded by quotes +and not followed by a comma, causing errors when the resulting ASL module was compiled. Also, escape sequences within a ResourceSource string are now handled correctly (especially "\\") @@ -5569,11 +6672,13 @@ messages seen on some systems. Recursive method invocation depth is currently limited to 255. (Alexey Starikovskiy) Completely eliminated all vestiges of support for the "module-level -executable code" until this support is fully implemented and debugged. This +executable code" until this support is fully implemented and debugged. +This should eliminate the NO_RETURN_VALUE exceptions seen during table load on some systems that invoke this support. -Fixed a problem within the resource manager code where the transaction flags +Fixed a problem within the resource manager code where the transaction +flags for a 64-bit address descriptor were handled incorrectly in the type- specific flag byte. @@ -5589,9 +6694,11 @@ release package. Code and Data Size: The current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler. These values do not -include any ACPI driver or OSPM code. The debug version of the code includes +include any ACPI driver or OSPM code. The debug version of the code +includes the debug output trace mechanism and has a much larger code and data size. -Note that these values will vary depending on the efficiency of the compiler +Note that these values will vary depending on the efficiency of the +compiler and the compiler options used during generation. Previous Release: @@ -5604,7 +6711,8 @@ and the compiler options used during generation. 2) iASL Compiler/Disassembler: -Implemented an error check for illegal duplicate values in the interrupt and +Implemented an error check for illegal duplicate values in the interrupt +and dma lists for the following ASL macros: Dma(), Irq(), IrqNoFlags(), and Interrupt(). @@ -5625,10 +6733,13 @@ resource descriptor has already been used within the current scope. 1) ACPI CA Core Subsystem: -Implemented a full bytewise compare to determine if a table load request is -attempting to load a duplicate table. The compare is performed if the table +Implemented a full bytewise compare to determine if a table load request +is +attempting to load a duplicate table. The compare is performed if the +table signatures and table lengths match. This will allow different tables with -the same OEM Table ID and revision to be loaded - probably against the ACPI +the same OEM Table ID and revision to be loaded - probably against the +ACPI specification, but discovered in the field nonetheless. Added the changes.txt logfile to each of the zipped release packages. @@ -5637,8 +6748,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -5670,14 +6783,18 @@ attempts to load the same SSDT upon certain events. With assistance from Venkatesh Pallipadi. Restructured the main interface to the AML parser in order to correctly -handle all exceptional conditions. This will prevent leakage of the OwnerId -resource and should eliminate the AE_OWNER_ID_LIMIT exceptions seen on some +handle all exceptional conditions. This will prevent leakage of the +OwnerId +resource and should eliminate the AE_OWNER_ID_LIMIT exceptions seen on +some machines. With assistance from Alexey Starikovskiy. Support for "module level code" has been disabled in this version due to a -number of issues that have appeared on various machines. The support can be +number of issues that have appeared on various machines. The support can +be enabled by defining ACPI_ENABLE_MODULE_LEVEL_CODE during subsystem -compilation. When the issues are fully resolved, the code will be enabled by +compilation. When the issues are fully resolved, the code will be enabled +by default again. Modified the internal functions for debug print support to define the @@ -5686,15 +6803,18 @@ built-in macros such as __FUNCTION__, etc. Linted the entire ACPICA source tree for both 32-bit and 64-bit. -Implemented support to display an object count summary for the AML Debugger +Implemented support to display an object count summary for the AML +Debugger commands Object and Methods. Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -5708,7 +6828,8 @@ the compiler options used during generation. 2) iASL Compiler/Disassembler: Fixed a regression that appeared in the 20050708 version of the compiler -where an error message was inadvertently emitted for invocations of the _OSI +where an error message was inadvertently emitted for invocations of the +_OSI reserved control method. ---------------------------------------- @@ -5720,18 +6841,24 @@ The use of the CPU stack in the debug version of the subsystem has been considerably reduced. Previously, a debug structure was declared in every function that used the debug macros. This structure has been removed in favor of declaring the individual elements as parameters to the debug -functions. This reduces the cumulative stack use during nested execution of -ACPI function calls at the cost of a small increase in the code size of the -debug version of the subsystem. With assistance from Alexey Starikovskiy and +functions. This reduces the cumulative stack use during nested execution +of +ACPI function calls at the cost of a small increase in the code size of +the +debug version of the subsystem. With assistance from Alexey Starikovskiy +and Len Brown. Added the ACPI_GET_FUNCTION_NAME macro to enable the compiler-dependent headers to define a macro that will return the current function name at -runtime (such as __FUNCTION__ or _func_, etc.) The function name is used by +runtime (such as __FUNCTION__ or _func_, etc.) The function name is used +by the debug trace output. If ACPI_GET_FUNCTION_NAME is not defined in the -compiler-dependent header, the function name is saved on the CPU stack (one +compiler-dependent header, the function name is saved on the CPU stack +(one pointer per function.) This mechanism is used because apparently there -exists no standard ANSI-C defined macro that that returns the function name. +exists no standard ANSI-C defined macro that that returns the function +name. Redesigned and reimplemented the "Owner ID" mechanism used to track namespace objects created/deleted by ACPI tables and control method @@ -5740,14 +6867,18 @@ the wraparound problem present in the previous implementation. The size of the namespace node descriptor was reduced by 2 bytes as a result (Alexey Starikovskiy). -Removed the UINT32_BIT and UINT16_BIT types that were used for the bitfield +Removed the UINT32_BIT and UINT16_BIT types that were used for the +bitfield flag definitions within the headers for the predefined ACPI tables. These -have been replaced by UINT8_BIT in order to increase the code portability of +have been replaced by UINT8_BIT in order to increase the code portability +of the subsystem. If the use of UINT8 remains a problem, we may be forced to eliminate bitfields entirely because of a lack of portability. -Enhanced the performance of the AcpiUtUpdateObjectReference procedure. This -is a frequently used function and this improvement increases the performance +Enhanced the performance of the AcpiUtUpdateObjectReference procedure. +This +is a frequently used function and this improvement increases the +performance of the entire subsystem (Alexey Starikovskiy). Fixed several possible memory leaks and the inverse - premature object @@ -5757,8 +6888,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -5774,7 +6907,8 @@ the compiler options used during generation. 1) ACPI CA Core Subsystem: Modified the new OSL cache interfaces to use ACPI_CACHE_T as the type for -the host-defined cache object. This allows the OSL implementation to define +the host-defined cache object. This allows the OSL implementation to +define and type this object in any manner desired, simplifying the OSL implementation. For example, ACPI_CACHE_T is defined as kmem_cache_t for Linux, and should be defined in the OS-specific header file for other @@ -5786,21 +6920,28 @@ change was made for performance reasons, since this is the purpose of the interface in the first place. AcpiOsAcquireObject is now similar to the AcpiOsAllocate interface. -Implemented a new AML debugger command named Businfo. This command displays -information about all devices that have an associate _PRT object. The _ADR, +Implemented a new AML debugger command named Businfo. This command +displays +information about all devices that have an associate _PRT object. The +_ADR, _HID, _UID, and _CID are displayed for these devices. -Modified the initialization sequence in AcpiInitializeSubsystem to call the -OSL interface AcpiOslInitialize first, before any local initialization. This +Modified the initialization sequence in AcpiInitializeSubsystem to call +the +OSL interface AcpiOslInitialize first, before any local initialization. +This change was required because the global initialization now calls OSL interfaces. -Enhanced the Dump command to display the entire contents of Package objects +Enhanced the Dump command to display the entire contents of Package +objects (including all sub-objects and their values.) Restructured the code base to split some files because of size and/or -because the code logically belonged in a separate file. New files are listed -below. All makefiles and project files included in the ACPI CA release have +because the code logically belonged in a separate file. New files are +listed +below. All makefiles and project files included in the ACPI CA release +have been updated. utilities/utcache.c /* Local cache interfaces */ utilities/utmutex.c /* Local mutex support */ @@ -5811,8 +6952,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -5825,7 +6968,8 @@ the compiler options used during generation. 2) iASL Compiler/Disassembler: -Fixed a regression introduced in version 20050513 where the use of a Package +Fixed a regression introduced in version 20050513 where the use of a +Package object within a Case() statement caused a compile time exception. The original behavior has been restored (a Match() operator is emitted.) @@ -5834,7 +6978,8 @@ original behavior has been restored (a Match() operator is emitted.) 1) ACPI CA Core Subsystem: -Moved the object cache operations into the OS interface layer (OSL) to allow +Moved the object cache operations into the OS interface layer (OSL) to +allow the host OS to handle these operations if desired (for example, the Linux OSL will invoke the slab allocator). This support is optional; the compile time define ACPI_USE_LOCAL_CACHE may be used to utilize the original cache @@ -5847,44 +6992,55 @@ interface definitions. With assistance from Alexey Starikovskiy. AcpiOsAcquireObject AcpiOsReleaseObject -Modified the interfaces to AcpiOsAcquireLock and AcpiOsReleaseLock to return +Modified the interfaces to AcpiOsAcquireLock and AcpiOsReleaseLock to +return and restore a flags parameter. This fits better with many OS lock models. Note: the current execution state (interrupt handler or not) is no longer -passed to these interfaces. If necessary, the OSL must determine this state +passed to these interfaces. If necessary, the OSL must determine this +state by itself, a simple and fast operation. With assistance from Alexey Starikovskiy. Fixed a problem in the ACPI table handling where a valid XSDT was assumed -present if the revision of the RSDP was 2 or greater. According to the ACPI +present if the revision of the RSDP was 2 or greater. According to the +ACPI specification, the XSDT is optional in all cases, and the table manager therefore now checks for both an RSDP >=2 and a valid XSDT pointer. Otherwise, the RSDT pointer is used. Some ACPI 2.0 compliant BIOSs contain only the RSDT. -Fixed an interpreter problem with the Mid() operator in the case of an input -string where the resulting output string is of zero length. It now correctly +Fixed an interpreter problem with the Mid() operator in the case of an +input +string where the resulting output string is of zero length. It now +correctly returns a valid, null terminated string object instead of a string object with a null pointer. Fixed a problem with the control method argument handling to allow a store -to an Arg object that already contains an object of type Device. The Device +to an Arg object that already contains an object of type Device. The +Device object is now correctly overwritten. Previously, an error was returned. -Enhanced the debugger Find command to emit object values in addition to the -found object pathnames. The output format is the same as the dump namespace +Enhanced the debugger Find command to emit object values in addition to +the +found object pathnames. The output format is the same as the dump +namespace command. Enhanced the debugger Set command. It now has the ability to set the value -of any Named integer object in the namespace (Previously, only method locals +of any Named integer object in the namespace (Previously, only method +locals and args could be set.) Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -5902,7 +7058,8 @@ output incorrectly. This problem was introduced in the previous release (20050526). This problem also affected the single-step disassembly in the debugger. -Fixed a problem where compiling the reserved _OSI method would randomly (but +Fixed a problem where compiling the reserved _OSI method would randomly +(but rarely) produce compile errors. Enhanced the disassembler to emit compilable code in the face of incorrect @@ -5918,16 +7075,20 @@ errors. Implemented support to execute Type 1 and Type 2 AML opcodes appearing at the module level (not within a control method.) These opcodes are executed -exactly once at the time the table is loaded. This type of code was legal up -until the release of ACPI 2.0B (2002) and is now supported within ACPI CA in -order to provide backwards compatibility with earlier BIOS implementations. +exactly once at the time the table is loaded. This type of code was legal +up +until the release of ACPI 2.0B (2002) and is now supported within ACPI CA +in +order to provide backwards compatibility with earlier BIOS +implementations. This eliminates the "Encountered executable code at module level" warning that was previously generated upon detection of such code. Fixed a problem in the interpreter where an AE_NOT_FOUND exception could inadvertently be generated during the lookup of namespace objects in the second pass parse of ACPI tables and control methods. It appears that this -problem could occur during the resolution of forward references to namespace +problem could occur during the resolution of forward references to +namespace objects. Added the ACPI_MUTEX_DEBUG #ifdef to the AcpiUtReleaseMutex function, @@ -5947,8 +7108,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -5969,15 +7132,20 @@ compiler in order to provide backwards compatibility with earlier BIOS ASL code. The ACPI integer width (specified via the table revision ID or the -r -override, 32 or 64 bits) is now used internally during compile-time constant +override, 32 or 64 bits) is now used internally during compile-time +constant folding to ensure that constants are truncated to 32 bits if necessary. -Previously, the revision ID value was only emitted in the AML table header. +Previously, the revision ID value was only emitted in the AML table +header. -An error message is now generated for the Mutex and Method operators if the +An error message is now generated for the Mutex and Method operators if +the SyncLevel parameter is outside the legal range of 0 through 15. -Fixed a problem with the Method operator ParameterTypes list handling (ACPI -3.0). Previously, more than 2 types or 2 arguments generated a syntax error. +Fixed a problem with the Method operator ParameterTypes list handling +(ACPI +3.0). Previously, more than 2 types or 2 arguments generated a syntax +error. The actual underlying implementation of method argument typechecking is still under development, however. @@ -5986,17 +7154,21 @@ still under development, however. 1) ACPI CA Core Subsystem: -Implemented support for PCI Express root bridges -- added support for device +Implemented support for PCI Express root bridges -- added support for +device PNP0A08 in the root bridge search within AcpiEvPciConfigRegionSetup. -The interpreter now automatically truncates incoming 64-bit constants to 32 -bits if currently executing out of a 32-bit ACPI table (Revision < 2). This +The interpreter now automatically truncates incoming 64-bit constants to +32 +bits if currently executing out of a 32-bit ACPI table (Revision < 2). +This also affects the iASL compiler constant folding. (Note: as per below, the iASL compiler no longer allows 64-bit constants within 32-bit tables.) Fixed a problem where string and buffer objects with "static" pointers (pointers to initialization data within an ACPI table) were not handled -consistently. The internal object copy operation now always copies the data +consistently. The internal object copy operation now always copies the +data to a newly allocated buffer, regardless of whether the source object is static or not. @@ -6006,7 +7178,8 @@ operand. Since this is an "explicit conversion" operator, the implicit conversion should never be performed on the output. Fixed a problem with the CopyObject operator where a copy to an existing -named object did not always completely overwrite the existing object stored +named object did not always completely overwrite the existing object +stored at name. Specifically, a buffer-to-buffer copy did not delete the existing buffer. @@ -6017,8 +7190,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6031,17 +7206,21 @@ the compiler options used during generation. 2) iASL Compiler/Disassembler: -The compiler now emits a warning if an attempt is made to generate a 64-bit -integer constant from within a 32-bit ACPI table (Revision < 2). The integer +The compiler now emits a warning if an attempt is made to generate a 64- +bit +integer constant from within a 32-bit ACPI table (Revision < 2). The +integer is truncated to 32 bits. Fixed a problem with large package objects: if the static length of the package is greater than 255, the "variable length package" opcode is emitted. Previously, this caused an error. This requires an update to the -ACPI spec, since it currently (incorrectly) states that packages larger than +ACPI spec, since it currently (incorrectly) states that packages larger +than 255 elements are not allowed. -The disassembler now correctly handles variable length packages and packages +The disassembler now correctly handles variable length packages and +packages larger than 255 elements. ---------------------------------------- @@ -6053,19 +7232,24 @@ Fixed three cases in the interpreter where an "index" argument to an ASL function was still (internally) 32 bits instead of the required 64 bits. This was the Index argument to the Index, Mid, and Match operators. -The "strupr" function is now permanently local (AcpiUtStrupr), since this is +The "strupr" function is now permanently local (AcpiUtStrupr), since this +is not a POSIX-defined function and not present in most kernel-level C -libraries. All references to the C library strupr function have been removed +libraries. All references to the C library strupr function have been +removed from the headers. -Completed the deployment of static functions/prototypes. All prototypes with -the static attribute have been moved from the headers to the owning C file. +Completed the deployment of static functions/prototypes. All prototypes +with +the static attribute have been moved from the headers to the owning C +file. Implemented an extract option (-e) for the AcpiBin utility (AML binary utility). This option allows the utility to extract individual ACPI tables from the output of AcpiDmp. It provides the same functionality of the acpixtract.pl perl script without the worry of setting the correct perl -options. AcpiBin runs on Windows and has not yet been generated/validated in +options. AcpiBin runs on Windows and has not yet been generated/validated +in the Linux/Unix environment (but should be soon). Updated and fixed the table dump option for AcpiBin (-d). This option @@ -6076,8 +7260,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6090,8 +7276,10 @@ the compiler options used during generation. 2) iASL Compiler/Disassembler: -Disassembler fix: Added a check to ensure that the table length found in the -ACPI table header within the input file is not longer than the actual input +Disassembler fix: Added a check to ensure that the table length found in +the +ACPI table header within the input file is not longer than the actual +input file size. This indicates some kind of file or table corruption. ---------------------------------------- @@ -6099,24 +7287,28 @@ file size. This indicates some kind of file or table corruption. 1) ACPI CA Core Subsystem: -An error is now generated if an attempt is made to create a Buffer Field of +An error is now generated if an attempt is made to create a Buffer Field +of length zero (A CreateField with a length operand of zero.) -The interpreter now issues a warning whenever executable code at the module +The interpreter now issues a warning whenever executable code at the +module level is detected during ACPI table load. This will give some idea of the prevalence of this type of code. Implemented support for references to named objects (other than control methods) within package objects. -Enhanced package object output for the debug object. Package objects are now +Enhanced package object output for the debug object. Package objects are +now completely dumped, showing all elements. Enhanced miscellaneous object output for the debug object. Any object can now be written to the debug object (for example, a device object can be written, and the type of the object will be displayed.) -The "static" qualifier has been added to all local functions across both the +The "static" qualifier has been added to all local functions across both +the core subsystem and the iASL compiler. The number of "long" lines (> 80 chars) within the source has been @@ -6133,8 +7325,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6149,10 +7343,12 @@ the compiler options used during generation. 2) iASL Compiler/Disassembler: Fixed a problem with the resource descriptor generation/support. For the -ResourceSourceIndex and the ResourceSource fields, both must be present, or +ResourceSourceIndex and the ResourceSource fields, both must be present, +or both must be not present - can't have one without the other. -The compiler now returns non-zero from the main procedure if any errors have +The compiler now returns non-zero from the main procedure if any errors +have occurred during the compilation. @@ -6161,15 +7357,18 @@ occurred during the compilation. 1) ACPI CA Core Subsystem: -The string-to-buffer implicit conversion code has been modified again after +The string-to-buffer implicit conversion code has been modified again +after a change to the ACPI specification. In order to match the behavior of the -other major ACPI implementation, the target buffer is no longer truncated if +other major ACPI implementation, the target buffer is no longer truncated +if the source string is smaller than an existing target buffer. This change requires an update to the ACPI spec, and should eliminate the recent AE_AML_BUFFER_LIMIT issues. The "implicit return" support was rewritten to a new algorithm that solves -the general case. Rather than attempt to determine when a method is about to +the general case. Rather than attempt to determine when a method is about +to exit, the result of every ASL operator is saved momentarily until the very next ASL operator is executed. Therefore, no matter how the method exits, there will always be a saved implicit return value. This feature is only @@ -6177,15 +7376,18 @@ enabled with the AcpiGbl_EnableInterpreterSlack flag, and should eliminate AE_AML_NO_RETURN_VALUE errors when enabled. Implemented implicit conversion support for the predicate (operand) of the -If, Else, and While operators. String and Buffer arguments are automatically +If, Else, and While operators. String and Buffer arguments are +automatically converted to Integers. Changed the string-to-integer conversion behavior to match the new ACPI errata: "If no integer object exists, a new integer is created. The ASCII string is interpreted as a hexadecimal constant. Each string character is interpreted as a hexadecimal value ('0'-'9', 'A'-'F', 'a', 'f'), starting -with the first character as the most significant digit, and ending with the -first non-hexadecimal character or end-of-string." This means that the first +with the first character as the most significant digit, and ending with +the +first non-hexadecimal character or end-of-string." This means that the +first non-hex character terminates the conversion and this is the code that was changed. @@ -6194,7 +7396,8 @@ on an Index of a Package which pointed to a null package element. The operator now properly returns zero (Uninitialized) in this case. Fixed a problem where the While operator used excessive memory by not -properly popping the result stack during execution. There was no memory leak +properly popping the result stack during execution. There was no memory +leak after execution, however. (Code provided by Valery Podrezov.) Fixed a problem where references to control methods within Package objects @@ -6209,8 +7412,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6224,25 +7429,29 @@ the compiler options used during generation. 2) iASL Compiler/Disassembler: Fixed a problem with the Return operator with no arguments. Since the AML -grammar for the byte encoding requires an operand for the Return opcode, the +grammar for the byte encoding requires an operand for the Return opcode, +the compiler now emits a Return(Zero) for this case. An ACPI specification update has been written for this case. For tables other than the DSDT, namepath optimization is automatically -disabled. This is because SSDTs can be loaded anywhere in the namespace, the +disabled. This is because SSDTs can be loaded anywhere in the namespace, +the compiler has no knowledge of where, and thus cannot optimize namepaths. Added "ProcessorObj" to the ObjectTypeKeyword list. This object type was inadvertently omitted from the ACPI specification, and will require an update to the spec. -The source file scan for ASCII characters is now optional (-a). This change +The source file scan for ASCII characters is now optional (-a). This +change was made because some vendors place non-ascii characters within comments. However, the scan is simply a brute-force byte compare to ensure all characters in the file are in the range 0x00 to 0x7F. Fixed a problem with the CondRefOf operator where the compiler was -inappropriately checking for the existence of the target. Since the point of +inappropriately checking for the existence of the target. Since the point +of the operator is to check for the existence of the target at run-time, the compiler no longer checks for the target existence. @@ -6250,17 +7459,21 @@ Fixed a problem where errors generated from the internal AML interpreter during constant folding were not handled properly, causing a fault. Fixed a problem with overly aggressive range checking for the Stall -operator. The valid range (max 255) is now only checked if the operand is of +operator. The valid range (max 255) is now only checked if the operand is +of type Integer. All other operand types cannot be statically checked. Fixed a problem where control method references within the RefOf, DeRefOf, -and ObjectType operators were not treated properly. They are now treated as +and ObjectType operators were not treated properly. They are now treated +as actual references, not method invocations. -Fixed and enhanced the "list namespace" option (-ln). This option was broken +Fixed and enhanced the "list namespace" option (-ln). This option was +broken a number of releases ago. -Improved error handling for the Field, IndexField, and BankField operators. +Improved error handling for the Field, IndexField, and BankField +operators. The compiler now cleanly reports and recovers from errors in the field component (FieldUnit) list. @@ -6279,16 +7492,19 @@ reference) must increment the reference count on the target object for the life of the object reference. Implemented AML Interpreter and Debugger support for the new ACPI 3.0 -Extended Address (IO, Memory, Space), QwordSpace, DwordSpace, and WordSpace +Extended Address (IO, Memory, Space), QwordSpace, DwordSpace, and +WordSpace resource descriptors. Implemented support in the _OSI method for the ACPI 3.0 "Extended Address -Space Descriptor" string, indicating interpreter support for the descriptors +Space Descriptor" string, indicating interpreter support for the +descriptors above. Implemented header support for the new ACPI 3.0 FADT flag bits. -Implemented header support for the new ACPI 3.0 PCI Express bits for the PM1 +Implemented header support for the new ACPI 3.0 PCI Express bits for the +PM1 status/enable registers. Updated header support for the MADT processor local Apic struct and MADT @@ -6296,15 +7512,18 @@ platform interrupt source struct for new ACPI 3.0 fields. Implemented header support for the SRAT and SLIT ACPI tables. -Implemented the -s switch in AcpiExec to enable the "InterpreterSlack" flag +Implemented the -s switch in AcpiExec to enable the "InterpreterSlack" +flag at runtime. Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6321,11 +7540,13 @@ Fixed a problem with the internal 64-bit String-to-integer conversion with strings less than two characters long. Fixed a problem with constant folding where the result of the Index() -operator can not be considered a constant. This means that Index() cannot be +operator can not be considered a constant. This means that Index() cannot +be a type3 opcode and this will require an update to the ACPI specification. Disassembler: Implemented support for the TTP, MTP, and TRS resource -descriptor fields. These fields were inadvertently ignored and not output in +descriptor fields. These fields were inadvertently ignored and not output +in the disassembly of the resource descriptor. @@ -6335,29 +7556,39 @@ the disassembly of the resource descriptor. 1) ACPI CA Core Subsystem: Implemented ACPI 3.0 support for implicit conversion within the Match() -operator. MatchObjects can now be of type integer, buffer, or string instead -of just type integer. Package elements are implicitly converted to the type +operator. MatchObjects can now be of type integer, buffer, or string +instead +of just type integer. Package elements are implicitly converted to the +type of the MatchObject. This change aligns the behavior of Match() with the -behavior of the other logical operators (LLess(), etc.) It also requires an +behavior of the other logical operators (LLess(), etc.) It also requires +an errata change to the ACPI specification as this support was intended for ACPI 3.0, but was inadvertently omitted. Fixed a problem with the internal implicit "to buffer" conversion. Strings -that are converted to buffers will cause buffer truncation if the string is -smaller than the target buffer. Integers that are converted to buffers will +that are converted to buffers will cause buffer truncation if the string +is +smaller than the target buffer. Integers that are converted to buffers +will not cause buffer truncation, only zero extension (both as per the ACPI spec.) The problem was introduced when code was added to truncate the -buffer, but this should not be performed in all cases, only the string case. +buffer, but this should not be performed in all cases, only the string +case. -Fixed a problem with the Buffer and Package operators where the interpreter +Fixed a problem with the Buffer and Package operators where the +interpreter would get confused if two such operators were used as operands to an ASL operator (such as LLess(Buffer(1){0},Buffer(1){1}). The internal result -stack was not being popped after the execution of these operators, resulting +stack was not being popped after the execution of these operators, +resulting in an AE_NO_RETURN_VALUE exception. Fixed a problem with constructs of the form Store(Index(...),...). The -reference object returned from Index was inadvertently resolved to an actual -value. This problem was introduced in version 20050114 when the behavior of +reference object returned from Index was inadvertently resolved to an +actual +value. This problem was introduced in version 20050114 when the behavior +of Store() was modified to restrict the object types that can be used as the source operand (to match the ACPI specification.) @@ -6371,8 +7602,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6407,32 +7640,42 @@ AcpiExec and the iASL compiler enable the cache because they run in user mode and this enhances their performance. #define ACPI_ENABLE_OBJECT_CACHE to enable the local cache. -Fixed an issue in the internal function AcpiUtEvaluateObject concerning the -optional "implicit return" support where an error was returned if no return -object was expected, but one was implicitly returned. AE_OK is now returned +Fixed an issue in the internal function AcpiUtEvaluateObject concerning +the +optional "implicit return" support where an error was returned if no +return +object was expected, but one was implicitly returned. AE_OK is now +returned in this case and the implicitly returned object is deleted. -AcpiUtEvaluateObject is only occasionally used, and only to execute reserved +AcpiUtEvaluateObject is only occasionally used, and only to execute +reserved methods such as _STA and _INI where the return type is known up front. -Fixed a few issues with the internal convert-to-integer code. It now returns +Fixed a few issues with the internal convert-to-integer code. It now +returns an error if an attempt is made to convert a null string, a string of only -blanks/tabs, or a zero-length buffer. This affects both implicit conversion +blanks/tabs, or a zero-length buffer. This affects both implicit +conversion and explicit conversion via the ToInteger() operator. -The internal debug code in AcpiUtAcquireMutex has been commented out. It is +The internal debug code in AcpiUtAcquireMutex has been commented out. It +is not needed for normal operation and should increase the performance of the entire subsystem. The code remains in case it is needed for debug purposes again. -The AcpiExec source and makefile are included in the Unix/Linux package for +The AcpiExec source and makefile are included in the Unix/Linux package +for the first time. Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6444,24 +7687,30 @@ the compiler options used during generation. 2) iASL Compiler/Disassembler: -Switch/Case support: A warning is now issued if the type of the Switch value +Switch/Case support: A warning is now issued if the type of the Switch +value cannot be determined at compile time. For example, Switch(Arg0) will generate the warning, and the type is assumed to be an integer. As per the -ACPI spec, use a construct such as Switch(ToInteger(Arg0)) to eliminate the +ACPI spec, use a construct such as Switch(ToInteger(Arg0)) to eliminate +the warning. Switch/Case support: Implemented support for buffer and string objects as the switch value. This is an ACPI 3.0 feature, now that LEqual supports buffers and strings. -Switch/Case support: The emitted code for the LEqual() comparisons now uses -the switch value as the first operand, not the second. The case value is now +Switch/Case support: The emitted code for the LEqual() comparisons now +uses +the switch value as the first operand, not the second. The case value is +now the second operand, and this allows the case value to be implicitly converted to the type of the switch value, not the other way around. -Switch/Case support: Temporary variables are now emitted immediately within +Switch/Case support: Temporary variables are now emitted immediately +within the control method, not at the global level. This means that there are now -36 temps available per-method, not 36 temps per-module as was the case with +36 temps available per-method, not 36 temps per-module as was the case +with the earlier implementation (_T_0 through _T_9 and _T_A through _T_Z.) ---------------------------------------- @@ -6474,40 +7723,50 @@ the core subsystem, iASL compiler, and the utilities. Fixed an issue with the String-to-Buffer conversion code where the string null terminator was not included in the buffer after conversion, but there -is existing ASL that assumes the string null terminator is included. This is +is existing ASL that assumes the string null terminator is included. This +is the root of the ACPI_AML_BUFFER_LIMIT regression. This problem was introduced in the previous version when the code was updated to correctly set the converted buffer size as per the ACPI specification. The ACPI spec -is ambiguous and will be updated to specify that the null terminator must be +is ambiguous and will be updated to specify that the null terminator must +be included in the converted buffer. This also affects the ToBuffer() ASL operator. Fixed a problem with the Mid() ASL/AML operator where it did not work -correctly on Buffer objects. Newly created sub-buffers were not being marked +correctly on Buffer objects. Newly created sub-buffers were not being +marked as initialized. Fixed a problem in AcpiTbFindTable where incorrect string compares were -performed on the OemId and OemTableId table header fields. These fields are +performed on the OemId and OemTableId table header fields. These fields +are not null terminated, so strncmp is now used instead of strcmp. Implemented a restriction on the Store() ASL/AML operator to align the -behavior with the ACPI specification. Previously, any object could be used -as the source operand. Now, the only objects that may be used are Integers, +behavior with the ACPI specification. Previously, any object could be +used +as the source operand. Now, the only objects that may be used are +Integers, Buffers, Strings, Packages, Object References, and DDB Handles. If necessary, the original behavior can be restored by enabling the EnableInterpreterSlack flag. -Enhanced the optional "implicit return" support to allow an implicit return +Enhanced the optional "implicit return" support to allow an implicit +return value from methods that are invoked externally via the AcpiEvaluateObject interface. This enables implicit returns from the _STA and _INI methods, for example. -Changed the Revision() ASL/AML operator to return the current version of the -AML interpreter, in the YYYYMMDD format. Previously, it incorrectly returned +Changed the Revision() ASL/AML operator to return the current version of +the +AML interpreter, in the YYYYMMDD format. Previously, it incorrectly +returned the supported ACPI version (This is the function of the _REV method). -Updated the _REV predefined method to return the currently supported version +Updated the _REV predefined method to return the currently supported +version of ACPI, now 3. Implemented batch mode option for the AcpiExec utility (-b). @@ -6516,8 +7775,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6539,7 +7800,8 @@ Fixed a problem in the ToDecimalString operator where the resulting string length was incorrectly calculated. The length is now calculated exactly, eliminating incorrect AE_STRING_LIMIT exceptions. -Fixed a problem in the ToHexString operator to allow a maximum 200 character +Fixed a problem in the ToHexString operator to allow a maximum 200 +character string to be produced. Fixed a problem in the internal string-to-buffer and buffer-to-buffer copy @@ -6550,8 +7812,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6568,7 +7832,8 @@ Implemented the new ACPI 3.0 resource template macros - DWordSpace, ExtendedIO, ExtendedMemory, ExtendedSpace, QWordSpace, and WordSpace. Includes support in the disassembler. -Implemented support for the new (ACPI 3.0) parameter to the Register macro, +Implemented support for the new (ACPI 3.0) parameter to the Register +macro, AccessSize. Fixed a problem where the _HE resource name for the Interrupt macro was @@ -6587,23 +7852,27 @@ optional (default is BusMaster). Implemented check for maximum 7 data bytes for the VendorShort macro. -The ReadWrite parameter is now optional for the Memory32 and similar macros. +The ReadWrite parameter is now optional for the Memory32 and similar +macros. ---------------------------------------- 03 December 2004. Summary of changes for version 20041203: 1) ACPI CA Core Subsystem: -The low-level field insertion/extraction code (exfldio) has been completely +The low-level field insertion/extraction code (exfldio) has been +completely rewritten to eliminate unnecessary complexity, bugs, and boundary conditions. -Fixed a problem in the ToInteger, ToBuffer, ToHexString, and ToDecimalString +Fixed a problem in the ToInteger, ToBuffer, ToHexString, and +ToDecimalString operators where the input operand could be inadvertently deleted if no conversion was necessary (e.g., if the input to ToInteger was an Integer object.) -Fixed a problem with the ToDecimalString and ToHexString where an incorrect +Fixed a problem with the ToDecimalString and ToHexString where an +incorrect exception code was returned if the resulting string would be > 200 chars. AE_STRING_LIMIT is now returned. @@ -6617,8 +7886,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6634,7 +7905,8 @@ the compiler options used during generation. Fixed typechecking for the ObjectType and SizeOf operators. Problem was recently introduced in 20041119. -Fixed a problem with the ToUUID macro where the upper nybble of each buffer +Fixed a problem with the ToUUID macro where the upper nybble of each +buffer byte was inadvertently set to zero. ---------------------------------------- @@ -6642,22 +7914,30 @@ byte was inadvertently set to zero. 1) ACPI CA Core Subsystem: -Fixed a problem in the internal ConvertToInteger routine where new integers -were not truncated to 32 bits for 32-bit ACPI tables. This routine converts +Fixed a problem in the internal ConvertToInteger routine where new +integers +were not truncated to 32 bits for 32-bit ACPI tables. This routine +converts buffers and strings to integers. -Implemented support to store a value to an Index() on a String object. This +Implemented support to store a value to an Index() on a String object. +This is an ACPI 2.0 feature that had not yet been implemented. -Implemented new behavior for storing objects to individual package elements -(via the Index() operator). The previous behavior was to invoke the implicit +Implemented new behavior for storing objects to individual package +elements +(via the Index() operator). The previous behavior was to invoke the +implicit conversion rules if an object was already present at the index. The new -behavior is to simply delete any existing object and directly store the new -object. Although the ACPI specification seems unclear on this subject, other +behavior is to simply delete any existing object and directly store the +new +object. Although the ACPI specification seems unclear on this subject, +other ACPI implementations behave in this manner. (This is the root of the AE_BAD_HEX_CONSTANT issue.) -Modified the RSDP memory scan mechanism to support the extended checksum for +Modified the RSDP memory scan mechanism to support the extended checksum +for ACPI 2.0 (and above) RSDPs. Note that the search continues until a valid RSDP signature is found with a valid checksum. @@ -6665,8 +7945,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6686,11 +7968,13 @@ Fixed a missing semicolon in the aslcompiler.y file. 1) ACPI CA Core Subsystem: -Implemented support for FADT revision 2. This was an interim table (between +Implemented support for FADT revision 2. This was an interim table +(between ACPI 1.0 and ACPI 2.0) that adds support for the FADT reset register. Implemented optional support to allow uninitialized LocalX and ArgX -variables in a control method. The variables are initialized to an Integer +variables in a control method. The variables are initialized to an +Integer object with a value of zero. This support is enabled by setting the AcpiGbl_EnableInterpreterSlack flag to TRUE. @@ -6698,7 +7982,8 @@ Implemented support for Integer objects for the SizeOf operator. Either 4 or 8 is returned, depending on the current integer size (32-bit or 64-bit, depending on the parent table revision). -Fixed a problem in the implementation of the SizeOf and ObjectType operators +Fixed a problem in the implementation of the SizeOf and ObjectType +operators where the operand was resolved to a value too early, causing incorrect return values for some objects. @@ -6708,8 +7993,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6751,8 +8038,10 @@ the number of bug fixes in the next few months. 1) ACPI CA Core Subsystem: -Fixed two alignment issues on 64-bit platforms - within debug statements in -AcpiEvGpeDetect and AcpiEvCreateGpeBlock. Removed references to the Address +Fixed two alignment issues on 64-bit platforms - within debug statements +in +AcpiEvGpeDetect and AcpiEvCreateGpeBlock. Removed references to the +Address field within the non-aligned ACPI generic address structure. Fixed a problem in the Increment and Decrement operators where incorrect @@ -6760,14 +8049,17 @@ operand resolution could result in the inadvertent modification of the original integer when the integer is passed into another method as an argument and the arg is then incremented/decremented. -Fixed a problem in the FromBCD operator where the upper 32-bits of a 64-bit +Fixed a problem in the FromBCD operator where the upper 32-bits of a 64- +bit BCD number were truncated during conversion. -Fixed a problem in the ToDecimal operator where the length of the resulting +Fixed a problem in the ToDecimal operator where the length of the +resulting string could be set incorrectly too long if the input operand was a Buffer object. -Fixed a problem in the Logical operators (LLess, etc.) where a NULL byte (0) +Fixed a problem in the Logical operators (LLess, etc.) where a NULL byte +(0) within a buffer would prematurely terminate a compare between buffer objects. @@ -6778,8 +8070,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6800,7 +8094,8 @@ Fixed a problem where the compiler would fault if there was a syntax error in the FieldName of all of the various CreateXXXField operators. Disallow the use of lower case letters within the EISAID macro, as per the -ACPI specification. All EISAID strings must be of the form "UUUNNNN" Where +ACPI specification. All EISAID strings must be of the form "UUUNNNN" +Where U is an uppercase letter and N is a hex digit. @@ -6813,17 +8108,20 @@ Implemented support for the ACPI 3.0 Timer operator. This ASL function implements a 64-bit timer with 100 nanosecond granularity. Defined a new OSL interface, AcpiOsGetTimer. This interface is used to -implement the ACPI 3.0 Timer operator. This allows the host OS to implement +implement the ACPI 3.0 Timer operator. This allows the host OS to +implement the timer with the best clock available. Also, it keeps the core subsystem out of the clock handling business, since the host OS (usually) performs this function. Fixed an alignment issue on 64-bit platforms. The HwLowLevelRead(Write) functions use a 64-bit address which is part of the packed ACPI Generic -Address Structure. Since the structure is non-aligned, the alignment macros +Address Structure. Since the structure is non-aligned, the alignment +macros are now used to extract the address to a local variable before use. -Fixed a problem where the ToInteger operator assumed all input strings were +Fixed a problem where the ToInteger operator assumed all input strings +were hexadecimal. The operator now handles both decimal strings and hex strings (prefixed with "0x"). @@ -6836,18 +8134,22 @@ Fixed two problems in the ToString operator. If the length parameter was zero, an incorrect string object was created and the value of the input length parameter was inadvertently changed from zero to Ones. -Fixed a problem where the optional ResourceSource string in the ExtendedIRQ +Fixed a problem where the optional ResourceSource string in the +ExtendedIRQ resource macro was ignored. -Simplified the interfaces to the internal division functions, reducing code +Simplified the interfaces to the internal division functions, reducing +code size and complexity. Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6862,11 +8164,13 @@ the compiler options used during generation. Implemented support for the ACPI 3.0 Timer operator. -Fixed a problem where the Default() operator was inadvertently ignored in a +Fixed a problem where the Default() operator was inadvertently ignored in +a Switch/Case block. This was a problem in the translation of the Switch statement to If...Else pairs. -Added support to allow a standalone Return operator, with no parentheses (or +Added support to allow a standalone Return operator, with no parentheses +(or operands). Fixed a problem with code generation for the ElseIf operator where the @@ -6878,9 +8182,12 @@ loss of some code. 1) ACPI CA Core Subsystem: -Fixed a problem with the implementation of the LNot() operator where "Ones" -was not returned for the TRUE case. Changed the code to return Ones instead -of (!Arg) which was usually 1. This change affects iASL constant folding for +Fixed a problem with the implementation of the LNot() operator where +"Ones" +was not returned for the TRUE case. Changed the code to return Ones +instead +of (!Arg) which was usually 1. This change affects iASL constant folding +for this operator also. Fixed a problem in AcpiUtInitializeBuffer where an existing buffer was not @@ -6892,8 +8199,10 @@ Milliseconds) to simply (ACPI_INTEGER Milliseconds). This simplifies all related code considerably. This will require changes/updates to all OS interface layers (OSLs.) -Implemented a new external interface, AcpiInstallExceptionHandler, to allow -a system exception handler to be installed. This handler is invoked upon any +Implemented a new external interface, AcpiInstallExceptionHandler, to +allow +a system exception handler to be installed. This handler is invoked upon +any run-time exception that occurs during control method execution. Added support for the DSDT in AcpiTbFindTable. This allows the @@ -6903,8 +8212,10 @@ Code and Data Size: Current and previous core subsystem library sizes are shown below. These are the code and data sizes for the acpica.lib produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6926,8 +8237,10 @@ longer occurs if such a comment is at the very end of the input ASL source file. Implemented the "-r" option to override the Revision in the table header. -The initial use of this option will be to simplify the evaluation of the AML -interpreter by allowing a single ASL source module to be compiled for either +The initial use of this option will be to simplify the evaluation of the +AML +interpreter by allowing a single ASL source module to be compiled for +either 32-bit or 64-bit integers. @@ -6944,19 +8257,24 @@ the first operand. For example: LEqual (Source1, Source2) -Source1 and Source2 must each evaluate to an integer, a string, or a buffer. +Source1 and Source2 must each evaluate to an integer, a string, or a +buffer. The data type of Source1 dictates the required type of Source2. Source2 is implicitly converted if necessary to match the type of Source1. -- Updated and corrected the behavior of the string conversion support. The +- Updated and corrected the behavior of the string conversion support. +The rules concerning conversion of buffers to strings (according to the ACPI specification) are as follows: ToDecimalString - explicit byte-wise conversion of buffer to string of -decimal values (0-255) separated by commas. ToHexString - explicit byte-wise +decimal values (0-255) separated by commas. ToHexString - explicit byte- +wise conversion of buffer to string of hex values (0-FF) separated by commas. -ToString - explicit byte-wise conversion of buffer to string. Byte-by-byte -copy with no transform except NULL terminated. Any other implicit buffer-to- +ToString - explicit byte-wise conversion of buffer to string. Byte-by- +byte +copy with no transform except NULL terminated. Any other implicit buffer- +to- string conversion - byte-wise conversion of buffer to string of hex values (0-FF) separated by spaces. @@ -6966,12 +8284,16 @@ string conversion - byte-wise conversion of buffer to string of hex values one byte too short in the case of a node in the root scope. This could cause a fault during debug output. -- Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +- Code and Data Size: Current and previous core subsystem library sizes +are +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -6999,19 +8321,25 @@ operator. A few machines depend on this behavior, even though it is not explicitly supported by the ASL language. It is optional support that can be enabled at runtime via the AcpiGbl_EnableInterpreterSlack flag. -Removed support for the PCI_Config address space from the internal low level +Removed support for the PCI_Config address space from the internal low +level hardware interfaces (AcpiHwLowLevelRead and AcpiHwLowLevelWrite). This -support was not used internally, and would not work correctly anyway because +support was not used internally, and would not work correctly anyway +because the PCI bus number and segment number were not supported. There are -separate interfaces for PCI configuration space access because of the unique +separate interfaces for PCI configuration space access because of the +unique interface. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7034,30 +8362,38 @@ generation. This problem was introduced in the 20040715 release. 1) ACPI CA Core Subsystem: -Restructured the internal HW GPE interfaces to pass/track the current state +Restructured the internal HW GPE interfaces to pass/track the current +state of interrupts (enabled/disabled) in order to avoid possible deadlock and increase flexibility of the interfaces. -Implemented a "lexicographical compare" for String and Buffer objects within +Implemented a "lexicographical compare" for String and Buffer objects +within the logical operators -- LGreater, LLess, LGreaterEqual, and LLessEqual -- -as per further clarification to the ACPI specification. Behavior is similar +as per further clarification to the ACPI specification. Behavior is +similar to C library "strcmp". Completed a major reduction in CPU stack use for the AcpiGetFirmwareTable external function. In the 32-bit non-debug case, the stack use has been reduced from 168 bytes to 32 bytes. -Deployed a new run-time configuration flag, AcpiGbl_EnableInterpreterSlack, +Deployed a new run-time configuration flag, +AcpiGbl_EnableInterpreterSlack, whose purpose is to allow the AML interpreter to forgive certain bad AML constructs. Default setting is FALSE. -Implemented the first use of AcpiGbl_EnableInterpreterSlack in the Field IO -support code. If enabled, it allows field access to go beyond the end of a -region definition if the field is within the region length rounded up to the +Implemented the first use of AcpiGbl_EnableInterpreterSlack in the Field +IO +support code. If enabled, it allows field access to go beyond the end of +a +region definition if the field is within the region length rounded up to +the next access width boundary (a common coding error.) Renamed OSD_HANDLER to ACPI_OSD_HANDLER, and OSD_EXECUTION_CALLBACK to -ACPI_OSD_EXEC_CALLBACK for consistency with other ACPI symbols. Also, these +ACPI_OSD_EXEC_CALLBACK for consistency with other ACPI symbols. Also, +these symbols are lowercased by the latest version of the AcpiSrc tool. The prototypes for the PCI interfaces in acpiosxf.h have been updated to @@ -7065,11 +8401,14 @@ rename "Register" to simply "Reg" to prevent certain compilers from complaining. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7084,7 +8423,8 @@ the compiler options used during generation. Implemented full support for Package objects within the Case() operator. Note: The Break() operator is currently not supported within Case blocks -(TermLists) as there is some question about backward compatibility with ACPI +(TermLists) as there is some question about backward compatibility with +ACPI 1.0 interpreters. @@ -7103,22 +8443,27 @@ within the DefinitionBlock operator. 1) ACPI CA Core Subsystem: -Implemented support for Buffer and String objects (as per ACPI 2.0) for the +Implemented support for Buffer and String objects (as per ACPI 2.0) for +the following ASL operators: LEqual, LGreater, LLess, LGreaterEqual, and LLessEqual. All directory names in the entire source package are lower case, as they were in earlier releases. -Implemented "Disassemble" command in the AML debugger that will disassemble +Implemented "Disassemble" command in the AML debugger that will +disassemble a single control method. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7132,7 +8477,8 @@ the compiler options used during generation. 2) iASL Compiler/Disassembler: -Implemented support for Buffer and String objects (as per ACPI 2.0) for the +Implemented support for Buffer and String objects (as per ACPI 2.0) for +the following ASL operators: LEqual, LGreater, LLess, LGreaterEqual, and LLessEqual. @@ -7142,14 +8488,17 @@ were in earlier releases. Fixed a fault when using the -g or -d<nofilename> options if the FADT was not found. -Fixed an issue with the Windows version of the compiler where later versions +Fixed an issue with the Windows version of the compiler where later +versions of Windows place the FADT in the registry under the name "FADT" and not "FACP" as earlier versions did. This applies when using the -g or - d<nofilename> options. The compiler now looks for both strings as necessary. -Fixed a problem with compiler namepath optimization where a namepath within -the Scope() operator could not be optimized if the namepath was a subpath of +Fixed a problem with compiler namepath optimization where a namepath +within +the Scope() operator could not be optimized if the namepath was a subpath +of the current scope path. ---------------------------------------- @@ -7157,9 +8506,12 @@ the current scope path. 1) ACPI CA Core Subsystem: -Completed a new design and implementation for EBDA (Extended BIOS Data Area) -support in the RSDP scan code. The original code improperly scanned for the -EBDA by simply scanning from memory location 0 to 0x400. The correct method +Completed a new design and implementation for EBDA (Extended BIOS Data +Area) +support in the RSDP scan code. The original code improperly scanned for +the +EBDA by simply scanning from memory location 0 to 0x400. The correct +method is to first obtain the EBDA pointer from within the BIOS data area, then scan 1K of memory starting at the EBDA pointer. There appear to be few if any machines that place the RSDP in the EBDA, however. @@ -7176,11 +8528,14 @@ Rolled in a couple of changes to the FreeBSD-specific header. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7207,10 +8562,12 @@ during and after GPE method execution. Result of 04/27 changes. Removed extra "clear all GPEs" when sleeping/waking. Removed AcpiHwEnableGpe and AcpiHwDisableGpe, replaced by the single -AcpiHwWriteGpeEnableReg. Changed a couple of calls to the functions above to +AcpiHwWriteGpeEnableReg. Changed a couple of calls to the functions above +to the new AcpiEv* calls as appropriate. -ACPI_OS_NAME was removed from the OS-specific headers. The default name is +ACPI_OS_NAME was removed from the OS-specific headers. The default name +is now "Microsoft Windows NT" for maximum compatibility. However this can be changed by modifying the acconfig.h file. @@ -7218,7 +8575,8 @@ Allow a single invocation of AcpiInstallNotifyHandler for a handler that traps both types of notifies (System, Device). Use ACPI_ALL_NOTIFY flag. Run _INI methods on ThermalZone objects. This is against the ACPI -specification, but there is apparently ASL code in the field that has these +specification, but there is apparently ASL code in the field that has +these _INI methods, and apparently "other" AML interpreters execute them. Performed a full 16/32/64 bit lint that resulted in some small changes. @@ -7226,11 +8584,14 @@ Performed a full 16/32/64 bit lint that resulted in some small changes. Added a sleep simulation command to the AML debugger to test sleep code. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7246,26 +8607,33 @@ the compiler options used during generation. 1) ACPI CA Core Subsystem: Completed a major overhaul of the GPE handling within ACPI CA. There are -now three types of GPEs: wake-only, runtime-only, and combination wake/run. +now three types of GPEs: wake-only, runtime-only, and combination +wake/run. The only GPEs allowed to be combination wake/run are for button-style -devices such as a control-method power button, control-method sleep button, -or a notebook lid switch. GPEs that have an _Lxx or _Exx method and are not +devices such as a control-method power button, control-method sleep +button, +or a notebook lid switch. GPEs that have an _Lxx or _Exx method and are +not referenced by any _PRW methods are marked for "runtime" and hardware enabled. Any GPE that is referenced by a _PRW method is marked for "wake" (and disabled at runtime). However, at sleep time, only those GPEs that -have been specifically enabled for wake via the AcpiEnableGpe interface will +have been specifically enabled for wake via the AcpiEnableGpe interface +will actually be hardware enabled. -A new external interface has been added, AcpiSetGpeType(), that is meant to +A new external interface has been added, AcpiSetGpeType(), that is meant +to be used by device drivers to force a GPE to a particular type. It will be especially useful for the drivers for the button devices mentioned above. Completed restructuring of the ACPI CA initialization sequence so that -default operation region handlers are installed before GPEs are initialized +default operation region handlers are installed before GPEs are +initialized and the _PRW methods are executed. This will prevent errors when the _PRW methods attempt to access system memory or I/O space. -GPE enable/disable no longer reads the GPE enable register. We now keep the +GPE enable/disable no longer reads the GPE enable register. We now keep +the enable info for runtime and wake separate and in the GPE_EVENT_INFO. We thus no longer depend on the hardware to maintain these bits. @@ -7275,12 +8643,15 @@ for state S5. Improved the AML debugger output for displaying the GPE blocks and their current status. -Added new strings for the _OSI method, of the form "Windows 2001 SPx" where +Added new strings for the _OSI method, of the form "Windows 2001 SPx" +where x = 0,1,2,3,4. Fixed a problem where the physical address was incorrectly calculated when -the Load() operator was used to directly load from an Operation Region (vs. -loading from a Field object.) Also added check for minimum table length for +the Load() operator was used to directly load from an Operation Region +(vs. +loading from a Field object.) Also added check for minimum table length +for this case. Fix for multiple mutex acquisition. Restore original thread SyncLevel on @@ -7293,19 +8664,23 @@ Shrunk the ACPI_GPE_EVENT_INFO structure by 40%. There is one such structure for each GPE in the system, so the size of this structure is important. -CPU stack requirement reduction: Cleaned up the method execution and object +CPU stack requirement reduction: Cleaned up the method execution and +object evaluation paths so that now a parameter structure is passed, instead of copying the various method parameters over and over again. In evregion.c: Correctly exit and reenter the interpreter region if and -only if dispatching an operation region request to a user-installed handler. +only if dispatching an operation region request to a user-installed +handler. Do not exit/reenter when dispatching to a default handler (e.g., default system memory or I/O handlers) Notes for updating drivers for the new GPE support. The following changes -must be made to ACPI-related device drivers that are attached to one or more -GPEs: (This information will be added to the ACPI CA Programmer Reference.) +must be made to ACPI-related device drivers that are attached to one or +more +GPEs: (This information will be added to the ACPI CA Programmer +Reference.) 1) AcpiInstallGpeHandler no longer automatically enables the GPE, you must explicitly call AcpiEnableGpe. @@ -7328,18 +8703,22 @@ If _PRW exists: /* This is a control-method button */ AcpiSetGpeType (GpeDevice, GpeNum, ACPI_GPE_TYPE_WAKE_RUN); AcpiEnableGpe (GpeDevice, GpeNum, ACPI_NOT_ISR); -For all other devices that have _PRWs, we automatically set the GPE type to +For all other devices that have _PRWs, we automatically set the GPE type +to ACPI_GPE_TYPE_WAKE, but the GPE is NOT automatically (wake) enabled. This must be done on a selective basis, usually requiring some kind of user app to allow the user to pick the wake devices. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7359,7 +8738,8 @@ the compiler options used during generation. Fixed an interpreter problem where an indirect store through an ArgX parameter was incorrectly applying the "implicit conversion rules" during -the store. From the ACPI specification: "If the target is a method local or +the store. From the ACPI specification: "If the target is a method local +or argument (LocalX or ArgX), no conversion is performed and the result is stored directly to the target". The new behavior is to disable implicit conversion during ALL stores to an ArgX. @@ -7368,16 +8748,20 @@ Changed the behavior of the _PRW method scan to ignore any and all errors returned by a given _PRW. This prevents the scan from aborting from the failure of any single _PRW. -Moved the runtime configuration parameters from the global init procedure to +Moved the runtime configuration parameters from the global init procedure +to static variables in acglobal.h. This will allow the host to override the default values easily. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7394,11 +8778,13 @@ iASL now fully disassembles SSDTs. However, External() statements are not generated automatically for unresolved symbols at this time. This is a planned feature for future implementation. -Fixed a scoping problem in the disassembler that occurs when the type of the +Fixed a scoping problem in the disassembler that occurs when the type of +the target of a Scope() operator is overridden. This problem caused an incorrectly nested internal namespace to be constructed. -Any warnings or errors that are emitted during disassembly are now commented +Any warnings or errors that are emitted during disassembly are now +commented out automatically so that the resulting file can be recompiled without any hand editing. @@ -7410,8 +8796,10 @@ hand editing. Implemented support for "wake" GPEs via interaction between GPEs and the _PRW methods. Every GPE that is pointed to by one or more _PRWs is identified as a WAKE GPE and by default will no longer be enabled at -runtime. Previously, we were blindly enabling all GPEs with a corresponding -_Lxx or _Exx method - but most of these turn out to be WAKE GPEs anyway. We +runtime. Previously, we were blindly enabling all GPEs with a +corresponding +_Lxx or _Exx method - but most of these turn out to be WAKE GPEs anyway. +We believe this has been the cause of thousands of "spurious" GPEs on some systems. @@ -7430,7 +8818,8 @@ Integrated a fix for resource descriptors where both _MEM and _MTP were being extracted instead of just _MEM. (i.e. bitmask was incorrectly too wide, 0x0F instead of 0x03.) -Added a special case for ACPI_ROOT_OBJECT in AcpiUtGetNodeName, preventing a +Added a special case for ACPI_ROOT_OBJECT in AcpiUtGetNodeName, preventing +a fault in some cases. Updated Notify() values for debug statements in evmisc.c @@ -7438,11 +8827,14 @@ Updated Notify() values for debug statements in evmisc.c Return proper status from AcpiUtMutexInitialize, not just simply AE_OK. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7463,7 +8855,8 @@ method execution did not abort cleanly. For example, objects created and installed in the namespace were not deleted. This caused all subsequent invocations of the method to return the AE_ALREADY_EXISTS exception. -Implemented a mechanism to force a control method to "Serialized" execution +Implemented a mechanism to force a control method to "Serialized" +execution if the method attempts to create namespace objects. (The root of the AE_ALREADY_EXISTS problem.) @@ -7474,10 +8867,13 @@ This feature will allow "other" operating systems to execute the fully tested, "Windows" code path through the ASL code Global Lock Support: Now allows multiple acquires and releases with any -internal thread. Removed concept of "owning thread" for this special mutex. +internal thread. Removed concept of "owning thread" for this special +mutex. -Fixed two functions that were inappropriately declaring large objects on the -CPU stack: PsParseLoop, NsEvaluateRelative. Reduces the stack usage during +Fixed two functions that were inappropriately declaring large objects on +the +CPU stack: PsParseLoop, NsEvaluateRelative. Reduces the stack usage +during method execution considerably. Fixed a problem in the ACPI 2.0 FACS descriptor (actbl2.h) where the @@ -7486,16 +8882,20 @@ S4Bios_f field was incorrectly defined as UINT32 instead of UINT32_BIT. Fixed a problem where AcpiEvGpeDetect would fault if there were no GPEs defined on the machine. -Implemented two runtime options: One to force all control method execution +Implemented two runtime options: One to force all control method +execution to "Serialized" to mimic Windows behavior, another to disable _OSI support if it causes problems on a given machine. Code and Data Size: Current and previous core subsystem library sizes are -shown below. These are the code and data sizes for the acpica.lib produced +shown below. These are the code and data sizes for the acpica.lib +produced by the Microsoft Visual C++ 6.0 compiler, and these values do not include any ACPI driver or OSPM code. The debug version of the code includes the -debug output trace mechanism and has a much larger code and data size. Note -that these values will vary depending on the efficiency of the compiler and +debug output trace mechanism and has a much larger code and data size. +Note +that these values will vary depending on the efficiency of the compiler +and the compiler options used during generation. Previous Release: @@ -7530,7 +8930,8 @@ structures to the beginning of the file. After wake, clear GPE status register(s) before enabling GPEs. -After wake, clear/enable power button. (Perhaps we should clear/enable all +After wake, clear/enable power button. (Perhaps we should clear/enable +all fixed events upon wake.) Fixed a couple of possible memory leaks in the Namespace manager. @@ -7550,9 +8951,11 @@ Fixed a problem where a store of an object into an indexed package could fail if the store occurs within a different method than the method that created the package. -Fixed a problem where the ToDecimal operator could return incorrect results. +Fixed a problem where the ToDecimal operator could return incorrect +results. -Fixed a problem where the CopyObject operator could fail on some of the more +Fixed a problem where the CopyObject operator could fail on some of the +more obscure objects (e.g., Reference objects.) Improved the output of the Debug object to display buffer, package, and @@ -7586,7 +8989,8 @@ Removed extraneous reference to NewObj in dsmthdat.c 2) iASL compiler -Fixed a problem introduced in December that disabled the correct disassembly +Fixed a problem introduced in December that disabled the correct +disassembly of Resource Templates diff --git a/source/common/adfile.c b/source/common/adfile.c index 2caf59954a54..2c864d4bc096 100644 --- a/source/common/adfile.c +++ b/source/common/adfile.c @@ -100,7 +100,7 @@ AdGenerateFilename ( FilenameBuf[i] = 0; strcat (FilenameBuf, ACPI_TABLE_FILE_SUFFIX); - return FilenameBuf; + return (FilenameBuf); } @@ -183,7 +183,7 @@ AdWriteTable ( * RETURN: New filename containing the original base + the new suffix * * DESCRIPTION: Generate a new filename from the ASL source filename and a new - * extension. Used to create the *.LST, *.TXT, etc. files. + * extension. Used to create the *.LST, *.TXT, etc. files. * ******************************************************************************/ @@ -223,7 +223,7 @@ FlGenerateFilename ( strcat (NewFilename, Suffix); } - return NewFilename; + return (NewFilename); } @@ -332,5 +332,3 @@ FlSplitInputPathname ( *OutFilename = Filename; return (AE_OK); } - - diff --git a/source/common/adisasm.c b/source/common/adisasm.c index fab36179a81d..9ba89164c534 100644 --- a/source/common/adisasm.c +++ b/source/common/adisasm.c @@ -296,7 +296,7 @@ AdAmlDisassemble ( Status = AcpiDbGetTableFromFile (Filename, &Table); if (ACPI_FAILURE (Status)) { - return Status; + return (Status); } /* @@ -311,14 +311,13 @@ AdAmlDisassemble ( /* Next external file */ ExternalFileList = ExternalFileList->Next; - continue; } Status = AcpiDbGetTableFromFile (ExternalFilename, &ExternalTable); if (ACPI_FAILURE (Status)) { - return Status; + return (Status); } /* Load external table for symbol resolution */ @@ -330,7 +329,7 @@ AdAmlDisassemble ( { AcpiOsPrintf ("Could not parse external ACPI tables, %s\n", AcpiFormatException (Status)); - return Status; + return (Status); } /* @@ -361,12 +360,12 @@ AdAmlDisassemble ( { AcpiOsPrintf ("Could not get ACPI tables, %s\n", AcpiFormatException (Status)); - return Status; + return (Status); } if (!AcpiGbl_DbOpt_disasm) { - return AE_OK; + return (AE_OK); } /* Obtained the local tables, just disassemble the DSDT */ @@ -376,7 +375,7 @@ AdAmlDisassemble ( { AcpiOsPrintf ("Could not get DSDT, %s\n", AcpiFormatException (Status)); - return Status; + return (Status); } AcpiOsPrintf ("\nDisassembly of DSDT\n"); @@ -531,7 +530,14 @@ AdAmlDisassemble ( if (AcpiGbl_DbOpt_disasm) { + /* This is the real disassembly */ + AdDisplayTables (Filename, Table); + + /* Dump hex table if requested (-vt) */ + + AcpiDmDumpDataTable (Table); + fprintf (stderr, "Disassembly completed\n"); fprintf (stderr, "ASL Output: %s - %u bytes\n", DisasmFilename, AdGetFileSize (File)); @@ -720,7 +726,7 @@ AdDisplayTables ( if (!AcpiGbl_ParseOpRoot) { - return AE_NOT_EXIST; + return (AE_NOT_EXIST); } if (!AcpiGbl_DbOpt_verbose) @@ -733,15 +739,15 @@ AdDisplayTables ( if (AcpiGbl_DbOpt_verbose) { AcpiOsPrintf ("\n\nTable Header:\n"); - AcpiUtDumpBuffer ((UINT8 *) Table, sizeof (ACPI_TABLE_HEADER), + AcpiUtDebugDumpBuffer ((UINT8 *) Table, sizeof (ACPI_TABLE_HEADER), DB_BYTE_DISPLAY, ACPI_UINT32_MAX); AcpiOsPrintf ("Table Body (Length 0x%X)\n", Table->Length); - AcpiUtDumpBuffer (((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)), Table->Length, - DB_BYTE_DISPLAY, ACPI_UINT32_MAX); + AcpiUtDebugDumpBuffer (((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)), + Table->Length, DB_BYTE_DISPLAY, ACPI_UINT32_MAX); } - return AE_OK; + return (AE_OK); } @@ -808,8 +814,8 @@ AdDeferredParse ( /* * We need to update all of the Aml offsets, since the parser thought - * that the method began at offset zero. In reality, it began somewhere - * within the ACPI table, at the BaseAmlOffset. Walk the entire tree that + * that the method began at offset zero. In reality, it began somewhere + * within the ACPI table, at the BaseAmlOffset. Walk the entire tree that * was just created and update the AmlOffset in each Op */ BaseAmlOffset = (Op->Common.Value.Arg)->Common.AmlOffset + 1; @@ -914,7 +920,7 @@ AdParseDeferredOps ( Status = AdDeferredParse (Op, Op->Named.Data, Op->Named.Length); if (ACPI_FAILURE (Status)) { - return_ACPI_STATUS (Status); + return (Status); } break; @@ -942,7 +948,7 @@ AdParseDeferredOps ( } fprintf (stderr, "\n"); - return Status; + return (Status); } @@ -979,7 +985,7 @@ AdGetLocalTables ( if (!NewTable) { fprintf (stderr, "Could not obtain RSDT\n"); - return AE_NO_ACPI_TABLES; + return (AE_NO_ACPI_TABLES); } else { @@ -999,7 +1005,7 @@ AdGetLocalTables ( /* * Determine the number of tables pointed to by the RSDT/XSDT. * This is defined by the ACPI Specification to be the number of - * pointers contained within the RSDT/XSDT. The size of the pointers + * pointers contained within the RSDT/XSDT. The size of the pointers * is architecture-dependent. */ NumTables = (NewTable->Length - sizeof (ACPI_TABLE_HEADER)) / PointerSize; @@ -1036,13 +1042,13 @@ AdGetLocalTables ( if (ACPI_FAILURE (Status)) { fprintf (stderr, "Could not store DSDT\n"); - return AE_NO_ACPI_TABLES; + return (AE_NO_ACPI_TABLES); } } else { fprintf (stderr, "Could not obtain DSDT\n"); - return AE_NO_ACPI_TABLES; + return (AE_NO_ACPI_TABLES); } #if 0 @@ -1061,7 +1067,7 @@ AdGetLocalTables ( } while (NewTable); #endif - return AE_OK; + return (AE_OK); } @@ -1096,7 +1102,7 @@ AdParseTable ( if (!Table) { - return AE_NOT_EXIST; + return (AE_NOT_EXIST); } /* Pass 1: Parse everything except control method bodies */ @@ -1111,7 +1117,7 @@ AdParseTable ( AcpiGbl_ParseOpRoot = AcpiPsCreateScopeOp (); if (!AcpiGbl_ParseOpRoot) { - return AE_NO_MEMORY; + return (AE_NO_MEMORY); } /* Create and initialize a new walk state */ @@ -1136,7 +1142,7 @@ AdParseTable ( Status = AcpiPsParseAml (WalkState); if (ACPI_FAILURE (Status)) { - return Status; + return (Status); } /* If LoadTable is FALSE, we are parsing the last loaded table */ @@ -1151,19 +1157,19 @@ AdParseTable ( Table->Length, ACPI_TABLE_ORIGIN_ALLOCATED, &TableIndex); if (ACPI_FAILURE (Status)) { - return Status; + return (Status); } Status = AcpiTbAllocateOwnerId (TableIndex); if (ACPI_FAILURE (Status)) { - return Status; + return (Status); } if (OwnerId) { Status = AcpiTbGetOwnerId (TableIndex, OwnerId); if (ACPI_FAILURE (Status)) { - return Status; + return (Status); } } } @@ -1180,7 +1186,7 @@ AdParseTable ( if (External) { - return AE_OK; + return (AE_OK); } /* Pass 3: Parse control methods and link their parse trees into the main parse tree */ @@ -1192,7 +1198,5 @@ AdParseTable ( AcpiDmFindResources (AcpiGbl_ParseOpRoot); fprintf (stderr, "Parsing completed\n"); - return AE_OK; + return (AE_OK); } - - diff --git a/source/common/adwalk.c b/source/common/adwalk.c index 5336b61ef979..584300516be3 100644 --- a/source/common/adwalk.c +++ b/source/common/adwalk.c @@ -654,8 +654,8 @@ AcpiDmLoadDescendingOp ( while (AcpiGbl_PreDefinedNames[PreDefineIndex].Name) { - if (!ACPI_STRNCMP (Node->Name.Ascii, - AcpiGbl_PreDefinedNames[PreDefineIndex].Name, 4)) + if (ACPI_COMPARE_NAME (Node->Name.Ascii, + AcpiGbl_PreDefinedNames[PreDefineIndex].Name)) { PreDefined = TRUE; break; @@ -787,7 +787,7 @@ AcpiDmXrefDescendingOp ( } /* - * Lookup the name in the namespace. Name must exist at this point, or it + * Lookup the name in the namespace. Name must exist at this point, or it * is an invalid reference. * * The namespace is also used as a lookup table for references to resource @@ -1018,5 +1018,3 @@ AcpiDmInspectPossibleArgs ( return (Last); } - - diff --git a/source/common/dmextern.c b/source/common/dmextern.c index 195290063a4e..22924dd41688 100644 --- a/source/common/dmextern.c +++ b/source/common/dmextern.c @@ -687,4 +687,3 @@ AcpiDmEmitExternals ( AcpiOsPrintf ("\n"); } - diff --git a/source/common/dmrestag.c b/source/common/dmrestag.c index 9d18539a7f32..8426dff8448b 100644 --- a/source/common/dmrestag.c +++ b/source/common/dmrestag.c @@ -1050,4 +1050,3 @@ AcpiDmAddResourceToNamespace ( Node->Length = Length; return (AE_OK); } - diff --git a/source/common/dmtable.c b/source/common/dmtable.c index cb97b541d97e..6c23783e69ed 100644 --- a/source/common/dmtable.c +++ b/source/common/dmtable.c @@ -415,6 +415,18 @@ AcpiDmDumpDataTable ( if (AcpiUtIsAmlTable (Table)) { + if (Gbl_VerboseTemplates) + { + /* Dump the raw table data */ + + Length = Table->Length; + + AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n", + ACPI_RAW_TABLE_DATA_HEADER, Length, Length); + AcpiUtDumpBuffer (ACPI_CAST_PTR (UINT8, Table), + Length, DB_BYTE_DISPLAY, 0); + AcpiOsPrintf (" */\n"); + } return; } @@ -484,7 +496,8 @@ AcpiDmDumpDataTable ( AcpiOsPrintf ("\n%s: Length %d (0x%X)\n\n", ACPI_RAW_TABLE_DATA_HEADER, Length, Length); - AcpiUtDumpBuffer2 (ACPI_CAST_PTR (UINT8, Table), Length, DB_BYTE_DISPLAY); + AcpiUtDumpBuffer (ACPI_CAST_PTR (UINT8, Table), + Length, DB_BYTE_DISPLAY, 0); } } diff --git a/source/common/dmtbdump.c b/source/common/dmtbdump.c index 102f1fe0c241..85ae14cedf66 100644 --- a/source/common/dmtbdump.c +++ b/source/common/dmtbdump.c @@ -1611,8 +1611,8 @@ AcpiDmDumpMpst ( ACPI_MPST_DATA_HDR *SubTable1; ACPI_MPST_POWER_DATA *SubTable2; UINT16 SubtableCount; - UINT8 PowerStateCount; - UINT8 ComponentCount; + UINT32 PowerStateCount; + UINT32 ComponentCount; /* Main table */ diff --git a/source/common/dmtbinfo.c b/source/common/dmtbinfo.c index 1cd856a854c9..19d9df3c9ad6 100644 --- a/source/common/dmtbinfo.c +++ b/source/common/dmtbinfo.c @@ -1518,10 +1518,10 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMchi[] = ACPI_DMTABLE_INFO AcpiDmTableInfoMpst[] = { - {ACPI_DMT_UINT16, ACPI_MPST_OFFSET (Reserved1), "Reserved", 0}, {ACPI_DMT_UINT8, ACPI_MPST_OFFSET (ChannelId), "Channel ID", 0}, - {ACPI_DMT_UINT8, ACPI_MPST_OFFSET (Reserved2), "Reserved", 0}, + {ACPI_DMT_UINT24, ACPI_MPST_OFFSET (Reserved1[0]), "Reserved", 0}, {ACPI_DMT_UINT16, ACPI_MPST_OFFSET (PowerNodeCount), "Power Node Count", 0}, + {ACPI_DMT_UINT16, ACPI_MPST_OFFSET (Reserved2), "Reserved", 0}, ACPI_DMT_TERMINATOR }; @@ -1538,12 +1538,11 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMpst0[] = {ACPI_DMT_UINT8, ACPI_MPST0_OFFSET (Reserved1), "Reserved", 0}, {ACPI_DMT_UINT16, ACPI_MPST0_OFFSET (NodeId), "Node ID", 0}, - {ACPI_DMT_UINT32, ACPI_MPST0_OFFSET (Length), "Length", DT_LENGTH}, + {ACPI_DMT_UINT32, ACPI_MPST0_OFFSET (Length), "Length", 0}, {ACPI_DMT_UINT64, ACPI_MPST0_OFFSET (RangeAddress), "Range Address", 0}, {ACPI_DMT_UINT64, ACPI_MPST0_OFFSET (RangeLength), "Range Length", 0}, - {ACPI_DMT_UINT8, ACPI_MPST0_OFFSET (NumPowerStates), "Num Power States", 0}, - {ACPI_DMT_UINT8, ACPI_MPST0_OFFSET (NumPhysicalComponents), "Num Physical Components", 0}, - {ACPI_DMT_UINT16, ACPI_MPST0_OFFSET (Reserved2), "Reserved", 0}, + {ACPI_DMT_UINT32, ACPI_MPST0_OFFSET (NumPowerStates), "Num Power States", 0}, + {ACPI_DMT_UINT32, ACPI_MPST0_OFFSET (NumPhysicalComponents), "Num Physical Components", 0}, ACPI_DMT_TERMINATOR }; @@ -1569,6 +1568,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMpst0B[] = ACPI_DMTABLE_INFO AcpiDmTableInfoMpst1[] = { {ACPI_DMT_UINT16, ACPI_MPST1_OFFSET (CharacteristicsCount), "Characteristics Count", 0}, + {ACPI_DMT_UINT16, ACPI_MPST1_OFFSET (Reserved), "Reserved", 0}, ACPI_DMT_TERMINATOR }; @@ -1576,7 +1576,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMpst1[] = ACPI_DMTABLE_INFO AcpiDmTableInfoMpst2[] = { - {ACPI_DMT_UINT8, ACPI_MPST2_OFFSET (Revision), "Revision", 0}, + {ACPI_DMT_UINT8, ACPI_MPST2_OFFSET (StructureId), "Structure ID", 0}, {ACPI_DMT_UINT8, ACPI_MPST2_OFFSET (Flags), "Flags (decoded below)", DT_FLAG}, {ACPI_DMT_FLAG0, ACPI_MPST2_FLAG_OFFSET (Flags,0), "Memory Preserved", 0}, {ACPI_DMT_FLAG1, ACPI_MPST2_FLAG_OFFSET (Flags,0), "Auto Entry", 0}, diff --git a/source/common/getopt.c b/source/common/getopt.c index 80d80811746b..6696e3a7a2f3 100644 --- a/source/common/getopt.c +++ b/source/common/getopt.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: getopt diff --git a/source/compiler/aslcodegen.c b/source/compiler/aslcodegen.c index 98869f569a90..c7dbaa1a1400 100644 --- a/source/compiler/aslcodegen.c +++ b/source/compiler/aslcodegen.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslcodegen - AML code generation @@ -89,7 +88,7 @@ CgWriteNode ( * * RETURN: None * - * DESCRIPTION: Generate AML code. Currently generates the listing file + * DESCRIPTION: Generate AML code. Currently generates the listing file * simultaneously. * ******************************************************************************/ @@ -446,7 +445,7 @@ CgWriteTableHeader ( /* Compiler ID */ - strncpy (TableHeader.AslCompilerId, ASL_CREATOR_ID, 4); + ACPI_MOVE_NAME (TableHeader.AslCompilerId, ASL_CREATOR_ID); /* Compiler version */ @@ -589,5 +588,3 @@ CgWriteNode ( break; } } - - diff --git a/source/compiler/aslcompile.c b/source/compiler/aslcompile.c index 3ac3c24d67f3..f0fd3293d55a 100644 --- a/source/compiler/aslcompile.c +++ b/source/compiler/aslcompile.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslcompile - top level compile module @@ -480,7 +479,7 @@ CmDoCompile ( { UtEndEvent (Event); CmCleanupAndExit (); - return 0; + return (0); } } UtEndEvent (Event); @@ -548,7 +547,7 @@ CmDoCompile ( if (ACPI_FAILURE (Status)) { AePrintErrorLog (ASL_FILE_STDERR); - return -1; + return (-1); } /* Interpret and generate all compile-time constants */ @@ -589,7 +588,7 @@ CmDoCompile ( UtDisplaySummary (ASL_FILE_STDOUT); } UtEndEvent (FullCompile); - return 0; + return (0); } /* @@ -621,7 +620,7 @@ CmDoCompile ( UtEndEvent (AslGbl_NamespaceEvent); /* - * Semantic analysis. This can happen only after the + * Semantic analysis. This can happen only after the * namespace has been loaded and cross-referenced. * * part one - check control methods @@ -682,7 +681,7 @@ CmDoCompile ( UtEndEvent (FullCompile); CmCleanupAndExit (); - return 0; + return (0); ErrorExit: UtEndEvent (FullCompile); @@ -905,5 +904,3 @@ CmCleanupAndExit ( FlDeleteFile (ASL_FILE_SOURCE_OUTPUT); } } - - diff --git a/source/compiler/aslcompiler.h b/source/compiler/aslcompiler.h index c68fcb45cc2b..98dc27d2216e 100644 --- a/source/compiler/aslcompiler.h +++ b/source/compiler/aslcompiler.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslcompiler.h - common include file for iASL @@ -1128,4 +1127,3 @@ DtCreateTemplates ( char *Signature); #endif /* __ASLCOMPILER_H */ - diff --git a/source/compiler/aslcompiler.y b/source/compiler/aslcompiler.y index 92ae9409cfff..d1f47da3a3a5 100644 --- a/source/compiler/aslcompiler.y +++ b/source/compiler/aslcompiler.y @@ -3509,7 +3509,7 @@ OptionalXferSize int AslCompilerwrap(void) { - return 1; + return (1); } /*! [End] no source code translation !*/ diff --git a/source/compiler/asldefine.h b/source/compiler/asldefine.h index a83a021bfec9..0ee3c690a70f 100644 --- a/source/compiler/asldefine.h +++ b/source/compiler/asldefine.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asldefine.h - Common defines for the iASL compiler @@ -174,4 +173,3 @@ RsCreateResourceField (Op, Name, ByteOffset, 0, 64); #endif /* ASLDEFINE.H */ - diff --git a/source/compiler/aslerror.c b/source/compiler/aslerror.c index c125dfcfdce0..74c220d1214f 100644 --- a/source/compiler/aslerror.c +++ b/source/compiler/aslerror.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslerror - Error handling and statistics @@ -95,7 +94,7 @@ AeClearErrorLog ( * * RETURN: None * - * DESCRIPTION: Add a new error node to the error log. The error log is + * DESCRIPTION: Add a new error node to the error log. The error log is * ordered by the "logical" line number (cumulative line number * including all include files.) * @@ -783,5 +782,5 @@ AslCompilererror ( Gbl_CurrentColumn, Gbl_Files[ASL_FILE_INPUT].Filename, ACPI_CAST_PTR (char, CompilerMessage)); - return 0; + return (0); } diff --git a/source/compiler/aslfiles.c b/source/compiler/aslfiles.c index 7aa426c590d0..3a3de3819e0e 100644 --- a/source/compiler/aslfiles.c +++ b/source/compiler/aslfiles.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslfiles - file I/O suppoert @@ -63,7 +62,6 @@ FlParseInputPathname ( #endif - /******************************************************************************* * * FUNCTION: AslAbort @@ -72,7 +70,7 @@ FlParseInputPathname ( * * RETURN: None * - * DESCRIPTION: Dump the error log and abort the compiler. Used for serious + * DESCRIPTION: Dump the error log and abort the compiler. Used for serious * I/O errors * ******************************************************************************/ @@ -199,7 +197,7 @@ FlGetFileSize ( * Buffer - Where to place the data * Length - Amount to read * - * RETURN: Status. AE_ERROR indicates EOF. + * RETURN: Status. AE_ERROR indicates EOF. * * DESCRIPTION: Read data from an open file. * NOTE: Aborts compiler on any error. @@ -347,7 +345,7 @@ FlSeekFile ( * * RETURN: None * - * DESCRIPTION: Close an open file. Aborts compiler on error + * DESCRIPTION: Close an open file. Aborts compiler on error * ******************************************************************************/ @@ -806,7 +804,7 @@ FlOpenInputFile ( * * RETURN: Status * - * DESCRIPTION: Create the output filename (*.AML) and open the file. The file + * DESCRIPTION: Create the output filename (*.AML) and open the file. The file * is created in the same directory as the parent input file. * ******************************************************************************/ @@ -1147,5 +1145,3 @@ FlParseInputPathname ( return (AE_OK); } #endif - - diff --git a/source/compiler/aslfold.c b/source/compiler/aslfold.c index 425a328a9e88..e8e6b31c53aa 100644 --- a/source/compiler/aslfold.c +++ b/source/compiler/aslfold.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslfold - Constant folding @@ -334,7 +333,7 @@ OpcAmlConstantWalk ( WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL); if (!WalkState) { - return AE_NO_MEMORY; + return (AE_NO_MEMORY); } WalkState->NextOp = NULL; diff --git a/source/compiler/aslglobal.h b/source/compiler/aslglobal.h index 0451fecd7101..987ed1c2a2cf 100644 --- a/source/compiler/aslglobal.h +++ b/source/compiler/aslglobal.h @@ -1,5 +1,3 @@ - - /****************************************************************************** * * Module Name: aslglobal.h - Global variable definitions @@ -49,7 +47,7 @@ /* - * Global variables. Defined in aslmain.c only, externed in all other files + * Global variables. Defined in aslmain.c only, externed in all other files */ #undef ASL_EXTERN @@ -254,4 +252,3 @@ ASL_EXTERN char StringBuffer2[ASL_MSG_BUFFER_SIZE]; #endif /* __ASLGLOBAL_H */ - diff --git a/source/compiler/asllength.c b/source/compiler/asllength.c index ed88de9847fd..2207f362918b 100644 --- a/source/compiler/asllength.c +++ b/source/compiler/asllength.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asllength - Tree walk to determine package and opcode lengths @@ -80,7 +79,7 @@ LnAdjustLengthToRoot ( * RETURN: Status * * DESCRIPTION: Walk callback to initialize (and re-initialize) the node - * subtree length(s) to zero. The Subtree lengths are bubbled + * subtree length(s) to zero. The Subtree lengths are bubbled * up to the root node in order to get a total AML length. * ******************************************************************************/ @@ -112,7 +111,7 @@ LnInitLengthsWalk ( * them all into the parent subtree length. * * Note: The SubtreeLength represents the total AML length of all child nodes - * in all subtrees under a given node. Therefore, once this walk is + * in all subtrees under a given node. Therefore, once this walk is * complete, the Root Node subtree length is the AML length of the entire * tree (and thus, the entire ACPI table) * @@ -426,7 +425,7 @@ CgGenerateAmlLengths ( * RETURN: None. * * DESCRIPTION: Change the Subtree length of the given node, and bubble the - * change all the way up to the root node. This allows for + * change all the way up to the root node. This allows for * last second changes to a package length (for example, if the * package length encoding gets shorter or longer.) * @@ -454,5 +453,3 @@ LnAdjustLengthToRoot ( Gbl_TableLength -= LengthDelta; } #endif - - diff --git a/source/compiler/asllisting.c b/source/compiler/asllisting.c index c865df6d0f1d..339cc01ac4c6 100644 --- a/source/compiler/asllisting.c +++ b/source/compiler/asllisting.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asllisting - Listing file generation @@ -340,7 +339,7 @@ LsAmlListingWalk ( * * RETURN: None * - * DESCRIPTION: Generate a listing file. This can be one of the several types + * DESCRIPTION: Generate a listing file. This can be one of the several types * of "listings" supported. * ******************************************************************************/ @@ -421,7 +420,7 @@ LsDoListings ( * * RETURN: None * - * DESCRIPTION: Push a listing node on the listing/include file stack. This + * DESCRIPTION: Push a listing node on the listing/include file stack. This * stack enables tracking of include files (infinitely nested) * and resumption of the listing of the parent file when the * include file is finished. @@ -479,7 +478,7 @@ LsPopNode ( { AslError (ASL_ERROR, ASL_MSG_COMPILER_INTERNAL, NULL, "Could not pop empty listing stack"); - return Gbl_ListingNode; + return (Gbl_ListingNode); } Gbl_ListingNode = Lnode->Next; @@ -501,8 +500,8 @@ LsPopNode ( * RETURN: None * * DESCRIPTION: Check if there is an exception for this line, and if there is, - * put it in the listing immediately. Handles multiple errors - * per line. Gbl_NextError points to the next error in the + * put it in the listing immediately. Handles multiple errors + * per line. Gbl_NextError points to the next error in the * sorted (by line #) list of compile errors/warnings. * ******************************************************************************/ @@ -545,7 +544,7 @@ LsCheckException ( * RETURN: None * * DESCRIPTION: Flush out the current contents of the 16-byte hex AML code - * buffer. Usually called at the termination of a single line + * buffer. Usually called at the termination of a single line * of source code or when the buffer is full. * ******************************************************************************/ @@ -653,7 +652,7 @@ LsFlushListingBuffer ( * RETURN: None * * DESCRIPTION: Write the contents of the AML buffer to the listing file via - * the listing buffer. The listing buffer is flushed every 16 + * the listing buffer. The listing buffer is flushed every 16 * AML bytes. * ******************************************************************************/ @@ -807,7 +806,7 @@ LsWriteOneSourceLine ( * * RETURN: None * - * DESCRIPTION: Cleanup routine for the listing file. Flush the hex AML + * DESCRIPTION: Cleanup routine for the listing file. Flush the hex AML * listing buffer, and flush out any remaining lines in the * source input file. * @@ -868,7 +867,7 @@ LsFinishSourceListing ( * RETURN: None * * DESCRIPTION: Read then write source lines to the listing file until we have - * reached the specified logical (cumulative) line number. This + * reached the specified logical (cumulative) line number. This * automatically echos out comment blocks and other non-AML * generating text until we get to the actual AML-generating line * of ASL code specified by the logical line number. @@ -937,7 +936,7 @@ LsWriteSourceLines ( * * RETURN: None. * - * DESCRIPTION: Write "a node" to the listing file. This means to + * DESCRIPTION: Write "a node" to the listing file. This means to * 1) Write out all of the source text associated with the node * 2) Write out all of the AML bytes associated with the node * 3) Write any compiler exceptions associated with the node @@ -1289,7 +1288,7 @@ LsDoHexOutput ( * * RETURN: None. * - * DESCRIPTION: Create the hex output file. This is the same data as the AML + * DESCRIPTION: Create the hex output file. This is the same data as the AML * output file, but formatted into hex/ascii bytes suitable for * inclusion into a C source file. * @@ -1377,7 +1376,7 @@ LsDoHexOutputC ( * * RETURN: None. * - * DESCRIPTION: Create the hex output file. This is the same data as the AML + * DESCRIPTION: Create the hex output file. This is the same data as the AML * output file, but formatted into hex/ascii bytes suitable for * inclusion into a C source file. * @@ -1465,7 +1464,7 @@ LsDoHexOutputAsl ( * * RETURN: None. * - * DESCRIPTION: Create the hex output file. This is the same data as the AML + * DESCRIPTION: Create the hex output file. This is the same data as the AML * output file, but formatted into hex/ascii bytes suitable for * inclusion into a ASM source file. * @@ -1538,5 +1537,3 @@ LsDoHexOutputAsm ( FlPrintFile (ASL_FILE_HEX_OUTPUT, "\n"); } - - diff --git a/source/compiler/aslload.c b/source/compiler/aslload.c index c3a0d644f4b1..743607103b78 100644 --- a/source/compiler/aslload.c +++ b/source/compiler/aslload.c @@ -113,7 +113,7 @@ LdLoadNamespace ( WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL); if (!WalkState) { - return AE_NO_MEMORY; + return (AE_NO_MEMORY); } /* Walk the entire parse tree, first pass */ @@ -129,7 +129,7 @@ LdLoadNamespace ( /* Dump the namespace if debug is enabled */ AcpiNsDumpTables (ACPI_NS_ALL, ACPI_UINT32_MAX); - return AE_OK; + return (AE_OK); } @@ -894,5 +894,3 @@ LdCommonNamespaceEnd ( return (AE_OK); } - - diff --git a/source/compiler/asllookup.c b/source/compiler/asllookup.c index 6df64366b3bf..8bd93559bc51 100644 --- a/source/compiler/asllookup.c +++ b/source/compiler/asllookup.c @@ -423,7 +423,7 @@ LsDoOnePathname ( * RETURN: Status * * DESCRIPTION: Walk the namespace an display information about each node - * in the tree. Information is written to the optional + * in the tree. Information is written to the optional * namespace output file. * ******************************************************************************/ @@ -691,8 +691,8 @@ LkFindUnreferencedObjects ( * RETURN: Status * * DESCRIPTION: Perform a cross reference check of the parse tree against the - * namespace. Every named referenced within the parse tree - * should be get resolved with a namespace lookup. If not, the + * namespace. Every named referenced within the parse tree + * should be get resolved with a namespace lookup. If not, the * original reference in the ASL code is invalid -- i.e., refers * to a non-existent object. * @@ -718,14 +718,14 @@ LkCrossReferenceNamespace ( WalkState = AcpiDsCreateWalkState (0, NULL, NULL, NULL); if (!WalkState) { - return AE_NO_MEMORY; + return (AE_NO_MEMORY); } /* Walk the entire parse tree */ TrWalkParseTree (RootNode, ASL_WALK_VISIT_TWICE, LkNamespaceLocateBegin, LkNamespaceLocateEnd, WalkState); - return AE_OK; + return (AE_OK); } @@ -759,7 +759,7 @@ LkCheckFieldRange ( /* - * Check each field unit against the region size. The entire + * Check each field unit against the region size. The entire * field unit (start offset plus length) must fit within the * region. */ @@ -775,7 +775,7 @@ LkCheckFieldRange ( /* * Now check that the field plus AccessWidth doesn't go beyond - * the end-of-region. Assumes AccessBitWidth is a power of 2 + * the end-of-region. Assumes AccessBitWidth is a power of 2 */ FieldEndBitOffset = ACPI_ROUND_UP (FieldEndBitOffset, AccessBitWidth); @@ -795,13 +795,13 @@ LkCheckFieldRange ( * * RETURN: Status * - * DESCRIPTION: Descending callback used during cross-reference. For named + * DESCRIPTION: Descending callback used during cross-reference. For named * object references, attempt to locate the name in the * namespace. * * NOTE: ASL references to named fields within resource descriptors are - * resolved to integer values here. Therefore, this step is an - * important part of the code generation. We don't know that the + * resolved to integer values here. Therefore, this step is an + * important part of the code generation. We don't know that the * name refers to a resource descriptor until now. * ******************************************************************************/ @@ -835,7 +835,7 @@ LkNamespaceLocateBegin ( /* * If this node is the actual declaration of a name * [such as the XXXX name in "Method (XXXX)"], - * we are not interested in it here. We only care about names that are + * we are not interested in it here. We only care about names that are * references to other objects within the namespace and the parent objects * of name declarations */ @@ -921,7 +921,7 @@ LkNamespaceLocateBegin ( "Type=%s\n", AcpiUtGetTypeName (ObjectType))); /* - * Lookup the name in the namespace. Name must exist at this point, or it + * Lookup the name in the namespace. Name must exist at this point, or it * is an invalid reference. * * The namespace is also used as a lookup table for references to resource @@ -1226,9 +1226,9 @@ LkNamespaceLocateBegin ( (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_BANKFIELD))) { /* - * Offset checking for fields. If the parent operation region has a + * Offset checking for fields. If the parent operation region has a * constant length (known at compile time), we can check fields - * defined in that region against the region length. This will catch + * defined in that region against the region length. This will catch * fields and field units that cannot possibly fit within the region. * * Note: Index fields do not directly reference an operation region, @@ -1238,7 +1238,7 @@ LkNamespaceLocateBegin ( { /* * This is the first child of the field node, which is - * the name of the region. Get the parse node for the + * the name of the region. Get the parse node for the * region -- which contains the length of the region. */ OwningOp = Node->Op; @@ -1315,7 +1315,7 @@ LkNamespaceLocateBegin ( else { /* - * This is one element of the field list. Check to make sure + * This is one element of the field list. Check to make sure * that it does not go beyond the end of the parent operation region. * * In the code below: @@ -1348,7 +1348,7 @@ LkNamespaceLocateBegin ( * * RETURN: Status * - * DESCRIPTION: Ascending callback used during cross reference. We only + * DESCRIPTION: Ascending callback used during cross reference. We only * need to worry about scope management here. * ******************************************************************************/ @@ -1397,5 +1397,3 @@ LkNamespaceLocateEnd ( return (AE_OK); } - - diff --git a/source/compiler/aslmain.c b/source/compiler/aslmain.c index 75262c76ac11..09eb9fcf702e 100644 --- a/source/compiler/aslmain.c +++ b/source/compiler/aslmain.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslmain - compiler main and utilities @@ -124,6 +123,7 @@ Options ( printf ("\nGlobal:\n"); ACPI_OPTION ("-@ <file>", "Specify command file"); ACPI_OPTION ("-I <dir>", "Specify additional include directory"); + ACPI_OPTION ("-T <sig>|ALL|*", "Create table template file for ACPI <Sig>"); ACPI_OPTION ("-v", "Display compiler version"); printf ("\nPreprocessor:\n"); @@ -142,10 +142,10 @@ Options ( ACPI_OPTION ("-w1 -w2 -w3", "Set warning reporting level"); ACPI_OPTION ("-we", "Report warnings as errors"); - printf ("\nAML Output Files:\n"); - ACPI_OPTION ("-sa -sc", "Create AML in assembler or C source file (*.asm or *.c)"); + printf ("\nAML and Data Output Files:\n"); + ACPI_OPTION ("-sa -sc", "Create assembler or C source file (*.asm or *.c)"); ACPI_OPTION ("-ia -ic", "Create assembler or C include file (*.inc or *.h)"); - ACPI_OPTION ("-ta -tc -ts", "Create AML in assembler, C, or ASL hex table (*.hex)"); + ACPI_OPTION ("-ta -tc -ts", "Create assembler, C, or ASL hex table (*.hex)"); printf ("\nAML Code Generation:\n"); ACPI_OPTION ("-oa", "Disable all optimizations (compatibility mode)"); @@ -162,7 +162,6 @@ Options ( printf ("\nACPI Data Tables:\n"); ACPI_OPTION ("-G", "Compile custom table containing generic operators"); - ACPI_OPTION ("-T <sig>|ALL|*", "Create table template file(s) for <Sig>"); ACPI_OPTION ("-vt", "Create verbose templates (full disassembly)"); printf ("\nAML Disassembler:\n"); @@ -174,6 +173,7 @@ Options ( ACPI_OPTION ("-e [f1,f2]", "Include ACPI table(s) for external symbol resolution"); ACPI_OPTION ("-2", "Emit ACPI 2.0 compatible ASL code"); ACPI_OPTION ("-g", "Get ACPI tables and write to files (*.dat)"); + ACPI_OPTION ("-vt", "Dump binary table data in hex format within output file"); printf ("\nHelp:\n"); ACPI_OPTION ("-h", "This message"); @@ -211,7 +211,7 @@ FilenameHelp ( printf ("\nAML output filename generation:\n"); printf (" Output filenames are generated by appending an extension to a common\n"); - printf (" filename prefix. The filename prefix is obtained via one of the\n"); + printf (" filename prefix. The filename prefix is obtained via one of the\n"); printf (" following methods (in priority order):\n"); printf (" 1) The -p option specifies the prefix\n"); printf (" 2) The prefix of the AMLFileName in the ASL Definition Block\n"); @@ -389,7 +389,7 @@ AslDoResponseFile ( { printf ("Could not open command file %s, %s\n", Filename, strerror (errno)); - return -1; + return (-1); } /* Must save the current GetOpt globals */ @@ -1070,5 +1070,3 @@ main ( return (0); } - - diff --git a/source/compiler/aslmap.c b/source/compiler/aslmap.c index 240175dc867c..b9798a7e4943 100644 --- a/source/compiler/aslmap.c +++ b/source/compiler/aslmap.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslmap - parser to AML opcode mapping table @@ -100,7 +99,7 @@ AslMapNamedOpcodeToDataType ( * * DATA STRUCTURE: AslKeywordMapping * - * DESCRIPTION: Maps the ParseOpcode to the actual AML opcode. The parse + * DESCRIPTION: Maps the ParseOpcode to the actual AML opcode. The parse * opcodes are generated from Bison, and this table must * track any additions to them. * @@ -451,5 +450,3 @@ const ASL_MAPPING_ENTRY AslKeywordMapping [] = /*! [End] no source code translation !*/ }; - - diff --git a/source/compiler/aslmessages.h b/source/compiler/aslmessages.h index f2d86d0b0fbb..07758efd0184 100644 --- a/source/compiler/aslmessages.h +++ b/source/compiler/aslmessages.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslmessages.h - Compiler error/warning messages diff --git a/source/compiler/aslopcodes.c b/source/compiler/aslopcodes.c index 9f3e15d6be81..bd16cb5eb528 100644 --- a/source/compiler/aslopcodes.c +++ b/source/compiler/aslopcodes.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslopcode - AML opcode generation @@ -188,10 +187,10 @@ OpcGetIntegerWidth ( * * PARAMETERS: Op - A parse tree node * - * RETURN: Integer width, in bytes. Also sets the node AML opcode to the + * RETURN: Integer width, in bytes. Also sets the node AML opcode to the * optimal integer AML prefix opcode. * - * DESCRIPTION: Determine the optimal AML encoding of an integer. All leading + * DESCRIPTION: Determine the optimal AML encoding of an integer. All leading * zeros can be truncated to squeeze the integer into the * minimal number of AML bytes. * @@ -211,7 +210,7 @@ OpcSetOptimalIntegerSize ( Op->Asl.Parent->Asl.Parent && (Op->Asl.Parent->Asl.Parent->Asl.ParseOpcode == PARSEOP_DEFINITIONBLOCK)) { - return 0; + return (0); } #endif @@ -231,14 +230,14 @@ OpcSetOptimalIntegerSize ( Op->Asl.AmlOpcode = AML_ZERO_OP; AslError (ASL_OPTIMIZATION, ASL_MSG_INTEGER_OPTIMIZATION, Op, "Zero"); - return 1; + return (1); case 1: Op->Asl.AmlOpcode = AML_ONE_OP; AslError (ASL_OPTIMIZATION, ASL_MSG_INTEGER_OPTIMIZATION, Op, "One"); - return 1; + return (1); case ACPI_UINT32_MAX: @@ -249,7 +248,7 @@ OpcSetOptimalIntegerSize ( Op->Asl.AmlOpcode = AML_ONES_OP; AslError (ASL_OPTIMIZATION, ASL_MSG_INTEGER_OPTIMIZATION, Op, "Ones"); - return 1; + return (1); } break; @@ -262,7 +261,7 @@ OpcSetOptimalIntegerSize ( Op->Asl.AmlOpcode = AML_ONES_OP; AslError (ASL_OPTIMIZATION, ASL_MSG_INTEGER_OPTIMIZATION, Op, "Ones"); - return 1; + return (1); } break; @@ -276,17 +275,17 @@ OpcSetOptimalIntegerSize ( if (Op->Asl.Value.Integer <= ACPI_UINT8_MAX) { Op->Asl.AmlOpcode = AML_BYTE_OP; - return 1; + return (1); } if (Op->Asl.Value.Integer <= ACPI_UINT16_MAX) { Op->Asl.AmlOpcode = AML_WORD_OP; - return 2; + return (2); } if (Op->Asl.Value.Integer <= ACPI_UINT32_MAX) { Op->Asl.AmlOpcode = AML_DWORD_OP; - return 4; + return (4); } else { @@ -299,12 +298,12 @@ OpcSetOptimalIntegerSize ( { /* Truncate the integer to 32-bit */ Op->Asl.AmlOpcode = AML_DWORD_OP; - return 4; + return (4); } } Op->Asl.AmlOpcode = AML_QWORD_OP; - return 8; + return (8); } } @@ -459,7 +458,7 @@ OpcDoConnection ( * RETURN: None * * DESCRIPTION: Implement the UNICODE ASL "macro". Convert the input string - * to a unicode buffer. There is no Unicode AML opcode. + * to a unicode buffer. There is no Unicode AML opcode. * * Note: The Unicode string is 16 bits per character, no leading signature, * with a 16-bit terminating NULL. @@ -535,19 +534,19 @@ OpcDoUnicode ( * * RETURN: None * - * DESCRIPTION: Convert a string EISA ID to numeric representation. See the - * Pnp BIOS Specification for details. Here is an excerpt: + * DESCRIPTION: Convert a string EISA ID to numeric representation. See the + * Pnp BIOS Specification for details. Here is an excerpt: * * A seven character ASCII representation of the product - * identifier compressed into a 32-bit identifier. The seven + * identifier compressed into a 32-bit identifier. The seven * character ID consists of a three character manufacturer code, * a three character hexadecimal product identifier, and a one - * character hexadecimal revision number. The manufacturer code + * character hexadecimal revision number. The manufacturer code * is a 3 uppercase character code that is compressed into 3 5-bit * values as follows: * 1) Find hex ASCII value for each letter * 2) Subtract 40h from each ASCII value - * 3) Retain 5 least signficant bits for each letter by + * 3) Retain 5 least significant bits for each letter by * discarding upper 3 bits because they are always 0. * 4) Compressed code = concatenate 0 and the 3 5-bit values * @@ -726,7 +725,7 @@ OpcDoUuId ( * RETURN: None * * DESCRIPTION: Generate the AML opcode associated with the node and its - * parse (lex/flex) keyword opcode. Essentially implements + * parse (lex/flex) keyword opcode. Essentially implements * a mapping between the parse opcodes and the actual AML opcodes. * ******************************************************************************/ @@ -810,5 +809,3 @@ OpcGenerateAmlOpcode ( return; } - - diff --git a/source/compiler/asloperands.c b/source/compiler/asloperands.c index 6d4433d873ea..d4d93c8845de 100644 --- a/source/compiler/asloperands.c +++ b/source/compiler/asloperands.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asloperands - AML operand processing @@ -263,7 +262,7 @@ OpnDoFieldCommon ( UpdateRule = (UINT8) Next->Asl.Value.Integer; /* - * Generate the flags byte. The various fields are already + * Generate the flags byte. The various fields are already * in the right bit position via translation from the * keywords by the parser. */ @@ -326,7 +325,7 @@ OpnDoFieldCommon ( { /* * Offset is redundant; we don't need to output an - * offset opcode. Just set these nodes to default + * offset opcode. Just set these nodes to default */ Next->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG; PkgLengthNode->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG; @@ -502,7 +501,7 @@ OpnDoBankField ( * * RETURN: None * - * DESCRIPTION: Tries to get the length of the region. Can only do this at + * DESCRIPTION: Tries to get the length of the region. Can only do this at * compile time if the length is a constant. * ******************************************************************************/ @@ -549,7 +548,7 @@ OpnDoRegion ( * * RETURN: None * - * DESCRIPTION: Construct the AML operands for the BUFFER ASL keyword. We + * DESCRIPTION: Construct the AML operands for the BUFFER ASL keyword. We * build a single raw byte buffer from the initialization nodes, * each parse node contains a buffer byte. * @@ -615,7 +614,7 @@ OpnDoBuffer ( case PARSEOP_STRING_LITERAL: /* - * Only one initializer, the string. Buffer must be big enough to hold + * Only one initializer, the string. Buffer must be big enough to hold * the string plus the null termination byte */ BufferLength = strlen (InitializerOp->Asl.Value.String) + 1; @@ -682,7 +681,7 @@ OpnDoBuffer ( * * RETURN: None * - * DESCRIPTION: Construct the AML operands for the PACKAGE ASL keyword. NOTE: + * DESCRIPTION: Construct the AML operands for the PACKAGE ASL keyword. NOTE: * can only be called after constants have been folded, to ensure * that the PackageLength operand has been fully reduced. * @@ -898,7 +897,7 @@ OpnDoDefinitionBlock ( /* - * These nodes get stuffed into the table header. They are special + * These nodes get stuffed into the table header. They are special * cased when the table is written to the output file. * * Mark all of these nodes as non-usable so they won't get output @@ -998,7 +997,7 @@ OpnDoDefinitionBlock ( * PARAMETERS: Op - Get an argument for this op * Argn - Nth argument to get * - * RETURN: The argument (as an Op object). NULL if argument does not exist + * RETURN: The argument (as an Op object). NULL if argument does not exist * * DESCRIPTION: Get the specified op's argument (peer) * @@ -1111,7 +1110,7 @@ OpnAttachNameToNode ( * * RETURN: None * - * DESCRIPTION: Prepare nodes to be output as AML data and operands. The more + * DESCRIPTION: Prepare nodes to be output as AML data and operands. The more * complex AML opcodes require processing of the child nodes * (arguments/operands). * @@ -1184,5 +1183,3 @@ OpnGenerateAmlOperands ( OpnAttachNameToNode (Op); } - - diff --git a/source/compiler/aslopt.c b/source/compiler/aslopt.c index b31c5870b60d..fedc5ff0dc1d 100644 --- a/source/compiler/aslopt.c +++ b/source/compiler/aslopt.c @@ -127,9 +127,9 @@ OptSearchToRoot ( /* - * Check if search-to-root can be utilized. Use the last NameSeg of + * Check if search-to-root can be utilized. Use the last NameSeg of * the NamePath and 1) See if can be found and 2) If found, make - * sure that it is the same node that we want. If there is another + * sure that it is the same node that we want. If there is another * name in the search path before the one we want, the nodes will * not match, and we cannot use this optimization. */ @@ -149,7 +149,7 @@ OptSearchToRoot ( /* * We found the name, but we must check to make sure that the node - * matches. Otherwise, there is another identical name in the search + * matches. Otherwise, there is another identical name in the search * path that precludes the use of this optimization. */ if (Node != TargetNode) @@ -233,7 +233,7 @@ OptBuildShortestPath ( /* * Determine the maximum number of NameSegs that the Target and Current paths - * can possibly have in common. (To optimize, we have to have at least 1) + * can possibly have in common. (To optimize, we have to have at least 1) * * Note: The external NamePath string lengths are always a multiple of 5 * (ACPI_NAME_SIZE + separator) @@ -254,12 +254,11 @@ OptBuildShortestPath ( { /* Compare two single NameSegs */ - if (ACPI_STRNCMP ( - &((char *) TargetPath->Pointer)[(NumCommonSegments * - ACPI_PATH_SEGMENT_LENGTH) + 1], - &((char *) CurrentPath->Pointer)[(NumCommonSegments * - ACPI_PATH_SEGMENT_LENGTH) + 1], - ACPI_NAME_SIZE)) + if (!ACPI_COMPARE_NAME ( + &((char *) TargetPath->Pointer)[ + (NumCommonSegments * ACPI_PATH_SEGMENT_LENGTH) + 1], + &((char *) CurrentPath->Pointer)[ + (NumCommonSegments * ACPI_PATH_SEGMENT_LENGTH) + 1])) { /* Mismatch */ @@ -371,7 +370,7 @@ OptBuildShortestPath ( /* * Check to make sure that the optimization finds the node we are - * looking for. This is simply a sanity check on the new + * looking for. This is simply a sanity check on the new * path that has been created. */ Status = AcpiNsLookup (&ScopeInfo, NewPath, @@ -453,7 +452,7 @@ OptOptimizeNameDeclaration ( { /* * The current scope is the root, and the namepath has a root prefix - * that is therefore extraneous. Remove it. + * that is therefore extraneous. Remove it. */ *NewPath = &AmlNameString[1]; @@ -470,7 +469,7 @@ OptOptimizeNameDeclaration ( /* * Check to make sure that the optimization finds the node we are - * looking for. This is simply a sanity check on the new + * looking for. This is simply a sanity check on the new * path that has been created. * * We know that we are at the root, so NULL is used for the scope. @@ -533,7 +532,7 @@ OptOptimizeNameDeclaration ( * AmlNameString - Unoptimized namepath * TargetNode - Node to which AmlNameString refers * - * RETURN: None. If path is optimized, the Op is updated with new path + * RETURN: None. If path is optimized, the Op is updated with new path * * DESCRIPTION: Optimize a Named Declaration or Reference to the minimal length. * Must take into account both the current location in the @@ -608,7 +607,7 @@ OptOptimizeNamePath ( /* * We need to obtain the node that represents the current scope -- where - * we are right now in the namespace. We will compare this path + * we are right now in the namespace. We will compare this path * against the Namepath, looking for commonality. */ CurrentNode = AcpiGbl_RootNode; @@ -741,7 +740,7 @@ OptOptimizeNamePath ( /* * Success from above indicates that the NamePath was successfully - * optimized. We need to update the parse op with the new name + * optimized. We need to update the parse op with the new name */ if (ACPI_SUCCESS (Status)) { @@ -803,4 +802,3 @@ OptOptimizeNamePath ( ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, "\n")); return_VOID; } - diff --git a/source/compiler/aslresource.c b/source/compiler/aslresource.c index 8dbbb2652f85..9337e88309b7 100644 --- a/source/compiler/aslresource.c +++ b/source/compiler/aslresource.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslresource - Resource template/descriptor utilities @@ -398,7 +397,7 @@ RsGetStringDataLength ( InitializerOp = ASL_GET_PEER_NODE (InitializerOp); } - return 0; + return (0); } @@ -449,7 +448,7 @@ RsAllocateResourceNode ( * RETURN: None, sets fields within the input node * * DESCRIPTION: Utility function to generate a named bit field within a - * resource descriptor. Mark a node as 1) a field in a resource + * resource descriptor. Mark a node as 1) a field in a resource * descriptor, and 2) set the value to be a BIT offset * ******************************************************************************/ @@ -484,8 +483,8 @@ RsCreateResourceField ( * RETURN: Sets bits within the *Flags output byte. * * DESCRIPTION: Set a bit in a cumulative flags word from an initialization - * node. Will use a default value if the node is DEFAULT, meaning - * that no value was specified in the ASL. Used to merge multiple + * node. Will use a default value if the node is DEFAULT, meaning + * that no value was specified in the ASL. Used to merge multiple * keywords into a single flags byte. * ******************************************************************************/ @@ -929,7 +928,7 @@ RsLinkDescriptorChain ( if (!Rnode) { - return 0; + return (0); } /* Point the previous node to the new node */ @@ -949,7 +948,7 @@ RsLinkDescriptorChain ( /* Previous node becomes the last node in the chain */ *PreviousRnode = LastRnode; - return CurrentByteOffset; + return (CurrentByteOffset); } @@ -959,7 +958,7 @@ RsLinkDescriptorChain ( * * PARAMETERS: Op - Parent of a resource template list * - * RETURN: None. Sets input node to point to a list of AML code + * RETURN: None. Sets input node to point to a list of AML code * * DESCRIPTION: Merge a list of resource descriptors into a single AML buffer, * in preparation for output to the AML output file. @@ -1016,7 +1015,7 @@ RsDoResourceTemplate ( /* * Update current byte offset to indicate the number of bytes from the - * start of the buffer. Buffer can include multiple descriptors, we + * start of the buffer. Buffer can include multiple descriptors, we * must keep track of the offset of not only each descriptor, but each * element (field) within each descriptor as well. */ diff --git a/source/compiler/aslrestype1.c b/source/compiler/aslrestype1.c index d7ec6c4becca..737464547d10 100644 --- a/source/compiler/aslrestype1.c +++ b/source/compiler/aslrestype1.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslrestype1 - Miscellaneous small resource descriptors @@ -498,7 +497,7 @@ RsDoStartDependentDescriptor ( /* * Update current byte offset to indicate the number of bytes from the - * start of the buffer. Buffer can include multiple descriptors, we + * start of the buffer. Buffer can include multiple descriptors, we * must keep track of the offset of not only each descriptor, but each * element (field) within each descriptor as well. */ @@ -563,7 +562,7 @@ RsDoStartDependentNoPriDescriptor ( /* * Update current byte offset to indicate the number of bytes from the - * start of the buffer. Buffer can include multiple descriptors, we + * start of the buffer. Buffer can include multiple descriptors, we * must keep track of the offset of not only each descriptor, but each * element (field) within each descriptor as well. */ @@ -650,4 +649,3 @@ RsDoVendorSmallDescriptor ( Descriptor->VendorSmall.DescriptorType |= (UINT8) i; return (Rnode); } - diff --git a/source/compiler/aslrestype1i.c b/source/compiler/aslrestype1i.c index 1178fd003ddb..d24287917227 100644 --- a/source/compiler/aslrestype1i.c +++ b/source/compiler/aslrestype1i.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslrestype1i - Small I/O-related resource descriptors diff --git a/source/compiler/aslrestype2d.c b/source/compiler/aslrestype2d.c index 8887e39028cf..f0c575537e78 100644 --- a/source/compiler/aslrestype2d.c +++ b/source/compiler/aslrestype2d.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslrestype2d - Large DWord address resource descriptors diff --git a/source/compiler/aslrestype2e.c b/source/compiler/aslrestype2e.c index 5da52914e0c2..f1321fb8ee8a 100644 --- a/source/compiler/aslrestype2e.c +++ b/source/compiler/aslrestype2e.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslrestype2e - Large Extended address resource descriptors diff --git a/source/compiler/aslrestype2q.c b/source/compiler/aslrestype2q.c index 473f259d216a..4d92fe828b57 100644 --- a/source/compiler/aslrestype2q.c +++ b/source/compiler/aslrestype2q.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslrestype2q - Large QWord address resource descriptors diff --git a/source/compiler/aslrestype2w.c b/source/compiler/aslrestype2w.c index 154de2f07fb4..01d241e7532d 100644 --- a/source/compiler/aslrestype2w.c +++ b/source/compiler/aslrestype2w.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslrestype2w - Large Word address resource descriptors diff --git a/source/compiler/aslstartup.c b/source/compiler/aslstartup.c index 1f51c7115a5a..4d556f274622 100644 --- a/source/compiler/aslstartup.c +++ b/source/compiler/aslstartup.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslstartup - Compiler startup routines, called from main @@ -231,8 +230,12 @@ AslDetectSourceFileType ( if (ACPI_FAILURE (Status)) { printf ("Non-ascii input file - %s\n", Info->Filename); - Type = ASL_INPUT_TYPE_BINARY; - goto Cleanup; + + if (!Gbl_IgnoreErrors) + { + Type = ASL_INPUT_TYPE_BINARY; + goto Cleanup; + } } /* diff --git a/source/compiler/aslstubs.c b/source/compiler/aslstubs.c index cf6e410699b4..918c97a59bcf 100644 --- a/source/compiler/aslstubs.c +++ b/source/compiler/aslstubs.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslstubs - Stubs used to link to Aml interpreter @@ -62,7 +61,7 @@ ACPI_PHYSICAL_ADDRESS AeLocalGetRootPointer ( void) { - return 0; + return (0); } void diff --git a/source/compiler/aslsupport.l b/source/compiler/aslsupport.l index eef9411222cd..daab4028ea64 100644 --- a/source/compiler/aslsupport.l +++ b/source/compiler/aslsupport.l @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslsupport.l - Flex/lex scanner C support routines. @@ -167,8 +166,8 @@ ResetAndExit: * RETURN: 0 if a node was popped, -1 otherwise * * DESCRIPTION: Pop the top of the input file stack and point the parser to - * the saved parse buffer contained in the fnode. Also, set the - * global line counters to the saved values. This function is + * the saved parse buffer contained in the fnode. Also, set the + * global line counters to the saved values. This function is * called when an include file reaches EOF. * ******************************************************************************/ @@ -223,7 +222,7 @@ AslPopInputFileStack ( * RETURN: None * * DESCRIPTION: Push the InputFile onto the file stack, and point the parser - * to this file. Called when an include file is successfully + * to this file. Called when an include file is successfully * opened. * ******************************************************************************/ @@ -325,7 +324,7 @@ AslInsertLineBuffer ( Gbl_InputByteCount++; - /* Handle tabs. Convert to spaces */ + /* Handle tabs. Convert to spaces */ if (SourceChar == '\t') { @@ -580,7 +579,7 @@ DoCharacter: { case '\\': /* - * Special handling for backslash-escape sequence. We will + * Special handling for backslash-escape sequence. We will * toss the backslash and translate the escape char(s). */ State = ASL_ESCAPE_SEQUENCE; @@ -669,7 +668,7 @@ DoCharacter: (i > 2)) { /* - * Reached end of the constant. Convert the assembled ASCII + * Reached end of the constant. Convert the assembled ASCII * string and resume processing of the next character */ ConvertBuffer[i] = 0; @@ -714,7 +713,7 @@ DoCharacter: (i > 1)) { /* - * Reached end of the constant. Convert the assembled ASCII + * Reached end of the constant. Convert the assembled ASCII * string and resume processing of the next character */ ConvertBuffer[i] = 0; diff --git a/source/compiler/asltransform.c b/source/compiler/asltransform.c index 4a5900f37cd0..64ebc06bf9ba 100644 --- a/source/compiler/asltransform.c +++ b/source/compiler/asltransform.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asltransform - Parse tree transforms @@ -100,7 +99,7 @@ TrDoSwitch ( * * RETURN: A pointer to name (allocated here). * - * DESCRIPTION: Generate an ACPI name of the form _T_x. These names are + * DESCRIPTION: Generate an ACPI name of the form _T_x. These names are * reserved for use by the ASL compiler. (_T_0 through _T_Z) * ******************************************************************************/ @@ -281,7 +280,7 @@ TrAmlTransformWalk ( * * RETURN: None * - * DESCRIPTION: Prepare nodes to be output as AML data and operands. The more + * DESCRIPTION: Prepare nodes to be output as AML data and operands. The more * complex AML opcodes require processing of the child nodes * (arguments/operands). * @@ -332,7 +331,7 @@ TrTransformSubtree ( * RETURN: None * * DESCRIPTION: Find the end of the definition block and set a global to this - * node. It is used by the compiler to insert compiler-generated + * node. It is used by the compiler to insert compiler-generated * names at the root level of the namespace. * ******************************************************************************/ @@ -376,7 +375,7 @@ TrDoDefinitionBlock ( * RETURN: None * * - * DESCRIPTION: Translate ASL SWITCH statement to if/else pairs. There is + * DESCRIPTION: Translate ASL SWITCH statement to if/else pairs. There is * no actual AML opcode for SWITCH -- it must be simulated. * ******************************************************************************/ @@ -574,7 +573,7 @@ TrDoSwitch ( else { /* - * The IF is a child of previous IF/ELSE. It + * The IF is a child of previous IF/ELSE. It * is therefore without peer. */ CurrentParentNode->Asl.Child = Conditional; @@ -737,7 +736,7 @@ TrDoSwitch ( /* * Transform the Switch() into a While(One)-Break node. * And create a Store() node which will be used to save the - * Switch() value. The store is of the form: Store (Value, _T_x) + * Switch() value. The store is of the form: Store (Value, _T_x) * where _T_x is the temp variable. */ TrAmlInitNode (StartNode, PARSEOP_WHILE); @@ -778,5 +777,3 @@ TrDoSwitch ( BreakOp->Asl.Parent = StartNode; TrAmlInsertPeer (Conditional, BreakOp); } - - diff --git a/source/compiler/asltree.c b/source/compiler/asltree.c index 12223b64498b..e5fa600be448 100644 --- a/source/compiler/asltree.c +++ b/source/compiler/asltree.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asltree - parse tree management @@ -121,7 +120,7 @@ TrAllocateNode ( Op->Asl.Column = Gbl_CurrentColumn; UtSetParseOpName (Op); - return Op; + return (Op); } @@ -171,7 +170,7 @@ TrUpdateNode ( if (!Op) { - return NULL; + return (NULL); } DbgPrint (ASL_PARSE_OUTPUT, @@ -234,7 +233,7 @@ TrUpdateNode ( break; } - return Op; + return (Op); } @@ -336,7 +335,7 @@ TrSetNodeFlags ( if (!Op) { - return NULL; + return (NULL); } Op->Asl.CompileFlags |= Flags; @@ -370,7 +369,7 @@ TrSetNodeAmlLength ( if (!Op) { - return NULL; + return (NULL); } Op->Asl.AmlLength = Length; @@ -434,7 +433,7 @@ TrCreateLeafNode ( "\nCreateLeafNode Ln/Col %u/%u NewNode %p Op %s\n\n", Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode)); - return Op; + return (Op); } @@ -580,7 +579,7 @@ TrCreateValuedLeafNode ( } DbgPrint (ASL_PARSE_OUTPUT, "\n\n"); - return Op; + return (Op); } @@ -702,7 +701,7 @@ TrCreateNode ( va_end(ap); DbgPrint (ASL_PARSE_OUTPUT, "\n\n"); - return Op; + return (Op); } @@ -776,7 +775,7 @@ TrLinkChildren ( { AslError (ASL_WARNING, ASL_MSG_COMPILER_INTERNAL, Child, "Child node list invalid"); - return Op; + return (Op); } DbgPrint (ASL_PARSE_OUTPUT, "%p, ", Child); @@ -825,7 +824,7 @@ TrLinkChildren ( va_end(ap); DbgPrint (ASL_PARSE_OUTPUT, "\n\n"); - return Op; + return (Op); } @@ -859,19 +858,19 @@ TrLinkPeerNode ( if ((!Op1) && (!Op2)) { DbgPrint (ASL_PARSE_OUTPUT, "\nTwo Null nodes!\n"); - return Op1; + return (Op1); } /* If one of the nodes is null, just return the non-null node */ if (!Op2) { - return Op1; + return (Op1); } if (!Op1) { - return Op2; + return (Op2); } if (Op1 == Op2) @@ -881,7 +880,7 @@ TrLinkPeerNode ( Op1); AslError (ASL_WARNING, ASL_MSG_COMPILER_INTERNAL, Op1, "Linking node to itself"); - return Op1; + return (Op1); } Op1->Asl.Parent = Op2->Asl.Parent; @@ -898,7 +897,7 @@ TrLinkPeerNode ( } Next->Asl.Next = Op2; - return Op1; + return (Op1); } @@ -994,7 +993,7 @@ TrLinkChildNode ( if (!Op1 || !Op2) { - return Op1; + return (Op1); } Op1->Asl.Child = Op2; @@ -1008,7 +1007,7 @@ TrLinkChildNode ( Next = Next->Asl.Next; } - return Op1; + return (Op1); } @@ -1236,5 +1235,3 @@ TrWalkParseTree ( return (AE_OK); } - - diff --git a/source/compiler/asltypes.h b/source/compiler/asltypes.h index b9f4fbe304c0..0e3b16a31903 100644 --- a/source/compiler/asltypes.h +++ b/source/compiler/asltypes.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asltypes.h - compiler data types and struct definitions diff --git a/source/compiler/aslutils.c b/source/compiler/aslutils.c index 43bf8238630f..ac749c44716b 100644 --- a/source/compiler/aslutils.c +++ b/source/compiler/aslutils.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: aslutils -- compiler utilities @@ -54,7 +53,6 @@ ACPI_MODULE_NAME ("aslutils") - /* Local prototypes */ static void @@ -569,7 +567,7 @@ UtCheckIntegerRange ( if (!Op) { - return NULL; + return (NULL); } if ((Op->Asl.Value.Integer < LowValue) || @@ -833,12 +831,12 @@ UtAttachNameseg ( Name++; } - /* Remaing string should be one single nameseg */ + /* Remaining string should be one single nameseg */ UtPadNameWithUnderscores (Name, PaddedNameSeg); } - strncpy (Op->Asl.NameSeg, PaddedNameSeg, 4); + ACPI_MOVE_NAME (Op->Asl.NameSeg, PaddedNameSeg); } diff --git a/source/compiler/aslwalks.c b/source/compiler/aslwalks.c index d98806caa38a..dce037e7706e 100644 --- a/source/compiler/aslwalks.c +++ b/source/compiler/aslwalks.c @@ -566,7 +566,7 @@ AnMethodAnalysisWalkEnd ( /* * If there is a peer node after the return statement, then this * node is unreachable code -- i.e., it won't be executed because of - * the preceeding Return() statement. + * the preceding Return() statement. */ if (Op->Asl.Next) { diff --git a/source/compiler/dtcompile.c b/source/compiler/dtcompile.c index 8536400bb941..e67f3e68f84f 100644 --- a/source/compiler/dtcompile.c +++ b/source/compiler/dtcompile.c @@ -109,7 +109,7 @@ DtDoCompile ( if (Gbl_PreprocessOnly) { - return AE_OK; + return (AE_OK); } /* diff --git a/source/compiler/dtio.c b/source/compiler/dtio.c index aa9cd7b3d417..9d1bcb2f3284 100644 --- a/source/compiler/dtio.c +++ b/source/compiler/dtio.c @@ -577,7 +577,7 @@ DtGetNextLine ( break; default: /* Not a comment */ - i++; /* Save the preceeding slash */ + i++; /* Save the preceding slash */ if (i >= Gbl_LineBufferSize) { UtExpandLineBuffers (); @@ -1008,7 +1008,7 @@ DtWriteTableToListing ( AcpiOsPrintf ("\n%s: Length %d (0x%X)\n\n", ACPI_RAW_TABLE_DATA_HEADER, Gbl_TableLength, Gbl_TableLength); - AcpiUtDumpBuffer2 (Buffer, Gbl_TableLength, DB_BYTE_DISPLAY); + AcpiUtDumpBuffer (Buffer, Gbl_TableLength, DB_BYTE_DISPLAY, 0); AcpiOsRedirectOutput (stdout); } diff --git a/source/compiler/dttable.c b/source/compiler/dttable.c index d6baa5350192..2e8ac0abd0a0 100644 --- a/source/compiler/dttable.c +++ b/source/compiler/dttable.c @@ -872,7 +872,7 @@ DtCompileHest ( } } - return AE_OK; + return (AE_OK); } @@ -1184,8 +1184,8 @@ DtCompileMpst ( ACPI_MPST_POWER_NODE *MpstPowerNode; ACPI_MPST_DATA_HDR *MpstDataHeader; UINT16 SubtableCount; - UINT8 PowerStateCount; - UINT8 ComponentCount; + UINT32 PowerStateCount; + UINT32 ComponentCount; /* Main table */ diff --git a/source/compiler/dttemplate.h b/source/compiler/dttemplate.h index 4d4370452f59..1a817cd886c1 100644 --- a/source/compiler/dttemplate.h +++ b/source/compiler/dttemplate.h @@ -539,20 +539,29 @@ const unsigned char TemplateMchi[] = const unsigned char TemplateMpst[] = { - 0x4D,0x50,0x53,0x54,0x6E,0x00,0x00,0x00, /* 00000000 "MPSTn..." */ - 0x01,0x98,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ + 0x4D,0x50,0x53,0x54,0xB6,0x00,0x00,0x00, /* 00000000 "MPST...." */ + 0x01,0x77,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 ".wINTEL " */ 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x04,0x08,0x11,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ - 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */ + 0x13,0x09,0x12,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ + 0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000030 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ - 0x00,0x00,0x02,0x03,0x00,0x00,0x00,0x00, /* 00000040 "........" */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000048 "........" */ - 0x01,0x00,0x41,0x00,0x00,0x00,0x00,0x00, /* 00000050 "..A....." */ + 0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, /* 00000040 "........" */ + 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000048 "........" */ + 0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00, /* 00000050 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000058 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000060 "........" */ - 0x00,0x00,0x00,0x00,0x00,0x00 /* 00000068 "......" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00, /* 00000068 "........" */ + 0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000070 "........" */ + 0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00, /* 00000078 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000080 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000088 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000090 "........" */ + 0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000098 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000A0 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000A8 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00 /* 000000B0 "......" */ }; const unsigned char TemplateMsct[] = diff --git a/source/compiler/new_table.txt b/source/compiler/new_table.txt new file mode 100644 index 000000000000..1e48d385b6e8 --- /dev/null +++ b/source/compiler/new_table.txt @@ -0,0 +1,88 @@ +How to add a new ACPI table to ACPICA and the iASL compiler. +------------------------------------------------------------ + +There are four main tasks that are needed to provide support for a +new ACPI table: + 1) Create a full definition of the table and any subtables + in the ACPICA headers. + 2) Add disassembler support for the new table + 3) Add iASL table compiler support for the new table + 4) Create a default template for the new table for iASL -T + option. + +Notes for each of these tasks provided below. + + +1) Header Support +----------------- + +New tables should be added to the appropriate header: + actbl2.h: Used for new tables that are not defined in the ACPI spec. + actbl3.h: Used for new tables that are defined in the ACPI spec. + +Use ACPI_TABLE_HEADER for the common ACPI table header. +Subtables should be defined separately from the main table. +Don't add placeholder fields for subtables and other multiple data items. + (Don't use xxxxx[1] for a field that can have multiple items.) + The disassembler and data table compiler depends on this. +For tables not defined in the ACPI spec, add a comment to indicate where + the table came from. +Use other table definitions for additional guidance. + + +2) iASL Disassembler Support +---------------------------- + +Add definition of the table (and subtables) in common/dmtbinfo.c +Add table access macro(s) of the form ACPI_xxxx_OFFSET +Add ACPI_DMT_TERMINATOR at the end of every table/subtable definition + +Add externals for the table/subtable definitions in acdisasm.h +Add an entry for the new table in the AcpiDmTableData in common/dmtable.c + +If there are no subtables, add the AcpiDmTableInfoXXXX name to the + AcpiDmTableData and it will automatically be disassembled. + +If there are subtables, a dump routine must be written: +Add an AcpiDmDumpXXXX function to dmtbdump.c -- note, code for another + similar table can often be ported for the new table. +Add an external for this function to acdisasm.h +Add this function to the AcpiDmTableData entry for the new ACPI table + +Debug/Test: Either find an existing example of the new ACPI table, or + create one using the "generic ACPI table support" included in the + iASL data table compiler. Use the -G option to force a + generic compile. It is often best to create the table from scratch, + since this clearly exposes the dependencies (lengths, offsets, etc.) + that the Table Compiler support will need to generate. + + +3) iASL Table Compiler Support +------------------------------ + +Simple tables do not require a compile routine. The definition of the + table in common/dmtbinfo.c (created in step 2 above) will suffice. + +Complex tables with subtables will require a compile routine with a name + of the form DtCompileXXXX. +Add a DtCompileXXXX function to the dttable.c module. +Add an external for this function in dtcompiler.h +Add this function to the AcpiDmTableData entry for the new ACPI table + in common/dmtable.c + + +4) Template Support (-T iASL option) +------------------------------------ + +Create an example of the new ACPI table. This example should create + multiple subtables (if supported), and multiple instances of any + variable length data. + +Compile the example file with the -sc option. This will create a C + array that contains the table contents. + +Add this array to the dttemplate.h file. Name the array TemplateXXXX. +Add this array name to the AcpiDmTableData entry for the new ACPI table + +Debug/Test: Create the template file. Compile the file. Disassemble the file. + Compile the disassembly file. diff --git a/source/compiler/prutils.c b/source/compiler/prutils.c index b0e1e14626ec..9ec851a90d99 100644 --- a/source/compiler/prutils.c +++ b/source/compiler/prutils.c @@ -413,8 +413,8 @@ PrPushInputFileStack ( * RETURN: 0 if a node was popped, -1 otherwise * * DESCRIPTION: Pop the top of the input file stack and point the parser to - * the saved parse buffer contained in the fnode. Also, set the - * global line counters to the saved values. This function is + * the saved parse buffer contained in the fnode. Also, set the + * global line counters to the saved values. This function is * called when an include file reaches EOF. * ******************************************************************************/ diff --git a/source/compiler/readme.txt b/source/compiler/readme.txt index 882993b6bc9e..d891cd16a329 100644 --- a/source/compiler/readme.txt +++ b/source/compiler/readme.txt @@ -1,33 +1,96 @@ +/* + * Miscellaneous instructions for building and using the iASL compiler. + */ -Instructions for integrating iASL compiler into MS VC++ environment. +1) Generating iASL from source +------------------------------ -1a) Integration as a custom tool -------------------------------- +Generation of the ASL compiler from source code requires these items: + + 1) The ACPICA source code tree. + 2) An ANSI C compiler. + 3) The Flex (or Lex) lexical analyzer generator. + 4) The Bison (or Yacc) parser generator. + +There are three major ACPICA source code components that are required to +generate the compiler (Basically, the entire ACPICA source tree should +be installed): + + 1) The ASL compiler source. + 2) The ACPICA Core Subsystem source. In particular, the Namespace + Manager component is used to create an internal ACPI namespace + and symbol table, and the AML Interpreter is used to evaluate + constant expressions. + 3) The "common" source directory that is used for all ACPI components. + +On Linux/Unix systems, the following commands will build the compiler: + + cd acpica (or cd acpica/generate/unix) + make clean + make iasl + +On Windows, the Visual Studio 2008 project file appears in this directory: + + generate/msvc9/AcpiComponents.sln + + + +1a) Notes for Windows GNU Flex and GNU Bison +-------------------------------------------- + +The Windows versions of GNU Flex/Bison must be installed, and they must +be installed in a directory that contains no embedded spaces in the +pathname. They cannot be installed in the default "c:\Program Files" +directory. This is a bug in Bison. The default Windows project file for +iASL assumes that these tools are installed at this location: + + c:\GnuWin32 + +Once the tools are installed, ensure that this path is added to the +default system $PATH environment variable: + + c:\GnuWin32\bin + +At this point, you will need to reboot Windows to make system aware of +the updated $PATH. + +iASL has been generated with these versions of Flex/Bison for Windows: + + Flex for Windows: V2.5.4 + Bison for Windows: V2.4.1 + +Flex is available at: http://gnuwin32.sourceforge.net/packages/flex.htm +Bison is available at: http://gnuwin32.sourceforge.net/packages/bison.htm + + + +2) Integration as a custom tool for Visual Studio +------------------------------------------------- This procedure adds the iASL compiler as a custom tool that can be used -to compile ASL source files. The output is sent to the VC output +to compile ASL source files. The output is sent to the VC output window. a) Select Tools->Customize. b) Select the "Tools" tab. -c) Scroll down to the bottom of the "Menu Contents" window. There you - will see an empty rectangle. Click in the rectangle to enter a +c) Scroll down to the bottom of the "Menu Contents" window. There you + will see an empty rectangle. Click in the rectangle to enter a name for this tool. -d) Type "iASL Compiler" in the box and hit enter. You can now edit +d) Type "iASL Compiler" in the box and hit enter. You can now edit the other fields for this new custom tool. e) Enter the following into the fields: Command: C:\Acpi\iasl.exe - Arguments: -e "$(FilePath)" + Arguments: -vi "$(FilePath)" Initial Directory "$(FileDir)" Use Output Window <Check this option> "Command" must be the path to wherever you copied the compiler. - "-e" instructs the compiler to produce messages appropriate for VC. + "-vi" instructs the compiler to produce messages appropriate for VC. Quotes around FilePath and FileDir enable spaces in filenames. f) Select "Close". @@ -35,12 +98,13 @@ f) Select "Close". These steps will add the compiler to the tools menu as a custom tool. By enabling "Use Output Window", you can click on error messages in the output window and the source file and source line will be -automatically displayed by VC. Also, you can use F4 to step through +automatically displayed by VC. Also, you can use F4 to step through the messages and the corresponding source line(s). -1b) Integration into a project build ------------------------------------- + +3) Integrating iASL into a Visual Studio ASL project build +---------------------------------------------------------- This procedure creates a project that compiles ASL files to AML. @@ -50,63 +114,7 @@ b) For all ASL files in the project, specify a custom build (under Project/Settings/CustomBuild with the following settings (or similar): Commands: -c:\acpi\libraries\iasl.exe -vs -vi "$(InputPath)" + c:\acpi\libraries\iasl.exe -vs -vi "$(InputPath)" Output: -$(InputDir)\$(InputPath).aml - - - -2) Compiler Generation From Source -------------------------------- - -Generation of the ASL compiler from source code requires these items: - - -2a) Required Tools --------------- - -1) The Flex (or Lex) lexical analyzer generator. -2) The Bison (or Yacc) parser generator. -3) An ANSI C compiler. - - -Windows GNU Flex and GNU Bison Notes: - -GNU Flex/Bison must be installed in a directory that has no embedded -spaces in the name. They cannot be installed in the default -c:\"Program Files" directory. This is a bug in Bison. The default -Windows project file for iASL assumes that these tools are -installed at c:\GnuWin32. - -When installed, ensure that c:\GnuWin32\bin is added to the default -system $PATH environment variable. - -iASL has been generated with these versions on Windows: - - Flex for Windows: V2.5.4 - Bison for Windows: V2.4.1 - - -Flex is available at: http://gnuwin32.sourceforge.net/packages/flex.htm -Bison is available at: http://gnuwin32.sourceforge.net/packages/bison.htm - - -2b) Required Source Code --------------------- - -There are three major source code components that are required to -generate the compiler: - -1) The ASL compiler source. -2) The ACPICA Core Subsystem source. In particular, the Namespace Manager - component is used to create an internal ACPI namespace and symbol table, - and the AML Interpreter is used to evaluate constant expressions. -3) The Common source for all ACPI components. - - - - - - - + $(InputDir)\$(InputPath).aml diff --git a/source/components/debugger/dbcmds.c b/source/components/debugger/dbcmds.c index 0e9d78d965e4..5cd41781765f 100644 --- a/source/components/debugger/dbcmds.c +++ b/source/components/debugger/dbcmds.c @@ -91,7 +91,7 @@ AcpiDbDeviceResources ( * * RETURN: Pointer to a NS node * - * DESCRIPTION: Convert a string to a valid NS pointer. Handles numeric or + * DESCRIPTION: Convert a string to a valid NS pointer. Handles numeric or * alpha strings. * ******************************************************************************/ @@ -194,13 +194,13 @@ AcpiDbSleep ( goto ErrorExit; } - return (Status); + return_ACPI_STATUS (Status); ErrorExit: ACPI_EXCEPTION ((AE_INFO, Status, "During sleep test")); - return (Status); + return_ACPI_STATUS (Status); } @@ -240,7 +240,7 @@ AcpiDbDisplayLocks ( * * RETURN: None * - * DESCRIPTION: Display information about loaded tables. Current + * DESCRIPTION: Display information about loaded tables. Current * implementation displays all loaded tables. * ******************************************************************************/ @@ -382,7 +382,7 @@ AcpiDbUnloadAcpiTable ( * * RETURN: None * - * DESCRIPTION: Send an ACPI notification. The value specified is sent to the + * DESCRIPTION: Send an ACPI notification. The value specified is sent to the * named object as an ACPI notify. * ******************************************************************************/ @@ -577,7 +577,7 @@ AcpiDbDisplayTemplate ( DumpBuffer: AcpiOsPrintf ("\nRaw data buffer:\n"); - AcpiUtDumpBuffer ((UINT8 *) Node->Object->Buffer.Pointer, + AcpiUtDebugDumpBuffer ((UINT8 *) Node->Object->Buffer.Pointer, Node->Object->Buffer.Length, DB_BYTE_DISPLAY, ACPI_UINT32_MAX); diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c index b58cb1c346fb..a9943a0595a1 100644 --- a/source/components/debugger/dbdisply.c +++ b/source/components/debugger/dbdisply.c @@ -176,7 +176,7 @@ AcpiDbDumpParserDescriptor ( * * FUNCTION: AcpiDbDecodeAndDisplayObject * - * PARAMETERS: Target - String with object to be displayed. Names + * PARAMETERS: Target - String with object to be displayed. Names * and hex pointers are supported. * OutputType - Byte, Word, Dword, or Qword (B|W|D|Q) * @@ -270,7 +270,7 @@ AcpiDbDecodeAndDisplayObject ( return; } - AcpiUtDumpBuffer (ObjPtr, sizeof (ACPI_OPERAND_OBJECT), Display, + AcpiUtDebugDumpBuffer (ObjPtr, sizeof (ACPI_OPERAND_OBJECT), Display, ACPI_UINT32_MAX); AcpiExDumpObjectDescriptor (ObjPtr, 1); break; @@ -287,7 +287,7 @@ AcpiDbDecodeAndDisplayObject ( return; } - AcpiUtDumpBuffer (ObjPtr, sizeof (ACPI_PARSE_OBJECT), Display, + AcpiUtDebugDumpBuffer (ObjPtr, sizeof (ACPI_PARSE_OBJECT), Display, ACPI_UINT32_MAX); AcpiDbDumpParserDescriptor ((ACPI_PARSE_OBJECT *) ObjPtr); break; @@ -305,7 +305,7 @@ AcpiDbDecodeAndDisplayObject ( /* Just dump some memory */ - AcpiUtDumpBuffer (ObjPtr, Size, Display, ACPI_UINT32_MAX); + AcpiUtDebugDumpBuffer (ObjPtr, Size, Display, ACPI_UINT32_MAX); break; } @@ -342,7 +342,7 @@ DumpNode: return; } - AcpiUtDumpBuffer ((void *) Node, sizeof (ACPI_NAMESPACE_NODE), + AcpiUtDebugDumpBuffer ((void *) Node, sizeof (ACPI_NAMESPACE_NODE), Display, ACPI_UINT32_MAX); AcpiExDumpNamespaceNode (Node, 1); @@ -357,7 +357,7 @@ DumpNode: return; } - AcpiUtDumpBuffer ((void *) ObjDesc, sizeof (ACPI_OPERAND_OBJECT), + AcpiUtDebugDumpBuffer ((void *) ObjDesc, sizeof (ACPI_OPERAND_OBJECT), Display, ACPI_UINT32_MAX); AcpiExDumpObjectDescriptor (ObjDesc, 1); } @@ -643,7 +643,7 @@ AcpiDbDisplayCallingTree ( * * FUNCTION: AcpiDbDisplayObjectType * - * PARAMETERS: ObjectArg - User entered NS node handle + * PARAMETERS: Name - User entered NS node handle or name * * RETURN: None * @@ -653,17 +653,21 @@ AcpiDbDisplayCallingTree ( void AcpiDbDisplayObjectType ( - char *ObjectArg) + char *Name) { - ACPI_HANDLE Handle; + ACPI_NAMESPACE_NODE *Node; ACPI_DEVICE_INFO *Info; ACPI_STATUS Status; UINT32 i; - Handle = ACPI_TO_POINTER (ACPI_STRTOUL (ObjectArg, NULL, 16)); + Node = AcpiDbConvertToNode (Name); + if (!Node) + { + return; + } - Status = AcpiGetObjectInfo (Handle, &Info); + Status = AcpiGetObjectInfo (ACPI_CAST_PTR (ACPI_HANDLE, Node), &Info); if (ACPI_FAILURE (Status)) { AcpiOsPrintf ("Could not get object info, %s\n", @@ -671,18 +675,25 @@ AcpiDbDisplayObjectType ( return; } - AcpiOsPrintf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n", - ACPI_FORMAT_UINT64 (Info->Address), - Info->CurrentStatus, Info->Flags); - - AcpiOsPrintf ("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", - Info->HighestDstates[0], Info->HighestDstates[1], - Info->HighestDstates[2], Info->HighestDstates[3]); - - AcpiOsPrintf ("S0W-%2.2X S1W-%2.2X S2W-%2.2X S3W-%2.2X S4W-%2.2X\n", - Info->LowestDstates[0], Info->LowestDstates[1], - Info->LowestDstates[2], Info->LowestDstates[3], - Info->LowestDstates[4]); + if (Info->Valid & ACPI_VALID_ADR) + { + AcpiOsPrintf ("ADR: %8.8X%8.8X, STA: %8.8X, Flags: %X\n", + ACPI_FORMAT_UINT64 (Info->Address), + Info->CurrentStatus, Info->Flags); + } + if (Info->Valid & ACPI_VALID_SXDS) + { + AcpiOsPrintf ("S1D-%2.2X S2D-%2.2X S3D-%2.2X S4D-%2.2X\n", + Info->HighestDstates[0], Info->HighestDstates[1], + Info->HighestDstates[2], Info->HighestDstates[3]); + } + if (Info->Valid & ACPI_VALID_SXWS) + { + AcpiOsPrintf ("S0W-%2.2X S1W-%2.2X S2W-%2.2X S3W-%2.2X S4W-%2.2X\n", + Info->LowestDstates[0], Info->LowestDstates[1], + Info->LowestDstates[2], Info->LowestDstates[3], + Info->LowestDstates[4]); + } if (Info->Valid & ACPI_VALID_HID) { @@ -692,6 +703,10 @@ AcpiDbDisplayObjectType ( { AcpiOsPrintf ("UID: %s\n", Info->UniqueId.String); } + if (Info->Valid & ACPI_VALID_SUB) + { + AcpiOsPrintf ("SUB: %s\n", Info->SubsystemId.String); + } if (Info->Valid & ACPI_VALID_CID) { for (i = 0; i < Info->CompatibleIdList.Count; i++) diff --git a/source/components/debugger/dbexec.c b/source/components/debugger/dbexec.c index d8ec3d3febfe..1644fc23a5f8 100644 --- a/source/components/debugger/dbexec.c +++ b/source/components/debugger/dbexec.c @@ -674,7 +674,7 @@ AcpiDbGetOutstandingAllocations ( * * RETURN: Status * - * DESCRIPTION: Execute a control method. Name is relative to the current + * DESCRIPTION: Execute a control method. Name is relative to the current * scope. * ******************************************************************************/ @@ -862,8 +862,8 @@ AcpiDbDumpPldBuffer ( { AcpiOsPrintf ("Converted _PLD buffer does not compare. New:\n"); - AcpiUtDumpBuffer2 (NewBuffer, - BufferDesc->Buffer.Length, DB_BYTE_DISPLAY); + AcpiUtDumpBuffer (NewBuffer, + BufferDesc->Buffer.Length, DB_BYTE_DISPLAY, 0); } /* First 32-bit dword */ @@ -924,7 +924,7 @@ AcpiDbDumpPldBuffer ( * * RETURN: None * - * DESCRIPTION: Execute a control method. Name is relative to the current + * DESCRIPTION: Execute a control method. Name is relative to the current * scope. * ******************************************************************************/ @@ -1058,7 +1058,7 @@ AcpiDbExecute ( * * RETURN: None * - * DESCRIPTION: Debugger execute thread. Waits for a command line, then + * DESCRIPTION: Debugger execute thread. Waits for a command line, then * simply dispatches it. * ******************************************************************************/ @@ -1329,5 +1329,3 @@ CleanupAndExit: } #endif /* ACPI_DEBUGGER */ - - diff --git a/source/components/debugger/dbfileio.c b/source/components/debugger/dbfileio.c index 9845ff47e68f..7b0870d1c991 100644 --- a/source/components/debugger/dbfileio.c +++ b/source/components/debugger/dbfileio.c @@ -328,9 +328,9 @@ AcpiDbReadTable ( #ifdef ACPI_OBSOLETE_CODE /* We only support a limited number of table types */ - if (ACPI_STRNCMP ((char *) TableHeader.Signature, DSDT_SIG, 4) && - ACPI_STRNCMP ((char *) TableHeader.Signature, PSDT_SIG, 4) && - ACPI_STRNCMP ((char *) TableHeader.Signature, SSDT_SIG, 4)) + if (!ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_DSDT) && + !ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_PSDT) && + !ACPI_COMPARE_NAME ((char *) TableHeader.Signature, ACPI_SIG_SSDT)) { AcpiOsPrintf ("Table signature [%4.4s] is invalid or not supported\n", (char *) TableHeader.Signature); @@ -588,4 +588,3 @@ AcpiDbGetTableFromFile ( } #endif /* ACPI_DEBUGGER */ - diff --git a/source/components/debugger/dbhistry.c b/source/components/debugger/dbhistry.c index 536b69cdfaab..571ed3f01526 100644 --- a/source/components/debugger/dbhistry.c +++ b/source/components/debugger/dbhistry.c @@ -217,4 +217,3 @@ AcpiDbGetFromHistory ( } #endif /* ACPI_DEBUGGER */ - diff --git a/source/components/debugger/dbinput.c b/source/components/debugger/dbinput.c index 2d48171c4a1d..a431ddcba509 100644 --- a/source/components/debugger/dbinput.c +++ b/source/components/debugger/dbinput.c @@ -457,7 +457,7 @@ AcpiDbDisplayHelp ( * * RETURN: Pointer to the start of the next token. * - * DESCRIPTION: Command line parsing. Get the next token on the command line + * DESCRIPTION: Command line parsing. Get the next token on the command line * ******************************************************************************/ @@ -610,7 +610,7 @@ AcpiDbGetNextToken ( * * RETURN: Count of arguments to the command * - * DESCRIPTION: Get the next command line from the user. Gets entire line + * DESCRIPTION: Get the next command line from the user. Gets entire line * up to the next newline * ******************************************************************************/ @@ -1083,7 +1083,7 @@ AcpiDbCommandDispatch ( * * RETURN: None * - * DESCRIPTION: Debugger execute thread. Waits for a command line, then + * DESCRIPTION: Debugger execute thread. Waits for a command line, then * simply dispatches it. * ******************************************************************************/ @@ -1126,7 +1126,7 @@ AcpiDbExecuteThread ( * * RETURN: None * - * DESCRIPTION: Debugger execute thread. Waits for a command line, then + * DESCRIPTION: Debugger execute thread. Waits for a command line, then * simply dispatches it. * ******************************************************************************/ @@ -1152,7 +1152,7 @@ AcpiDbSingleThread ( * * RETURN: None * - * DESCRIPTION: Command line execution for the AML debugger. Commands are + * DESCRIPTION: Command line execution for the AML debugger. Commands are * matched and dispatched here. * ******************************************************************************/ @@ -1231,4 +1231,3 @@ AcpiDbUserCommands ( } #endif /* ACPI_DEBUGGER */ - diff --git a/source/components/debugger/dbnames.c b/source/components/debugger/dbnames.c index 0393e6ba3755..a51c08d2cb98 100644 --- a/source/components/debugger/dbnames.c +++ b/source/components/debugger/dbnames.c @@ -208,7 +208,7 @@ ErrorExit: * * RETURN: None * - * DESCRIPTION: Dump entire namespace or a subtree. Each node is displayed + * DESCRIPTION: Dump entire namespace or a subtree. Each node is displayed * with type and other information. * ******************************************************************************/ @@ -305,7 +305,7 @@ AcpiDbDumpNamespaceByOwner ( * * RETURN: Status * - * DESCRIPTION: Find a particular name/names within the namespace. Wildcards + * DESCRIPTION: Find a particular name/names within the namespace. Wildcards * are supported -- '?' matches any character. * ******************************************************************************/ diff --git a/source/components/debugger/dbstats.c b/source/components/debugger/dbstats.c index 64c847a493ea..9bcc96322ce4 100644 --- a/source/components/debugger/dbstats.c +++ b/source/components/debugger/dbstats.c @@ -314,7 +314,7 @@ AcpiDbClassifyOneObject ( AcpiGbl_NodeTypeCount [Type]++; } - return AE_OK; + return (AE_OK); #ifdef ACPI_FUTURE_IMPLEMENTATION diff --git a/source/components/debugger/dbutils.c b/source/components/debugger/dbutils.c index 36a6d207d920..947dd9d93a7b 100644 --- a/source/components/debugger/dbutils.c +++ b/source/components/debugger/dbutils.c @@ -117,7 +117,7 @@ AcpiDbMatchArgument ( * * RETURN: None * - * DESCRIPTION: Set the current destination for debugger output. Also sets + * DESCRIPTION: Set the current destination for debugger output. Also sets * the debug output level accordingly. * ******************************************************************************/ @@ -204,7 +204,7 @@ AcpiDbDumpExternalObject ( { AcpiOsPrintf ("\n"); } - AcpiUtDumpBuffer (ACPI_CAST_PTR (UINT8, ObjDesc->Buffer.Pointer), + AcpiUtDebugDumpBuffer (ACPI_CAST_PTR (UINT8, ObjDesc->Buffer.Pointer), ObjDesc->Buffer.Length, DB_BYTE_DISPLAY, _COMPONENT); } else @@ -316,7 +316,7 @@ AcpiDbPrepNamestring ( * * DESCRIPTION: Lookup a name in the ACPI namespace * - * Note: Currently begins search from the root. Could be enhanced to use + * Note: Currently begins search from the root. Could be enhanced to use * the current prefix (scope) node as the search beginning point. * ******************************************************************************/ @@ -407,7 +407,7 @@ AcpiDbUint32ToHexString ( * * RETURN: Status * - * DESCRIPTION: Second pass parse of the ACPI tables. We need to wait until + * DESCRIPTION: Second pass parse of the ACPI tables. We need to wait until * second pass to parse the control methods * ******************************************************************************/ @@ -513,11 +513,9 @@ AcpiDbDumpBuffer ( AcpiOsPrintf ("\nLocation %X:\n", Address); AcpiDbgLevel |= ACPI_LV_TABLES; - AcpiUtDumpBuffer (ACPI_TO_POINTER (Address), 64, DB_BYTE_DISPLAY, + AcpiUtDebugDumpBuffer (ACPI_TO_POINTER (Address), 64, DB_BYTE_DISPLAY, ACPI_UINT32_MAX); } #endif #endif /* ACPI_DEBUGGER */ - - diff --git a/source/components/debugger/dbxface.c b/source/components/debugger/dbxface.c index cd3027343459..0a7b9465eb1d 100644 --- a/source/components/debugger/dbxface.c +++ b/source/components/debugger/dbxface.c @@ -231,7 +231,7 @@ AcpiDbSingleStep ( switch (OpcodeClass) { case AML_CLASS_UNKNOWN: - case AML_CLASS_ARGUMENT: /* constants, literals, etc. do nothing */ + case AML_CLASS_ARGUMENT: /* constants, literals, etc. do nothing */ return (AE_OK); default: diff --git a/source/components/disassembler/dmbuffer.c b/source/components/disassembler/dmbuffer.c index d0a66ef2fdae..43134abfe756 100644 --- a/source/components/disassembler/dmbuffer.c +++ b/source/components/disassembler/dmbuffer.c @@ -421,7 +421,7 @@ AcpiDmIsPldBuffer ( * ******************************************************************************/ -#define ACPI_PLD_OUTPUT "%*.s/* %18s : %-6.2X */\n", ACPI_MUL_4 (Level), " " +#define ACPI_PLD_OUTPUT08 "%*.s/* %18s : %-6.2X */\n", ACPI_MUL_4 (Level), " " #define ACPI_PLD_OUTPUT16 "%*.s/* %18s : %-6.4X */\n", ACPI_MUL_4 (Level), " " #define ACPI_PLD_OUTPUT24 "%*.s/* %18s : %-6.6X */\n", ACPI_MUL_4 (Level), " " @@ -452,8 +452,8 @@ AcpiDmPldBuffer ( /* First 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Revision", PldInfo->Revision); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "IgnoreColor", PldInfo->IgnoreColor); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Revision", PldInfo->Revision); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "IgnoreColor", PldInfo->IgnoreColor); AcpiOsPrintf (ACPI_PLD_OUTPUT24,"Color", PldInfo->Color); /* Second 32-bit dword */ @@ -463,27 +463,27 @@ AcpiDmPldBuffer ( /* Third 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT, "UserVisible", PldInfo->UserVisible); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Dock", PldInfo->Dock); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Lid", PldInfo->Lid); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Panel", PldInfo->Panel); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "VerticalPosition", PldInfo->VerticalPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "HorizontalPosition", PldInfo->HorizontalPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Shape", PldInfo->Shape); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "GroupOrientation", PldInfo->GroupOrientation); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "GroupToken", PldInfo->GroupToken); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "GroupPosition", PldInfo->GroupPosition); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Bay", PldInfo->Bay); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "UserVisible", PldInfo->UserVisible); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Dock", PldInfo->Dock); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Lid", PldInfo->Lid); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Panel", PldInfo->Panel); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "VerticalPosition", PldInfo->VerticalPosition); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "HorizontalPosition", PldInfo->HorizontalPosition); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Shape", PldInfo->Shape); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "GroupOrientation", PldInfo->GroupOrientation); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "GroupToken", PldInfo->GroupToken); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "GroupPosition", PldInfo->GroupPosition); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Bay", PldInfo->Bay); /* Fourth 32-bit dword */ - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Ejectable", PldInfo->Ejectable); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "OspmEjectRequired", PldInfo->OspmEjectRequired); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "CabinetNumber", PldInfo->CabinetNumber); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "CardCageNumber", PldInfo->CardCageNumber); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Reference", PldInfo->Reference); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Rotation", PldInfo->Rotation); - AcpiOsPrintf (ACPI_PLD_OUTPUT, "Order", PldInfo->Order); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Ejectable", PldInfo->Ejectable); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "OspmEjectRequired", PldInfo->OspmEjectRequired); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "CabinetNumber", PldInfo->CabinetNumber); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "CardCageNumber", PldInfo->CardCageNumber); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Reference", PldInfo->Reference); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Rotation", PldInfo->Rotation); + AcpiOsPrintf (ACPI_PLD_OUTPUT08, "Order", PldInfo->Order); /* Fifth 32-bit dword */ @@ -505,7 +505,7 @@ AcpiDmPldBuffer ( * * RETURN: None * - * DESCRIPTION: Dump Unicode string as a standard ASCII string. (Remove + * DESCRIPTION: Dump Unicode string as a standard ASCII string. (Remove * the extra zero bytes). * ******************************************************************************/ diff --git a/source/components/disassembler/dmnames.c b/source/components/disassembler/dmnames.c index 92e67c2e0a8c..7284721fd569 100644 --- a/source/components/disassembler/dmnames.c +++ b/source/components/disassembler/dmnames.c @@ -128,7 +128,7 @@ AcpiDmDumpName ( * * RETURN: Status * - * DESCRIPTION: Diplay the pathname associated with a named object. Two + * DESCRIPTION: Diplay the pathname associated with a named object. Two * versions. One searches the parse tree (for parser-only * applications suchas AcpiDump), and the other searches the * ACPI namespace (the parse tree is probably deleted) @@ -166,7 +166,7 @@ AcpiPsDisplayObjectPathname ( { /* * We can't get the pathname since the object - * is not in the namespace. This can happen during single + * is not in the namespace. This can happen during single * stepping where a dynamic named object is *about* to be created. */ AcpiOsPrintf (" [Path not found]"); @@ -437,9 +437,9 @@ AcpiDmValidateName ( if (!TargetOp) { /* - * Didn't find the name in the parse tree. This may be + * Didn't find the name in the parse tree. This may be * a problem, or it may simply be one of the predefined names - * (such as _OS_). Rather than worry about looking up all + * (such as _OS_). Rather than worry about looking up all * the predefined names, just display the name as given */ AcpiOsPrintf ( @@ -449,5 +449,3 @@ AcpiDmValidateName ( #endif #endif - - diff --git a/source/components/disassembler/dmobject.c b/source/components/disassembler/dmobject.c index cb515e94279d..1eec0e73cf25 100644 --- a/source/components/disassembler/dmobject.c +++ b/source/components/disassembler/dmobject.c @@ -181,7 +181,7 @@ AcpiDmDumpMethodInfo ( * * RETURN: None * - * DESCRIPTION: Short display of an internal object. Numbers/Strings/Buffers. + * DESCRIPTION: Short display of an internal object. Numbers/Strings/Buffers. * ******************************************************************************/ @@ -585,5 +585,3 @@ AcpiDmDisplayArguments ( } #endif - - diff --git a/source/components/disassembler/dmopcode.c b/source/components/disassembler/dmopcode.c index caebe26a1e45..9d61b0257906 100644 --- a/source/components/disassembler/dmopcode.c +++ b/source/components/disassembler/dmopcode.c @@ -46,7 +46,6 @@ #include "acparser.h" #include "amlcode.h" #include "acdisasm.h" -#include "acnamesp.h" #ifdef ACPI_DISASSEMBLER @@ -633,7 +632,7 @@ AcpiDmDisassembleOneOp ( case AML_BUFFER_OP: /* - * Determine the type of buffer. We can have one of the following: + * Determine the type of buffer. We can have one of the following: * * 1) ResourceTemplate containing Resource Descriptors. * 2) Unicode String buffer diff --git a/source/components/disassembler/dmresrc.c b/source/components/disassembler/dmresrc.c index 9c07bf7e9462..470be9505090 100644 --- a/source/components/disassembler/dmresrc.c +++ b/source/components/disassembler/dmresrc.c @@ -371,7 +371,7 @@ AcpiDmResourceTemplate ( * RETURN: Status. AE_OK if valid template * * DESCRIPTION: Walk a byte list to determine if it consists of a valid set - * of resource descriptors. Nothing is output. + * of resource descriptors. Nothing is output. * ******************************************************************************/ diff --git a/source/components/disassembler/dmresrcl2.c b/source/components/disassembler/dmresrcl2.c index e79307ee72d0..afa1f5c40083 100644 --- a/source/components/disassembler/dmresrcl2.c +++ b/source/components/disassembler/dmresrcl2.c @@ -697,4 +697,3 @@ AcpiDmSerialBusDescriptor ( } #endif - diff --git a/source/components/disassembler/dmresrcs.c b/source/components/disassembler/dmresrcs.c index 32759d991bb5..d3b1dd8dce9d 100644 --- a/source/components/disassembler/dmresrcs.c +++ b/source/components/disassembler/dmresrcs.c @@ -355,4 +355,3 @@ AcpiDmVendorSmallDescriptor ( } #endif - diff --git a/source/components/disassembler/dmutils.c b/source/components/disassembler/dmutils.c index ce3443ec3fc1..b529b883bb26 100644 --- a/source/components/disassembler/dmutils.c +++ b/source/components/disassembler/dmutils.c @@ -252,7 +252,7 @@ AcpiDmCommaIfListMember ( if (!Op->Common.Next) { - return FALSE; + return (FALSE); } if (AcpiDmListType (Op->Common.Parent) & BLOCK_COMMA_LIST) @@ -264,20 +264,20 @@ AcpiDmCommaIfListMember ( { /* * To handle the Divide() case where there are two optional - * targets, look ahead one more op. If null, this null target - * is the one and only target -- no comma needed. Otherwise, + * targets, look ahead one more op. If null, this null target + * is the one and only target -- no comma needed. Otherwise, * we need a comma to prepare for the next target. */ if (!Op->Common.Next->Common.Next) { - return FALSE; + return (FALSE); } } if ((Op->Common.DisasmFlags & ACPI_PARSEOP_PARAMLIST) && (!(Op->Common.Next->Common.DisasmFlags & ACPI_PARSEOP_PARAMLIST))) { - return FALSE; + return (FALSE); } AcpiOsPrintf (", "); diff --git a/source/components/disassembler/dmwalk.c b/source/components/disassembler/dmwalk.c index 6a6b95e1f71d..0fa404993552 100644 --- a/source/components/disassembler/dmwalk.c +++ b/source/components/disassembler/dmwalk.c @@ -98,7 +98,7 @@ AcpiDmBlockType ( * * RETURN: None * - * DESCRIPTION: Disassemble parser object and its children. This is the + * DESCRIPTION: Disassemble parser object and its children. This is the * main entry point of the disassembler. * ******************************************************************************/ @@ -773,7 +773,7 @@ AcpiDmDescendingOp ( * RETURN: Status * * DESCRIPTION: Second visitation of a parse object, during ascent of parse - * tree. Close out any parameter lists and complete the opcode. + * tree. Close out any parameter lists and complete the opcode. * ******************************************************************************/ diff --git a/source/components/dispatcher/dscontrol.c b/source/components/dispatcher/dscontrol.c index 5c5c51a573e6..ec2fa437f1f7 100644 --- a/source/components/dispatcher/dscontrol.c +++ b/source/components/dispatcher/dscontrol.c @@ -290,7 +290,7 @@ AcpiDsExecEndControlOp ( /* * Get the return value and save as the last result - * value. This is the only place where WalkState->ReturnDesc + * value. This is the only place where WalkState->ReturnDesc * is set to anything other than zero! */ WalkState->ReturnDesc = WalkState->Operands[0]; diff --git a/source/components/dispatcher/dsfield.c b/source/components/dispatcher/dsfield.c index e3e05b925c2d..cf2abb51d052 100644 --- a/source/components/dispatcher/dsfield.c +++ b/source/components/dispatcher/dsfield.c @@ -305,7 +305,7 @@ Cleanup: * * RETURN: Status * - * DESCRIPTION: Process all named fields in a field declaration. Names are + * DESCRIPTION: Process all named fields in a field declaration. Names are * entered into the namespace. * ******************************************************************************/ @@ -828,5 +828,3 @@ AcpiDsCreateIndexField ( Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next); return_ACPI_STATUS (Status); } - - diff --git a/source/components/dispatcher/dsinit.c b/source/components/dispatcher/dsinit.c index 1c7ad8849258..114404bb1c48 100644 --- a/source/components/dispatcher/dsinit.c +++ b/source/components/dispatcher/dsinit.c @@ -73,7 +73,7 @@ AcpiDsInitOneObject ( * * RETURN: Status * - * DESCRIPTION: Callback from AcpiWalkNamespace. Invoked for every object + * DESCRIPTION: Callback from AcpiWalkNamespace. Invoked for every object * within the namespace. * * Currently, the only objects that require initialization are: @@ -234,5 +234,3 @@ AcpiDsInitializeObjects ( return_ACPI_STATUS (AE_OK); } - - diff --git a/source/components/dispatcher/dsmethod.c b/source/components/dispatcher/dsmethod.c index 670382ac9bfb..4f7901070282 100644 --- a/source/components/dispatcher/dsmethod.c +++ b/source/components/dispatcher/dsmethod.c @@ -183,7 +183,7 @@ AcpiDsCreateMethodMutex ( * * RETURN: Status * - * DESCRIPTION: Prepare a method for execution. Parses the method if necessary, + * DESCRIPTION: Prepare a method for execution. Parses the method if necessary, * increments the thread count, and waits at the method semaphore * for clearance to execute. * @@ -480,7 +480,7 @@ Cleanup: * RETURN: Status * * DESCRIPTION: Restart a method that was preempted by another (nested) method - * invocation. Handle the return value (if any) from the callee. + * invocation. Handle the return value (if any) from the callee. * ******************************************************************************/ @@ -570,7 +570,7 @@ AcpiDsRestartControlMethod ( * * RETURN: None * - * DESCRIPTION: Terminate a control method. Delete everything that the method + * DESCRIPTION: Terminate a control method. Delete everything that the method * created, delete all locals and arguments, and delete the parse * tree if requested. * @@ -722,5 +722,3 @@ AcpiDsTerminateControlMethod ( return_VOID; } - - diff --git a/source/components/dispatcher/dsmthdat.c b/source/components/dispatcher/dsmthdat.c index b4509e771021..aeabe740291f 100644 --- a/source/components/dispatcher/dsmthdat.c +++ b/source/components/dispatcher/dsmthdat.c @@ -86,7 +86,7 @@ AcpiDsMethodDataGetType ( * RETURN: Status * * DESCRIPTION: Initialize the data structures that hold the method's arguments - * and locals. The data struct is an array of namespace nodes for + * and locals. The data struct is an array of namespace nodes for * each - this allows RefOf and DeRefOf to work properly for these * special data types. * @@ -143,7 +143,7 @@ AcpiDsMethodDataInit ( * * RETURN: None * - * DESCRIPTION: Delete method locals and arguments. Arguments are only + * DESCRIPTION: Delete method locals and arguments. Arguments are only * deleted if this method was called from another method. * ******************************************************************************/ @@ -202,7 +202,7 @@ AcpiDsMethodDataDeleteAll ( * * RETURN: Status * - * DESCRIPTION: Initialize arguments for a method. The parameter list is a list + * DESCRIPTION: Initialize arguments for a method. The parameter list is a list * of ACPI operand objects, either null terminated or whose length * is defined by MaxParamCount. * @@ -443,7 +443,7 @@ AcpiDsMethodDataGetValue ( * This means that either 1) The expected argument was * not passed to the method, or 2) A local variable * was referenced by the method (via the ASL) - * before it was initialized. Either case is an error. + * before it was initialized. Either case is an error. */ /* If slack enabled, init the LocalX/ArgX to an Integer of value zero */ @@ -508,7 +508,7 @@ AcpiDsMethodDataGetValue ( * * RETURN: None * - * DESCRIPTION: Delete the entry at Opcode:Index. Inserts + * DESCRIPTION: Delete the entry at Opcode:Index. Inserts * a null into the stack slot after the object is deleted. * ******************************************************************************/ @@ -573,7 +573,7 @@ AcpiDsMethodDataDeleteValue ( * * RETURN: Status * - * DESCRIPTION: Store a value in an Arg or Local. The ObjDesc is installed + * DESCRIPTION: Store a value in an Arg or Local. The ObjDesc is installed * as the new value for the Arg or Local and the reference count * for ObjDesc is incremented. * @@ -621,7 +621,7 @@ AcpiDsStoreObjectToLocal ( /* * If the reference count on the object is more than one, we must - * take a copy of the object before we store. A reference count + * take a copy of the object before we store. A reference count * of exactly 1 means that the object was just created during the * evaluation of an expression, and we can safely use it since it * is not used anywhere else. @@ -768,5 +768,3 @@ AcpiDsMethodDataGetType ( return_VALUE (Object->Type); } #endif - - diff --git a/source/components/dispatcher/dsobject.c b/source/components/dispatcher/dsobject.c index b3567766a2db..24a5c09bc045 100644 --- a/source/components/dispatcher/dsobject.c +++ b/source/components/dispatcher/dsobject.c @@ -296,7 +296,7 @@ AcpiDsBuildInternalBufferObj ( /* * Second arg is the buffer data (optional) ByteList can be either - * individual bytes or a string initializer. In either case, a + * individual bytes or a string initializer. In either case, a * ByteList appears in the AML. */ Arg = Op->Common.Value.Arg; /* skip first arg */ @@ -590,7 +590,7 @@ AcpiDsCreateNode ( /* * Because of the execution pass through the non-control-method - * parts of the table, we can arrive here twice. Only init + * parts of the table, we can arrive here twice. Only init * the named object node the first time through */ if (AcpiNsGetAttachedObject (Node)) @@ -643,7 +643,7 @@ AcpiDsCreateNode ( * RETURN: Status * * DESCRIPTION: Initialize a namespace object from a parser Op and its - * associated arguments. The namespace object is a more compact + * associated arguments. The namespace object is a more compact * representation of the Op and its arguments. * ******************************************************************************/ @@ -863,5 +863,3 @@ AcpiDsInitObjectFromOp ( return_ACPI_STATUS (Status); } - - diff --git a/source/components/dispatcher/dsopcode.c b/source/components/dispatcher/dsopcode.c index 6fd58d86e6ef..c888dfd2bd7e 100644 --- a/source/components/dispatcher/dsopcode.c +++ b/source/components/dispatcher/dsopcode.c @@ -806,4 +806,3 @@ AcpiDsEvalBankFieldOperands ( AcpiUtRemoveReference (OperandDesc); return_ACPI_STATUS (Status); } - diff --git a/source/components/dispatcher/dsutils.c b/source/components/dispatcher/dsutils.c index 66431aad5316..2cabdc680bad 100644 --- a/source/components/dispatcher/dsutils.c +++ b/source/components/dispatcher/dsutils.c @@ -64,7 +64,7 @@ * * RETURN: None. * - * DESCRIPTION: Clear and remove a reference on an implicit return value. Used + * DESCRIPTION: Clear and remove a reference on an implicit return value. Used * to delete "stale" return values (if enabled, the return value * from every operator is saved at least momentarily, in case the * parent method exits.) @@ -117,7 +117,7 @@ AcpiDsClearImplicitReturn ( * * DESCRIPTION: Implements the optional "implicit return". We save the result * of every ASL operator and control method invocation in case the - * parent method exit. Before storing a new return value, we + * parent method exit. Before storing a new return value, we * delete the previous return value. * ******************************************************************************/ @@ -220,7 +220,7 @@ AcpiDsIsResultUsed ( * * If there is no parent, or the parent is a ScopeOp, we are executing * at the method level. An executing method typically has no parent, - * since each method is parsed separately. A method invoked externally + * since each method is parsed separately. A method invoked externally * via ExecuteControlMethod has a ScopeOp as the parent. */ if ((!Op->Common.Parent) || @@ -245,7 +245,7 @@ AcpiDsIsResultUsed ( } /* - * Decide what to do with the result based on the parent. If + * Decide what to do with the result based on the parent. If * the parent opcode will not use the result, delete the object. * Otherwise leave it as is, it will be deleted when it is used * as an operand later. @@ -290,7 +290,7 @@ AcpiDsIsResultUsed ( /* * These opcodes allow TermArg(s) as operands and therefore - * the operands can be method calls. The result is used. + * the operands can be method calls. The result is used. */ goto ResultUsed; @@ -307,7 +307,7 @@ AcpiDsIsResultUsed ( { /* * These opcodes allow TermArg(s) as operands and therefore - * the operands can be method calls. The result is used. + * the operands can be method calls. The result is used. */ goto ResultUsed; } @@ -354,9 +354,9 @@ ResultNotUsed: * * RETURN: Status * - * DESCRIPTION: Used after interpretation of an opcode. If there is an internal + * DESCRIPTION: Used after interpretation of an opcode. If there is an internal * result descriptor, check if the parent opcode will actually use - * this result. If not, delete the result now so that it will + * this result. If not, delete the result now so that it will * not become orphaned. * ******************************************************************************/ @@ -408,7 +408,7 @@ AcpiDsDeleteResultIfNotUsed ( * * RETURN: Status * - * DESCRIPTION: Resolve all operands to their values. Used to prepare + * DESCRIPTION: Resolve all operands to their values. Used to prepare * arguments to a control method invocation (a call from one * method to another.) * @@ -427,7 +427,7 @@ AcpiDsResolveOperands ( /* * Attempt to resolve each of the valid operands - * Method arguments are passed by reference, not by value. This means + * Method arguments are passed by reference, not by value. This means * that the actual objects are passed, not copies of the objects. */ for (i = 0; i < WalkState->NumOperands; i++) @@ -494,7 +494,7 @@ AcpiDsClearOperands ( * RETURN: Status * * DESCRIPTION: Translate a parse tree object that is an argument to an AML - * opcode to the equivalent interpreter object. This may include + * opcode to the equivalent interpreter object. This may include * looking up a name or entering a new name into the internal * namespace. * @@ -540,11 +540,11 @@ AcpiDsCreateOperand ( /* All prefixes have been handled, and the name is in NameString */ /* - * Special handling for BufferField declarations. This is a deferred + * Special handling for BufferField declarations. This is a deferred * opcode that unfortunately defines the field name as the last - * parameter instead of the first. We get here when we are performing + * parameter instead of the first. We get here when we are performing * the deferred execution, so the actual name of the field is already - * in the namespace. We don't want to attempt to look it up again + * in the namespace. We don't want to attempt to look it up again * because we may be executing in a different scope than where the * actual opcode exists. */ @@ -651,8 +651,8 @@ AcpiDsCreateOperand ( /* * If the name is null, this means that this is an * optional result parameter that was not specified - * in the original ASL. Create a Zero Constant for a - * placeholder. (Store to a constant is a Noop.) + * in the original ASL. Create a Zero Constant for a + * placeholder. (Store to a constant is a Noop.) */ Opcode = AML_ZERO_OP; /* Has no arguments! */ diff --git a/source/components/dispatcher/dswexec.c b/source/components/dispatcher/dswexec.c index 5732855bbeee..0d38b739eee4 100644 --- a/source/components/dispatcher/dswexec.c +++ b/source/components/dispatcher/dswexec.c @@ -223,7 +223,7 @@ Cleanup: * RETURN: Status * * DESCRIPTION: Descending callback used during the execution of control - * methods. This is where most operators and operands are + * methods. This is where most operators and operands are * dispatched to the interpreter. * ****************************************************************************/ @@ -325,7 +325,7 @@ AcpiDsExecBeginOp ( { /* * Found a named object declaration during method execution; - * we must enter this object into the namespace. The created + * we must enter this object into the namespace. The created * object is temporary and will be deleted upon completion of * the execution of this method. * @@ -381,7 +381,7 @@ ErrorExit: * RETURN: Status * * DESCRIPTION: Ascending callback used during the execution of control - * methods. The only thing we really need to do here is to + * methods. The only thing we really need to do here is to * notice the beginning of IF, ELSE, and WHILE blocks. * ****************************************************************************/ @@ -469,7 +469,7 @@ AcpiDsExecEndOp ( { /* * Dispatch the request to the appropriate interpreter handler - * routine. There is one routine per opcode "type" based upon the + * routine. There is one routine per opcode "type" based upon the * number of opcode arguments and return type. */ Status = AcpiGbl_OpTypeDispatch[OpType] (WalkState); @@ -793,5 +793,3 @@ Cleanup: WalkState->NumOperands = 0; return_ACPI_STATUS (Status); } - - diff --git a/source/components/dispatcher/dswload2.c b/source/components/dispatcher/dswload2.c index 90d85d6501da..9c92e2ce2d80 100644 --- a/source/components/dispatcher/dswload2.c +++ b/source/components/dispatcher/dswload2.c @@ -266,7 +266,7 @@ AcpiDsLoad2BeginOp ( "Scope operator [%4.4s] (Cannot override)", AcpiUtGetTypeName (Node->Type), AcpiUtGetNodeName (Node))); - return (AE_AML_OPERAND_TYPE); + return_ACPI_STATUS (AE_AML_OPERAND_TYPE); } break; @@ -625,7 +625,7 @@ AcpiDsLoad2EndOp ( RegionSpace, WalkState); if (ACPI_FAILURE (Status)) { - return (Status); + return_ACPI_STATUS (Status); } AcpiExExitInterpreter (); @@ -758,4 +758,3 @@ Cleanup: WalkState->NumOperands = 0; return_ACPI_STATUS (Status); } - diff --git a/source/components/dispatcher/dswscope.c b/source/components/dispatcher/dswscope.c index a59fdc9dca5c..3bdfbed3e214 100644 --- a/source/components/dispatcher/dswscope.c +++ b/source/components/dispatcher/dswscope.c @@ -235,5 +235,3 @@ AcpiDsScopeStackPop ( AcpiUtDeleteGenericState (ScopeInfo); return_ACPI_STATUS (AE_OK); } - - diff --git a/source/components/dispatcher/dswstate.c b/source/components/dispatcher/dswstate.c index dd11a1813029..0224021a864e 100644 --- a/source/components/dispatcher/dswstate.c +++ b/source/components/dispatcher/dswstate.c @@ -385,7 +385,7 @@ AcpiDsObjStackPush ( * * RETURN: Status * - * DESCRIPTION: Pop this walk's object stack. Objects on the stack are NOT + * DESCRIPTION: Pop this walk's object stack. Objects on the stack are NOT * deleted by this routine. * ******************************************************************************/ @@ -549,7 +549,7 @@ AcpiDsPushWalkState ( * RETURN: A WalkState object popped from the thread's stack * * DESCRIPTION: Remove and return the walkstate object that is at the head of - * the walk stack for the given walk list. NULL indicates that + * the walk stack for the given walk list. NULL indicates that * the list is empty. * ******************************************************************************/ @@ -594,7 +594,7 @@ AcpiDsPopWalkState ( * * RETURN: Pointer to the new walk state. * - * DESCRIPTION: Allocate and initialize a new walk state. The current walk + * DESCRIPTION: Allocate and initialize a new walk state. The current walk * state is set to this new state. * ******************************************************************************/ @@ -730,7 +730,7 @@ AcpiDsInitAmlWalk ( /* * Setup the current scope. * Find a Named Op that has a namespace node associated with it. - * search upwards from this Op. Current scope is the first + * search upwards from this Op. Current scope is the first * Op with a namespace node. */ ExtraOp = ParserState->StartOp; @@ -790,14 +790,14 @@ AcpiDsDeleteWalkState ( if (!WalkState) { - return; + return_VOID; } if (WalkState->DescriptorType != ACPI_DESC_TYPE_WALK) { ACPI_ERROR ((AE_INFO, "%p is not a valid walk state", WalkState)); - return; + return_VOID; } /* There should not be any open scopes */ @@ -842,5 +842,3 @@ AcpiDsDeleteWalkState ( ACPI_FREE (WalkState); return_VOID; } - - diff --git a/source/components/events/evevent.c b/source/components/events/evevent.c index b5a7acde7293..45ed92779e83 100644 --- a/source/components/events/evevent.c +++ b/source/components/events/evevent.c @@ -332,5 +332,3 @@ AcpiEvFixedEventDispatch ( } #endif /* !ACPI_REDUCED_HARDWARE */ - - diff --git a/source/components/events/evrgnini.c b/source/components/events/evrgnini.c index 92946b5aaafa..2dd9ebf0ae27 100644 --- a/source/components/events/evrgnini.c +++ b/source/components/events/evrgnini.c @@ -389,8 +389,8 @@ AcpiEvIsPciRootBridge ( ACPI_NAMESPACE_NODE *Node) { ACPI_STATUS Status; - ACPI_DEVICE_ID *Hid; - ACPI_DEVICE_ID_LIST *Cid; + ACPI_PNP_DEVICE_ID *Hid; + ACPI_PNP_DEVICE_ID_LIST *Cid; UINT32 i; BOOLEAN Match; @@ -729,4 +729,3 @@ AcpiEvInitializeRegion ( return_ACPI_STATUS (AE_NOT_EXIST); } - diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c index 1e83d1dacd6d..118fb5672ba0 100644 --- a/source/components/events/evxfgpe.c +++ b/source/components/events/evxfgpe.c @@ -774,7 +774,7 @@ AcpiInstallGpeBlock ( Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); if (ACPI_FAILURE (Status)) { - return (Status); + return_ACPI_STATUS (Status); } Node = AcpiNsValidateHandle (GpeDevice); @@ -867,7 +867,7 @@ AcpiRemoveGpeBlock ( Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); if (ACPI_FAILURE (Status)) { - return (Status); + return_ACPI_STATUS (Status); } Node = AcpiNsValidateHandle (GpeDevice); diff --git a/source/components/events/evxfregn.c b/source/components/events/evxfregn.c index 493df9217de1..26afaf379a34 100644 --- a/source/components/events/evxfregn.c +++ b/source/components/events/evxfregn.c @@ -310,4 +310,3 @@ UnlockAndExit: } ACPI_EXPORT_SYMBOL (AcpiRemoveAddressSpaceHandler) - diff --git a/source/components/executer/exconfig.c b/source/components/executer/exconfig.c index 581bc574e4dc..f0083ff3beb8 100644 --- a/source/components/executer/exconfig.c +++ b/source/components/executer/exconfig.c @@ -222,7 +222,7 @@ AcpiExLoadTableOp ( if (Operand[3]->String.Length > 0) { /* - * Find the node referenced by the RootPathString. This is the + * Find the node referenced by the RootPathString. This is the * location within the namespace where the table will be loaded. */ Status = AcpiNsGetNode (StartNode, Operand[3]->String.Pointer, @@ -685,4 +685,3 @@ AcpiExUnloadTable ( DdbHandle->Common.Flags &= ~AOPOBJ_DATA_VALID; return_ACPI_STATUS (AE_OK); } - diff --git a/source/components/executer/exconvrt.c b/source/components/executer/exconvrt.c index e79cbc96e975..81cde05cb4a1 100644 --- a/source/components/executer/exconvrt.c +++ b/source/components/executer/exconvrt.c @@ -750,5 +750,3 @@ AcpiExConvertToTargetType ( return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/excreate.c b/source/components/executer/excreate.c index 888ff7d7c4ad..cd1ffc2b5336 100644 --- a/source/components/executer/excreate.c +++ b/source/components/executer/excreate.c @@ -89,7 +89,7 @@ AcpiExCreateAlias ( { /* * Dereference an existing alias so that we don't create a chain - * of aliases. With this code, we guarantee that an alias is + * of aliases. With this code, we guarantee that an alias is * always exactly one level of indirection away from the * actual aliased name. */ @@ -99,7 +99,7 @@ AcpiExCreateAlias ( /* * For objects that can never change (i.e., the NS node will * permanently point to the same object), we can simply attach - * the object to the new NS node. For other objects (such as + * the object to the new NS node. For other objects (such as * Integers, buffers, etc.), we have to point the Alias node * to the original Node. */ @@ -147,7 +147,7 @@ AcpiExCreateAlias ( /* * The new alias assumes the type of the target, and it points - * to the same object. The reference count of the object has an + * to the same object. The reference count of the object has an * additional reference to prevent deletion out from under either the * target node or the alias Node */ @@ -570,5 +570,3 @@ Exit: AcpiUtRemoveReference (Operand[1]); return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exdebug.c b/source/components/executer/exdebug.c index 166b2af170ff..883c2ac58778 100644 --- a/source/components/executer/exdebug.c +++ b/source/components/executer/exdebug.c @@ -162,9 +162,9 @@ AcpiExDoDebugObject ( case ACPI_TYPE_BUFFER: AcpiOsPrintf ("[0x%.2X]\n", (UINT32) SourceDesc->Buffer.Length); - AcpiUtDumpBuffer2 (SourceDesc->Buffer.Pointer, + AcpiUtDumpBuffer (SourceDesc->Buffer.Pointer, (SourceDesc->Buffer.Length < 256) ? - SourceDesc->Buffer.Length : 256, DB_BYTE_DISPLAY); + SourceDesc->Buffer.Length : 256, DB_BYTE_DISPLAY, 0); break; case ACPI_TYPE_STRING: @@ -205,7 +205,7 @@ AcpiExDoDebugObject ( /* Case for DdbHandle */ AcpiOsPrintf ("Table Index 0x%X\n", SourceDesc->Reference.Value); - return; + return_VOID; default: break; @@ -274,5 +274,3 @@ AcpiExDoDebugObject ( return_VOID; } #endif - - diff --git a/source/components/executer/exdump.c b/source/components/executer/exdump.c index 0943e668c1c6..5e13849a7db3 100644 --- a/source/components/executer/exdump.c +++ b/source/components/executer/exdump.c @@ -828,7 +828,7 @@ AcpiExDumpOperands ( * PARAMETERS: Title - Descriptive text * Value - Value to be displayed * - * DESCRIPTION: Object dump output formatting functions. These functions + * DESCRIPTION: Object dump output formatting functions. These functions * reduce the number of format strings required and keeps them * all in one place for easy modification. * @@ -1015,7 +1015,7 @@ AcpiExDumpPackageObj ( AcpiOsPrintf ("[Buffer] Length %.2X = ", ObjDesc->Buffer.Length); if (ObjDesc->Buffer.Length) { - AcpiUtDumpBuffer (ACPI_CAST_PTR (UINT8, ObjDesc->Buffer.Pointer), + AcpiUtDebugDumpBuffer (ACPI_CAST_PTR (UINT8, ObjDesc->Buffer.Pointer), ObjDesc->Buffer.Length, DB_DWORD_DISPLAY, _COMPONENT); } else @@ -1122,4 +1122,3 @@ AcpiExDumpObjectDescriptor ( } #endif - diff --git a/source/components/executer/exfield.c b/source/components/executer/exfield.c index a68240682607..9fa93ccc58a5 100644 --- a/source/components/executer/exfield.c +++ b/source/components/executer/exfield.c @@ -64,7 +64,7 @@ * * RETURN: Status * - * DESCRIPTION: Read from a named field. Returns either an Integer or a + * DESCRIPTION: Read from a named field. Returns either an Integer or a * Buffer, depending on the size of the field. * ******************************************************************************/ @@ -161,7 +161,7 @@ AcpiExReadDataFromField ( * Allocate a buffer for the contents of the field. * * If the field is larger than the current integer width, create - * a BUFFER to hold it. Otherwise, use an INTEGER. This allows + * a BUFFER to hold it. Otherwise, use an INTEGER. This allows * the use of arithmetic operators on the returned value if the * field size is equal or smaller than an Integer. * @@ -402,5 +402,3 @@ AcpiExWriteDataToField ( return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c index e138e9a13ce4..2b8497665f85 100644 --- a/source/components/executer/exfldio.c +++ b/source/components/executer/exfldio.c @@ -86,7 +86,7 @@ AcpiExSetupRegion ( * RETURN: Status * * DESCRIPTION: Common processing for AcpiExExtractFromField and - * AcpiExInsertIntoField. Initialize the Region if necessary and + * AcpiExInsertIntoField. Initialize the Region if necessary and * validate the request. * ******************************************************************************/ @@ -168,7 +168,7 @@ AcpiExSetupRegion ( #endif /* - * Validate the request. The entire request from the byte offset for a + * Validate the request. The entire request from the byte offset for a * length of one field datum (access width) must fit within the region. * (Region length is specified in bytes) */ @@ -197,7 +197,7 @@ AcpiExSetupRegion ( { /* * This is the case where the AccessType (AccWord, etc.) is wider - * than the region itself. For example, a region of length one + * than the region itself. For example, a region of length one * byte, and a field with Dword access specified. */ ACPI_ERROR ((AE_INFO, @@ -339,7 +339,7 @@ AcpiExAccessRegion ( * * DESCRIPTION: Check if a value is out of range of the field being written. * Used to check if the values written to Index and Bank registers - * are out of range. Normally, the value is simply truncated + * are out of range. Normally, the value is simply truncated * to fit the field, but this case is most likely a serious * coding error in the ASL. * @@ -392,7 +392,7 @@ AcpiExRegisterOverflow ( * * RETURN: Status * - * DESCRIPTION: Read or Write a single datum of a field. The FieldType is + * DESCRIPTION: Read or Write a single datum of a field. The FieldType is * demultiplexed here to handle the different types of fields * (BufferField, RegionField, IndexField, BankField) * @@ -906,7 +906,7 @@ AcpiExInsertIntoField ( ObjDesc->CommonField.BitLength); /* * We must have a buffer that is at least as long as the field - * we are writing to. This is because individual fields are + * we are writing to. This is because individual fields are * indivisible and partial writes are not supported -- as per * the ACPI specification. */ @@ -922,7 +922,7 @@ AcpiExInsertIntoField ( /* * Copy the original data to the new buffer, starting - * at Byte zero. All unused (upper) bytes of the + * at Byte zero. All unused (upper) bytes of the * buffer will be 0. */ ACPI_MEMCPY ((char *) NewBuffer, (char *) Buffer, BufferLength); @@ -1051,5 +1051,3 @@ Exit: } return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exmisc.c b/source/components/executer/exmisc.c index 63114f5584d6..1966aacb7b47 100644 --- a/source/components/executer/exmisc.c +++ b/source/components/executer/exmisc.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exmisc - ACPI AML (p-code) execution - specific opcodes @@ -278,7 +277,7 @@ AcpiExDoConcatenate ( /* - * Convert the second operand if necessary. The first operand + * Convert the second operand if necessary. The first operand * determines the type of the second operand, (See the Data Types * section of the ACPI specification.) Both object types are * guaranteed to be either Integer/String/Buffer by the operand @@ -630,7 +629,7 @@ AcpiExDoLogicalOp ( /* - * Convert the second operand if necessary. The first operand + * Convert the second operand if necessary. The first operand * determines the type of the second operand, (See the Data Types * section of the ACPI 3.0+ specification.) Both object types are * guaranteed to be either Integer/String/Buffer by the operand @@ -796,5 +795,3 @@ Cleanup: *LogicalResult = LocalResult; return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exmutex.c b/source/components/executer/exmutex.c index 4c702b8baa6d..70ccfd075f04 100644 --- a/source/components/executer/exmutex.c +++ b/source/components/executer/exmutex.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exmutex - ASL Mutex Acquire/Release functions @@ -341,7 +340,7 @@ AcpiExReleaseMutexObject ( if (ObjDesc->Mutex.AcquisitionDepth == 0) { - return (AE_NOT_ACQUIRED); + return_ACPI_STATUS (AE_NOT_ACQUIRED); } /* Match multiple Acquires with multiple Releases */ @@ -515,7 +514,7 @@ AcpiExReleaseAllMutexes ( ACPI_OPERAND_OBJECT *ObjDesc; - ACPI_FUNCTION_ENTRY (); + ACPI_FUNCTION_NAME (ExReleaseAllMutexes); /* Traverse the list of owned mutexes, releasing each one */ @@ -529,6 +528,9 @@ AcpiExReleaseAllMutexes ( ObjDesc->Mutex.Next = NULL; ObjDesc->Mutex.AcquisitionDepth = 0; + ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, + "Force-releasing held mutex: %p\n", ObjDesc)); + /* Release the mutex, special case for Global Lock */ if (ObjDesc == AcpiGbl_GlobalLockMutex) diff --git a/source/components/executer/exnames.c b/source/components/executer/exnames.c index c3cb6b0b4cad..0d0b6e2da0ac 100644 --- a/source/components/executer/exnames.c +++ b/source/components/executer/exnames.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exnames - interpreter/scanner name load/execute @@ -73,7 +72,7 @@ AcpiExNameSegment ( * (-1)==root, 0==none * NumNameSegs - count of 4-character name segments * - * RETURN: A pointer to the allocated string segment. This segment must + * RETURN: A pointer to the allocated string segment. This segment must * be deleted by the caller. * * DESCRIPTION: Allocate a buffer for a name string. Ensure allocated name @@ -484,5 +483,3 @@ AcpiExGetNameString ( return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exoparg1.c b/source/components/executer/exoparg1.c index 9a6cd9fcab75..6f683cd5df47 100644 --- a/source/components/executer/exoparg1.c +++ b/source/components/executer/exoparg1.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exoparg1 - AML execution - opcodes with 1 argument @@ -668,7 +667,7 @@ AcpiExOpcode_1A_0T_1R ( } /* - * Set result to ONES (TRUE) if Value == 0. Note: + * Set result to ONES (TRUE) if Value == 0. Note: * ReturnDesc->Integer.Value is initially == 0 (FALSE) from above. */ if (!Operand[0]->Integer.Value) @@ -682,7 +681,7 @@ AcpiExOpcode_1A_0T_1R ( case AML_INCREMENT_OP: /* Increment (Operand) */ /* - * Create a new integer. Can't just get the base integer and + * Create a new integer. Can't just get the base integer and * increment it because it may be an Arg or Field. */ ReturnDesc = AcpiUtCreateInternalObject (ACPI_TYPE_INTEGER); @@ -750,7 +749,7 @@ AcpiExOpcode_1A_0T_1R ( /* * Note: The operand is not resolved at this point because we want to - * get the associated object, not its value. For example, we don't + * get the associated object, not its value. For example, we don't * want to resolve a FieldUnit to its value, we want the actual * FieldUnit object. */ @@ -792,7 +791,7 @@ AcpiExOpcode_1A_0T_1R ( /* * The type of the base object must be integer, buffer, string, or - * package. All others are not supported. + * package. All others are not supported. * * NOTE: Integer is not specifically supported by the ACPI spec, * but is supported implicitly via implicit operand conversion. @@ -1030,7 +1029,7 @@ AcpiExOpcode_1A_0T_1R ( case ACPI_TYPE_PACKAGE: /* - * Return the referenced element of the package. We must + * Return the referenced element of the package. We must * add another reference to the referenced object, however. */ ReturnDesc = *(Operand[0]->Reference.Where); @@ -1108,4 +1107,3 @@ Cleanup: return_ACPI_STATUS (Status); } - diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c index b76da75c49d4..6ff7c49b6c08 100644 --- a/source/components/executer/exoparg2.c +++ b/source/components/executer/exoparg2.c @@ -137,7 +137,7 @@ AcpiExOpcode_2A_0T_0R ( /* * Dispatch the notify to the appropriate handler * NOTE: the request is queued for execution after this method - * completes. The notify handlers are NOT invoked synchronously + * completes. The notify handlers are NOT invoked synchronously * from this thread -- because handlers may in turn run other * control methods. */ @@ -638,5 +638,3 @@ Cleanup: return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exoparg3.c b/source/components/executer/exoparg3.c index 0edac68e60ab..42aae03f133a 100644 --- a/source/components/executer/exoparg3.c +++ b/source/components/executer/exoparg3.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exoparg3 - AML execution - opcodes with 3 arguments @@ -179,7 +178,7 @@ AcpiExOpcode_3A_1T_1R ( case AML_MID_OP: /* Mid (Source[0], Index[1], Length[2], Result[3]) */ /* - * Create the return object. The Source operand is guaranteed to be + * Create the return object. The Source operand is guaranteed to be * either a String or a Buffer, so just use its type. */ ReturnDesc = AcpiUtCreateInternalObject ( @@ -300,5 +299,3 @@ Cleanup: } return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exoparg6.c b/source/components/executer/exoparg6.c index bfc6585301f6..b667815cf199 100644 --- a/source/components/executer/exoparg6.c +++ b/source/components/executer/exoparg6.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exoparg6 - AML execution - opcodes with 6 arguments @@ -209,7 +208,7 @@ AcpiExDoMatch ( return (FALSE); } - return LogicalResult; + return (LogicalResult); } @@ -288,7 +287,7 @@ AcpiExOpcode_6A_0T_1R ( * and the next should be examined. * * Upon finding a match, the loop will terminate via "break" at - * the bottom. If it terminates "normally", MatchValue will be + * the bottom. If it terminates "normally", MatchValue will be * ACPI_UINT64_MAX (Ones) (its initial value) indicating that no * match was found. */ diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c index 6b8f69130ccd..2f62e9db4257 100644 --- a/source/components/executer/exprep.c +++ b/source/components/executer/exprep.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exprep - ACPI AML (p-code) execution - field prep utilities @@ -87,8 +86,8 @@ AcpiExGenerateAccess ( * AnyAcc keyword. * * NOTE: Need to have the RegionLength in order to check for boundary - * conditions (end-of-region). However, the RegionLength is a deferred - * operation. Therefore, to complete this implementation, the generation + * conditions (end-of-region). However, the RegionLength is a deferred + * operation. Therefore, to complete this implementation, the generation * of this access width must be deferred until the region length has * been evaluated. * @@ -326,7 +325,7 @@ AcpiExDecodeFieldAccess ( * RETURN: Status * * DESCRIPTION: Initialize the areas of the field object that are common - * to the various types of fields. Note: This is very "sensitive" + * to the various types of fields. Note: This is very "sensitive" * code because we are solving the general case for field * alignment. * @@ -358,13 +357,13 @@ AcpiExPrepCommonFieldObject ( ObjDesc->CommonField.BitLength = FieldBitLength; /* - * Decode the access type so we can compute offsets. The access type gives + * Decode the access type so we can compute offsets. The access type gives * two pieces of information - the width of each field access and the * necessary ByteAlignment (address granularity) of the access. * * For AnyAcc, the AccessBitWidth is the largest width that is both * necessary and possible in an attempt to access the whole field in one - * I/O operation. However, for AnyAcc, the ByteAlignment is always one + * I/O operation. However, for AnyAcc, the ByteAlignment is always one * byte. * * For all Buffer Fields, the ByteAlignment is always one byte. @@ -386,7 +385,7 @@ AcpiExPrepCommonFieldObject ( /* * BaseByteOffset is the address of the start of the field within the - * region. It is the byte address of the first *datum* (field-width data + * region. It is the byte address of the first *datum* (field-width data * unit) of the field. (i.e., the first datum that contains at least the * first *bit* of the field.) * @@ -645,4 +644,3 @@ AcpiExPrepFieldValue ( AcpiUtRemoveReference (ObjDesc); return_ACPI_STATUS (Status); } - diff --git a/source/components/executer/exregion.c b/source/components/executer/exregion.c index 8a40250794e7..f3120465be49 100644 --- a/source/components/executer/exregion.c +++ b/source/components/executer/exregion.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exregion - ACPI default OpRegion (address space) handlers @@ -220,7 +219,7 @@ AcpiExSystemMemorySpaceHandler ( * Perform the memory read or write * * Note: For machines that do not support non-aligned transfers, the target - * address was checked for alignment above. We do not attempt to break the + * address was checked for alignment above. We do not attempt to break the * transfer up into smaller (byte-size) chunks because the AML specifically * asked for a transfer width that the hardware may require. */ @@ -561,5 +560,3 @@ AcpiExDataTableSpaceHandler ( return_ACPI_STATUS (AE_OK); } - - diff --git a/source/components/executer/exresnte.c b/source/components/executer/exresnte.c index 03962edf9705..d20b15ffb3e1 100644 --- a/source/components/executer/exresnte.c +++ b/source/components/executer/exresnte.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exresnte - AML Interpreter object resolution @@ -62,8 +61,8 @@ * PARAMETERS: ObjectPtr - Pointer to a location that contains * a pointer to a NS node, and will receive a * pointer to the resolved object. - * WalkState - Current state. Valid only if executing AML - * code. NULL if simply resolving an object + * WalkState - Current state. Valid only if executing AML + * code. NULL if simply resolving an object * * RETURN: Status * @@ -71,7 +70,7 @@ * * Note: for some of the data types, the pointer attached to the Node * can be either a pointer to an actual internal object or a pointer into the - * AML stream itself. These types are currently: + * AML stream itself. These types are currently: * * ACPI_TYPE_INTEGER * ACPI_TYPE_STRING @@ -98,7 +97,7 @@ AcpiExResolveNodeToValue ( /* - * The stack pointer points to a ACPI_NAMESPACE_NODE (Node). Get the + * The stack pointer points to a ACPI_NAMESPACE_NODE (Node). Get the * object that is attached to the Node. */ Node = *ObjectPtr; @@ -298,5 +297,3 @@ AcpiExResolveNodeToValue ( *ObjectPtr = (void *) ObjDesc; return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exresolv.c b/source/components/executer/exresolv.c index 72286b0e8587..4421b17fa697 100644 --- a/source/components/executer/exresolv.c +++ b/source/components/executer/exresolv.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exresolv - AML Interpreter object resolution @@ -349,7 +348,7 @@ AcpiExResolveObjectToValue ( * * RETURN: Status * - * DESCRIPTION: Return the base object and type. Traverse a reference list if + * DESCRIPTION: Return the base object and type. Traverse a reference list if * necessary to get to the base object. * ******************************************************************************/ @@ -576,5 +575,3 @@ Exit: } return_ACPI_STATUS (AE_OK); } - - diff --git a/source/components/executer/exresop.c b/source/components/executer/exresop.c index 1bcba690333b..a9e0caf55031 100644 --- a/source/components/executer/exresop.c +++ b/source/components/executer/exresop.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exresop - AML Interpreter operand/object resolution @@ -98,7 +97,7 @@ AcpiExCheckObjectType ( { /* * Allow the AML "Constant" opcodes (Zero, One, etc.) to be reference - * objects and thus allow them to be targets. (As per the ACPI + * objects and thus allow them to be targets. (As per the ACPI * specification, a store to a constant is a noop.) */ if ((ThisType == ACPI_TYPE_INTEGER) && @@ -674,7 +673,7 @@ AcpiExResolveOperands ( { /* * Enable original behavior of Store(), allowing any and all - * objects as the source operand. The ACPI spec does not + * objects as the source operand. The ACPI spec does not * allow this, however. */ break; @@ -734,5 +733,3 @@ NextOperand: return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exstore.c b/source/components/executer/exstore.c index 3a88811950b0..283cff59864f 100644 --- a/source/components/executer/exstore.c +++ b/source/components/executer/exstore.c @@ -398,7 +398,7 @@ AcpiExStoreObjectToIndex ( * with the input value. * * When storing into an object the data is converted to the - * target object type then stored in the object. This means + * target object type then stored in the object. This means * that the target object type (for an initialized target) will * not be changed by a store operation. * @@ -518,7 +518,7 @@ AcpiExStoreObjectToNode ( "Storing %s (%p) directly into node (%p) with no implicit conversion\n", AcpiUtGetObjectTypeName (SourceDesc), SourceDesc, Node)); - /* No conversions for all other types. Just attach the source object */ + /* No conversions for all other types. Just attach the source object */ Status = AcpiNsAttachObject (Node, SourceDesc, SourceDesc->Common.Type); @@ -527,5 +527,3 @@ AcpiExStoreObjectToNode ( return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exstoren.c b/source/components/executer/exstoren.c index 464d6b106504..84699b67adf2 100644 --- a/source/components/executer/exstoren.c +++ b/source/components/executer/exstoren.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exstoren - AML Interpreter object store support, @@ -65,7 +64,7 @@ * * RETURN: Status, resolved object in SourceDescPtr. * - * DESCRIPTION: Resolve an object. If the object is a reference, dereference + * DESCRIPTION: Resolve an object. If the object is a reference, dereference * it and return the actual object in the SourceDescPtr. * ******************************************************************************/ @@ -102,7 +101,7 @@ AcpiExResolveObject ( /* * Stores into a Field/Region or into a Integer/Buffer/String - * are all essentially the same. This case handles the + * are all essentially the same. This case handles the * "interchangeable" types Integer, String, and Buffer. */ if (SourceDesc->Common.Type == ACPI_TYPE_LOCAL_REFERENCE) @@ -179,7 +178,7 @@ AcpiExResolveObject ( * * RETURN: Status * - * DESCRIPTION: "Store" an object to another object. This may include + * DESCRIPTION: "Store" an object to another object. This may include * converting the source type to the target type (implicit * conversion), and a copy of the value of the source to * the target. @@ -190,14 +189,14 @@ AcpiExResolveObject ( * with the input value. * * When storing into an object the data is converted to the - * target object type then stored in the object. This means + * target object type then stored in the object. This means * that the target object type (for an initialized target) will * not be changed by a store operation. * * This module allows destination types of Number, String, * Buffer, and Package. * - * Assumes parameters are already validated. NOTE: SourceDesc + * Assumes parameters are already validated. NOTE: SourceDesc * resolution (from a reference object) must be performed by * the caller if necessary. * @@ -310,5 +309,3 @@ AcpiExStoreObjectToObject ( *NewDesc = DestDesc; return_ACPI_STATUS (Status); } - - diff --git a/source/components/executer/exstorob.c b/source/components/executer/exstorob.c index e74d5b3485fc..e7166d5ddee2 100644 --- a/source/components/executer/exstorob.c +++ b/source/components/executer/exstorob.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exstorob - AML Interpreter object store support, store to object @@ -118,7 +117,7 @@ AcpiExStoreBufferToBuffer ( #ifdef ACPI_OBSOLETE_BEHAVIOR /* * NOTE: ACPI versions up to 3.0 specified that the buffer must be - * truncated if the string is smaller than the buffer. However, "other" + * truncated if the string is smaller than the buffer. However, "other" * implementations of ACPI never did this and thus became the defacto * standard. ACPI 3.0A changes this behavior such that the buffer * is no longer truncated. @@ -127,7 +126,7 @@ AcpiExStoreBufferToBuffer ( /* * OBSOLETE BEHAVIOR: * If the original source was a string, we must truncate the buffer, - * according to the ACPI spec. Integer-to-Buffer and Buffer-to-Buffer + * according to the ACPI spec. Integer-to-Buffer and Buffer-to-Buffer * copy must not truncate the original buffer. */ if (OriginalSrcType == ACPI_TYPE_STRING) @@ -240,5 +239,3 @@ AcpiExStoreStringToString ( TargetDesc->String.Length = Length; return_ACPI_STATUS (AE_OK); } - - diff --git a/source/components/executer/exsystem.c b/source/components/executer/exsystem.c index 37f5b234a373..bbb8e188ef40 100644 --- a/source/components/executer/exsystem.c +++ b/source/components/executer/exsystem.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exsystem - Interface to OS services @@ -62,7 +61,7 @@ * RETURN: Status * * DESCRIPTION: Implements a semaphore wait with a check to see if the - * semaphore is available immediately. If it is not, the + * semaphore is available immediately. If it is not, the * interpreter is released before waiting. * ******************************************************************************/ @@ -115,7 +114,7 @@ AcpiExSystemWaitSemaphore ( * RETURN: Status * * DESCRIPTION: Implements a mutex wait with a check to see if the - * mutex is available immediately. If it is not, the + * mutex is available immediately. If it is not, the * interpreter is released before waiting. * ******************************************************************************/ @@ -170,7 +169,7 @@ AcpiExSystemWaitMutex ( * DESCRIPTION: Suspend running thread for specified amount of time. * Note: ACPI specification requires that Stall() does not * relinquish the processor, and delays longer than 100 usec - * should use Sleep() instead. We allow stalls up to 255 usec + * should use Sleep() instead. We allow stalls up to 255 usec * for compatibility with other interpreters and existing BIOSs. * ******************************************************************************/ @@ -290,7 +289,7 @@ AcpiExSystemSignalEvent ( * RETURN: Status * * DESCRIPTION: Provides an access point to perform synchronization operations - * within the AML. This operation is a request to wait for an + * within the AML. This operation is a request to wait for an * event. * ******************************************************************************/ @@ -352,4 +351,3 @@ AcpiExSystemResetEvent ( return (Status); } - diff --git a/source/components/executer/exutils.c b/source/components/executer/exutils.c index faf34fca1cff..12befff2e7e6 100644 --- a/source/components/executer/exutils.c +++ b/source/components/executer/exutils.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: exutils - interpreter/scanner utilities @@ -47,12 +46,12 @@ /* * DEFINE_AML_GLOBALS is tested in amlcode.h * to determine whether certain global names should be "defined" or only - * "declared" in the current compilation. This enhances maintainability + * "declared" in the current compilation. This enhances maintainability * by enabling a single header file to embody all knowledge of the names * in question. * * Exactly one module of any executable should #define DEFINE_GLOBALS - * before #including the header files which use this convention. The + * before #including the header files which use this convention. The * names in question will be defined and initialized in that module, * and declared as extern in all other modules which #include those * header files. diff --git a/source/components/hardware/hwacpi.c b/source/components/hardware/hwacpi.c index d9f16ef9d767..9f9fec329046 100644 --- a/source/components/hardware/hwacpi.c +++ b/source/components/hardware/hwacpi.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: hwacpi - ACPI Hardware Initialization/Mode Interface @@ -165,7 +164,7 @@ AcpiHwSetMode ( * * RETURN: SYS_MODE_ACPI or SYS_MODE_LEGACY * - * DESCRIPTION: Return current operating state of system. Determined by + * DESCRIPTION: Return current operating state of system. Determined by * querying the SCI_EN bit. * ******************************************************************************/ diff --git a/source/components/hardware/hwgpe.c b/source/components/hardware/hwgpe.c index 11cb36e86b97..8203916da501 100644 --- a/source/components/hardware/hwgpe.c +++ b/source/components/hardware/hwgpe.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: hwgpe - Low level GPE enable/disable/clear functions diff --git a/source/components/hardware/hwpci.c b/source/components/hardware/hwpci.c index 065e42d95eb6..1c42f3a7dd29 100644 --- a/source/components/hardware/hwpci.c +++ b/source/components/hardware/hwpci.c @@ -292,7 +292,7 @@ AcpiHwProcessPciList ( &BusNumber, &IsBridge); if (ACPI_FAILURE (Status)) { - return_ACPI_STATUS (Status); + return (Status); } Info = Info->Next; @@ -304,7 +304,7 @@ AcpiHwProcessPciList ( PciId->Segment, PciId->Bus, PciId->Device, PciId->Function, Status, BusNumber, IsBridge)); - return_ACPI_STATUS (AE_OK); + return (AE_OK); } diff --git a/source/components/hardware/hwregs.c b/source/components/hardware/hwregs.c index 6d89883179f4..a89e97cd8c40 100644 --- a/source/components/hardware/hwregs.c +++ b/source/components/hardware/hwregs.c @@ -1,4 +1,3 @@ - /******************************************************************************* * * Module Name: hwregs - Read/write access functions for the various ACPI diff --git a/source/components/hardware/hwtimer.c b/source/components/hardware/hwtimer.c index 15dc58f0bffe..44de309456c7 100644 --- a/source/components/hardware/hwtimer.c +++ b/source/components/hardware/hwtimer.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Name: hwtimer.c - ACPI Power Management Timer Interface @@ -144,7 +143,7 @@ ACPI_EXPORT_SYMBOL (AcpiGetTimer) * a versatile and accurate timer. * * Note that this function accommodates only a single timer - * rollover. Thus for 24-bit timers, this function should only + * rollover. Thus for 24-bit timers, this function should only * be used for calculating durations less than ~4.6 seconds * (~20 minutes for 32-bit timers) -- calculations below: * diff --git a/source/components/hardware/hwvalid.c b/source/components/hardware/hwvalid.c index 4462434bbfe6..535cdbbd1a98 100644 --- a/source/components/hardware/hwvalid.c +++ b/source/components/hardware/hwvalid.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: hwvalid - I/O request validation @@ -364,5 +363,3 @@ AcpiHwWritePort ( return (AE_OK); } - - diff --git a/source/components/hardware/hwxface.c b/source/components/hardware/hwxface.c index 3fec9b566f05..e4f8c802c455 100644 --- a/source/components/hardware/hwxface.c +++ b/source/components/hardware/hwxface.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: hwxface - Public ACPICA hardware interfaces diff --git a/source/components/namespace/nsaccess.c b/source/components/namespace/nsaccess.c index 9dfa76fb0850..64342badd90d 100644 --- a/source/components/namespace/nsaccess.c +++ b/source/components/namespace/nsaccess.c @@ -121,12 +121,12 @@ AcpiNsRootInitialize ( Status = AcpiNsLookup (NULL, InitVal->Name, InitVal->Type, ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH, NULL, &NewNode); - - if (ACPI_FAILURE (Status) || (!NewNode)) /* Must be on same line for code converter */ + if (ACPI_FAILURE (Status)) { ACPI_EXCEPTION ((AE_INFO, Status, "Could not create predefined name %s", InitVal->Name)); + continue; } /* @@ -697,4 +697,3 @@ AcpiNsLookup ( *ReturnNode = ThisNode; return_ACPI_STATUS (AE_OK); } - diff --git a/source/components/namespace/nsalloc.c b/source/components/namespace/nsalloc.c index c7e83e0eb49c..d10c997ed7f6 100644 --- a/source/components/namespace/nsalloc.c +++ b/source/components/namespace/nsalloc.c @@ -376,7 +376,7 @@ AcpiNsDeleteChildren ( * * RETURN: None. * - * DESCRIPTION: Delete a subtree of the namespace. This includes all objects + * DESCRIPTION: Delete a subtree of the namespace. This includes all objects * stored within the subtree. * ******************************************************************************/ @@ -472,7 +472,7 @@ AcpiNsDeleteNamespaceSubtree ( * RETURN: Status * * DESCRIPTION: Delete entries within the namespace that are owned by a - * specific ID. Used to delete entire ACPI tables. All + * specific ID. Used to delete entire ACPI tables. All * reference counts are updated. * * MUTEX: Locks namespace during deletion walk. @@ -584,5 +584,3 @@ AcpiNsDeleteNamespaceByOwner ( (void) AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); return_VOID; } - - diff --git a/source/components/namespace/nsdump.c b/source/components/namespace/nsdump.c index e0635dc7ba22..ef2aac5e5e05 100644 --- a/source/components/namespace/nsdump.c +++ b/source/components/namespace/nsdump.c @@ -736,7 +736,7 @@ AcpiNsDumpEntry ( * * PARAMETERS: SearchBase - Root of subtree to be dumped, or * NS_ALL to dump the entire namespace - * MaxDepth - Maximum depth of dump. Use INT_MAX + * MaxDepth - Maximum depth of dump. Use INT_MAX * for an effectively unlimited depth. * * RETURN: None @@ -780,4 +780,3 @@ AcpiNsDumpTables ( } #endif #endif - diff --git a/source/components/namespace/nsdumpdv.c b/source/components/namespace/nsdumpdv.c index 9d30886608a3..b42b824a0dc9 100644 --- a/source/components/namespace/nsdumpdv.c +++ b/source/components/namespace/nsdumpdv.c @@ -157,5 +157,3 @@ AcpiNsDumpRootDevices ( #endif #endif - - diff --git a/source/components/namespace/nseval.c b/source/components/namespace/nseval.c index 0183f7e77441..537dfafa17b3 100644 --- a/source/components/namespace/nseval.c +++ b/source/components/namespace/nseval.c @@ -482,4 +482,3 @@ Exit: } return_VOID; } - diff --git a/source/components/namespace/nsinit.c b/source/components/namespace/nsinit.c index f3907aafb3a4..a24a67ae3c23 100644 --- a/source/components/namespace/nsinit.c +++ b/source/components/namespace/nsinit.c @@ -254,7 +254,7 @@ ErrorExit: * * RETURN: Status * - * DESCRIPTION: Callback from AcpiWalkNamespace. Invoked for every object + * DESCRIPTION: Callback from AcpiWalkNamespace. Invoked for every object * within the namespace. * * Currently, the only objects that require initialization are: diff --git a/source/components/namespace/nsload.c b/source/components/namespace/nsload.c index 3ef33f9ce9d9..77aed81c2ca8 100644 --- a/source/components/namespace/nsload.c +++ b/source/components/namespace/nsload.c @@ -93,8 +93,8 @@ AcpiNsLoadTable ( /* * Parse the table and load the namespace with all named - * objects found within. Control methods are NOT parsed - * at this time. In fact, the control methods cannot be + * objects found within. Control methods are NOT parsed + * at this time. In fact, the control methods cannot be * parsed until the entire namespace is loaded, because * if a control method makes a forward reference (call) * to another control method, we can't continue parsing @@ -142,7 +142,7 @@ Unlock: } /* - * Now we can parse the control methods. We always parse + * Now we can parse the control methods. We always parse * them here for a sanity check, and if configured for * just-in-time parsing, we delete the control method * parse trees. @@ -192,7 +192,7 @@ AcpiNsLoadNamespace ( } /* - * Load the namespace. The DSDT is required, + * Load the namespace. The DSDT is required, * but the SSDT and PSDT tables are optional. */ Status = AcpiNsLoadTableByType (ACPI_TABLE_ID_DSDT); @@ -318,7 +318,7 @@ AcpiNsDeleteSubtree ( * RETURN: Status * * DESCRIPTION: Shrinks the namespace, typically in response to an undocking - * event. Deletes an entire subtree starting from (and + * event. Deletes an entire subtree starting from (and * including) the given handle. * ******************************************************************************/ @@ -353,4 +353,3 @@ AcpiNsUnloadNamespace ( } #endif #endif - diff --git a/source/components/namespace/nsnames.c b/source/components/namespace/nsnames.c index f70900da1d1a..e7c73a24a8e1 100644 --- a/source/components/namespace/nsnames.c +++ b/source/components/namespace/nsnames.c @@ -223,7 +223,7 @@ AcpiNsGetPathnameLength ( ACPI_ERROR ((AE_INFO, "Invalid Namespace Node (%p) while traversing namespace", NextNode)); - return 0; + return (0); } Size += ACPI_PATH_SEGMENT_LENGTH; NextNode = NextNode->Parent; @@ -299,5 +299,3 @@ AcpiNsHandleToPathname ( (char *) Buffer->Pointer, (UINT32) RequiredSize)); return_ACPI_STATUS (AE_OK); } - - diff --git a/source/components/namespace/nsobject.c b/source/components/namespace/nsobject.c index 9b219a562447..54e918ebbcdd 100644 --- a/source/components/namespace/nsobject.c +++ b/source/components/namespace/nsobject.c @@ -66,7 +66,7 @@ * RETURN: Status * * DESCRIPTION: Record the given object as the value associated with the - * name whose ACPI_HANDLE is passed. If Object is NULL + * name whose ACPI_HANDLE is passed. If Object is NULL * and Type is ACPI_TYPE_ANY, set the name as having no value. * Note: Future may require that the Node->Flags field be passed * as a parameter. @@ -146,7 +146,7 @@ AcpiNsAttachObject ( { /* * Value passed is a name handle and that name has a - * non-null value. Use that name's value and type. + * non-null value. Use that name's value and type. */ ObjDesc = ((ACPI_NAMESPACE_NODE *) Object)->Object; ObjectType = ((ACPI_NAMESPACE_NODE *) Object)->Type; @@ -354,7 +354,7 @@ AcpiNsGetSecondaryObject ( * * RETURN: Status * - * DESCRIPTION: Low-level attach data. Create and attach a Data object. + * DESCRIPTION: Low-level attach data. Create and attach a Data object. * ******************************************************************************/ @@ -420,7 +420,7 @@ AcpiNsAttachData ( * * RETURN: Status * - * DESCRIPTION: Low-level detach data. Delete the data node, but the caller + * DESCRIPTION: Low-level detach data. Delete the data node, but the caller * is responsible for the actual data. * ******************************************************************************/ @@ -501,5 +501,3 @@ AcpiNsGetAttachedData ( return (AE_NOT_FOUND); } - - diff --git a/source/components/namespace/nsparse.c b/source/components/namespace/nsparse.c index 2c768c0b699f..4037456ac115 100644 --- a/source/components/namespace/nsparse.c +++ b/source/components/namespace/nsparse.c @@ -187,11 +187,11 @@ AcpiNsParseTable ( /* * AML Parse, pass 1 * - * In this pass, we load most of the namespace. Control methods - * are not parsed until later. A parse tree is not created. Instead, - * each Parser Op subtree is deleted when it is finished. This saves + * In this pass, we load most of the namespace. Control methods + * are not parsed until later. A parse tree is not created. Instead, + * each Parser Op subtree is deleted when it is finished. This saves * a great deal of memory, and allows a small cache of parse objects - * to service the entire parse. The second pass of the parse then + * to service the entire parse. The second pass of the parse then * performs another complete parse of the AML. */ ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start pass 1\n")); @@ -221,5 +221,3 @@ AcpiNsParseTable ( return_ACPI_STATUS (Status); } - - diff --git a/source/components/namespace/nssearch.c b/source/components/namespace/nssearch.c index d6f59ccbd104..82d9a0659b19 100644 --- a/source/components/namespace/nssearch.c +++ b/source/components/namespace/nssearch.c @@ -421,4 +421,3 @@ AcpiNsSearchAndEnter ( *ReturnNode = NewNode; return_ACPI_STATUS (AE_OK); } - diff --git a/source/components/namespace/nsutils.c b/source/components/namespace/nsutils.c index 43f734e81902..6370dab2a693 100644 --- a/source/components/namespace/nsutils.c +++ b/source/components/namespace/nsutils.c @@ -622,7 +622,7 @@ AcpiNsExternalizeName ( ((NumSegments > 0) ? (NumSegments - 1) : 0) + 1; /* - * Check to see if we're still in bounds. If not, there's a problem + * Check to see if we're still in bounds. If not, there's a problem * with InternalName (invalid format). */ if (RequiredLength > InternalNameLength) @@ -655,10 +655,13 @@ AcpiNsExternalizeName ( (*ConvertedName)[j++] = '.'; } - (*ConvertedName)[j++] = InternalName[NamesIndex++]; - (*ConvertedName)[j++] = InternalName[NamesIndex++]; - (*ConvertedName)[j++] = InternalName[NamesIndex++]; - (*ConvertedName)[j++] = InternalName[NamesIndex++]; + /* Copy and validate the 4-char name segment */ + + ACPI_MOVE_NAME (&(*ConvertedName)[j], &InternalName[NamesIndex]); + AcpiUtRepairName (&(*ConvertedName)[j]); + + j += ACPI_NAME_SIZE; + NamesIndex += ACPI_NAME_SIZE; } } @@ -797,7 +800,7 @@ AcpiNsOpensScope ( * \ (backslash) and ^ (carat) prefixes, and the * . (period) to separate segments are supported. * PrefixNode - Root of subtree to be searched, or NS_ALL for the - * root of the name space. If Name is fully + * root of the name space. If Name is fully * qualified (first INT8 is '\'), the passed value * of Scope will not be accessed. * Flags - Used to indicate whether to perform upsearch or @@ -805,7 +808,7 @@ AcpiNsOpensScope ( * ReturnNode - Where the Node is returned * * DESCRIPTION: Look up a name relative to a given scope and return the - * corresponding Node. NOTE: Scope can be null. + * corresponding Node. NOTE: Scope can be null. * * MUTEX: Locks namespace * diff --git a/source/components/namespace/nswalk.c b/source/components/namespace/nswalk.c index 35c3e178966a..7c3a4346f399 100644 --- a/source/components/namespace/nswalk.c +++ b/source/components/namespace/nswalk.c @@ -65,8 +65,8 @@ * RETURN: ACPI_NAMESPACE_NODE - Pointer to the NEXT child or NULL if * none is found. * - * DESCRIPTION: Return the next peer node within the namespace. If Handle - * is valid, Scope is ignored. Otherwise, the first node + * DESCRIPTION: Return the next peer node within the namespace. If Handle + * is valid, Scope is ignored. Otherwise, the first node * within Scope is returned. * ******************************************************************************/ @@ -105,8 +105,8 @@ AcpiNsGetNextNode ( * RETURN: ACPI_NAMESPACE_NODE - Pointer to the NEXT child or NULL if * none is found. * - * DESCRIPTION: Return the next peer node within the namespace. If Handle - * is valid, Scope is ignored. Otherwise, the first node + * DESCRIPTION: Return the next peer node within the namespace. If Handle + * is valid, Scope is ignored. Otherwise, the first node * within Scope is returned. * ******************************************************************************/ @@ -327,7 +327,7 @@ AcpiNsWalkNamespace ( /* * Depth first search: Attempt to go down another level in the - * namespace if we are allowed to. Don't go any further if we have + * namespace if we are allowed to. Don't go any further if we have * reached the caller specified maximum depth or if the user * function has specified that the maximum depth has been reached. */ @@ -382,5 +382,3 @@ AcpiNsWalkNamespace ( return_ACPI_STATUS (AE_OK); } - - diff --git a/source/components/namespace/nsxfeval.c b/source/components/namespace/nsxfeval.c index 5006588e85b6..fcd6fb758758 100644 --- a/source/components/namespace/nsxfeval.c +++ b/source/components/namespace/nsxfeval.c @@ -68,16 +68,16 @@ AcpiNsResolveReferences ( * PARAMETERS: Handle - Object handle (optional) * Pathname - Object pathname (optional) * ExternalParams - List of parameters to pass to method, - * terminated by NULL. May be NULL + * terminated by NULL. May be NULL * if no parameters are being passed. * ReturnBuffer - Where to put method's return value (if - * any). If NULL, no value is returned. + * any). If NULL, no value is returned. * ReturnType - Expected type of return object * * RETURN: Status * * DESCRIPTION: Find and evaluate the given object, passing the given - * parameters if necessary. One of "Handle" or "Pathname" must + * parameters if necessary. One of "Handle" or "Pathname" must * be valid (non-null) * ******************************************************************************/ @@ -168,15 +168,15 @@ ACPI_EXPORT_SYMBOL (AcpiEvaluateObjectTyped) * PARAMETERS: Handle - Object handle (optional) * Pathname - Object pathname (optional) * ExternalParams - List of parameters to pass to method, - * terminated by NULL. May be NULL + * terminated by NULL. May be NULL * if no parameters are being passed. * ReturnBuffer - Where to put method's return value (if - * any). If NULL, no value is returned. + * any). If NULL, no value is returned. * * RETURN: Status * * DESCRIPTION: Find and evaluate the given object, passing the given - * parameters if necessary. One of "Handle" or "Pathname" must + * parameters if necessary. One of "Handle" or "Pathname" must * be valid (non-null) * ******************************************************************************/ @@ -537,7 +537,7 @@ AcpiWalkNamespace ( Status = AcpiUtAcquireReadLock (&AcpiGbl_NamespaceRwLock); if (ACPI_FAILURE (Status)) { - return (Status); + return_ACPI_STATUS (Status); } /* @@ -591,8 +591,8 @@ AcpiNsGetDeviceCallback ( ACPI_STATUS Status; ACPI_NAMESPACE_NODE *Node; UINT32 Flags; - ACPI_DEVICE_ID *Hid; - ACPI_DEVICE_ID_LIST *Cid; + ACPI_PNP_DEVICE_ID *Hid; + ACPI_PNP_DEVICE_ID_LIST *Cid; UINT32 i; BOOLEAN Found; int NoMatch; @@ -726,7 +726,7 @@ AcpiNsGetDeviceCallback ( * DESCRIPTION: Performs a modified depth-first walk of the namespace tree, * starting (and ending) at the object specified by StartHandle. * The UserFunction is called whenever an object of type - * Device is found. If the user function returns + * Device is found. If the user function returns * a non-zero value, the search is terminated immediately and this * value is returned to the caller. * @@ -956,5 +956,3 @@ UnlockAndExit: } ACPI_EXPORT_SYMBOL (AcpiGetData) - - diff --git a/source/components/namespace/nsxfname.c b/source/components/namespace/nsxfname.c index 4690d09e90d5..1d5aeecb940b 100644 --- a/source/components/namespace/nsxfname.c +++ b/source/components/namespace/nsxfname.c @@ -58,8 +58,8 @@ static char * AcpiNsCopyDeviceId ( - ACPI_DEVICE_ID *Dest, - ACPI_DEVICE_ID *Source, + ACPI_PNP_DEVICE_ID *Dest, + ACPI_PNP_DEVICE_ID *Source, char *StringArea); @@ -75,8 +75,8 @@ AcpiNsCopyDeviceId ( * RETURN: Status * * DESCRIPTION: This routine will search for a caller specified name in the - * name space. The caller can restrict the search region by - * specifying a non NULL parent. The parent value is itself a + * name space. The caller can restrict the search region by + * specifying a non NULL parent. The parent value is itself a * namespace handle. * ******************************************************************************/ @@ -164,7 +164,7 @@ ACPI_EXPORT_SYMBOL (AcpiGetHandle) * RETURN: Pointer to a string containing the fully qualified Name. * * DESCRIPTION: This routine returns the fully qualified name associated with - * the Handle parameter. This and the AcpiPathnameToHandle are + * the Handle parameter. This and the AcpiPathnameToHandle are * complementary functions. * ******************************************************************************/ @@ -227,8 +227,7 @@ AcpiGetName ( /* Just copy the ACPI name from the Node and zero terminate it */ - ACPI_STRNCPY (Buffer->Pointer, AcpiUtGetNodeName (Node), - ACPI_NAME_SIZE); + ACPI_MOVE_NAME (Buffer->Pointer, AcpiUtGetNodeName (Node)); ((char *) Buffer->Pointer) [ACPI_NAME_SIZE] = 0; Status = AE_OK; @@ -246,23 +245,24 @@ ACPI_EXPORT_SYMBOL (AcpiGetName) * * FUNCTION: AcpiNsCopyDeviceId * - * PARAMETERS: Dest - Pointer to the destination DEVICE_ID - * Source - Pointer to the source DEVICE_ID + * PARAMETERS: Dest - Pointer to the destination PNP_DEVICE_ID + * Source - Pointer to the source PNP_DEVICE_ID * StringArea - Pointer to where to copy the dest string * * RETURN: Pointer to the next string area * - * DESCRIPTION: Copy a single DEVICE_ID, including the string data. + * DESCRIPTION: Copy a single PNP_DEVICE_ID, including the string data. * ******************************************************************************/ static char * AcpiNsCopyDeviceId ( - ACPI_DEVICE_ID *Dest, - ACPI_DEVICE_ID *Source, + ACPI_PNP_DEVICE_ID *Dest, + ACPI_PNP_DEVICE_ID *Source, char *StringArea) { - /* Create the destination DEVICE_ID */ + + /* Create the destination PNP_DEVICE_ID */ Dest->String = StringArea; Dest->Length = Source->Length; @@ -287,8 +287,8 @@ AcpiNsCopyDeviceId ( * namespace node and possibly by running several standard * control methods (Such as in the case of a device.) * - * For Device and Processor objects, run the Device _HID, _UID, _CID, _STA, - * _ADR, _SxW, and _SxD methods. + * For Device and Processor objects, run the Device _HID, _UID, _CID, _SUB, + * _STA, _ADR, _SxW, and _SxD methods. * * Note: Allocates the return buffer, must be freed by the caller. * @@ -301,9 +301,10 @@ AcpiGetObjectInfo ( { ACPI_NAMESPACE_NODE *Node; ACPI_DEVICE_INFO *Info; - ACPI_DEVICE_ID_LIST *CidList = NULL; - ACPI_DEVICE_ID *Hid = NULL; - ACPI_DEVICE_ID *Uid = NULL; + ACPI_PNP_DEVICE_ID_LIST *CidList = NULL; + ACPI_PNP_DEVICE_ID *Hid = NULL; + ACPI_PNP_DEVICE_ID *Uid = NULL; + ACPI_PNP_DEVICE_ID *Sub = NULL; char *NextIdString; ACPI_OBJECT_TYPE Type; ACPI_NAME Name; @@ -356,7 +357,7 @@ AcpiGetObjectInfo ( { /* * Get extra info for ACPI Device/Processor objects only: - * Run the Device _HID, _UID, and _CID methods. + * Run the Device _HID, _UID, _SUB, and _CID methods. * * Note: none of these methods are required, so they may or may * not be present for this device. The Info->Valid bitfield is used @@ -381,6 +382,15 @@ AcpiGetObjectInfo ( Valid |= ACPI_VALID_UID; } + /* Execute the Device._SUB method */ + + Status = AcpiUtExecute_SUB (Node, &Sub); + if (ACPI_SUCCESS (Status)) + { + InfoSize += Sub->Length; + Valid |= ACPI_VALID_SUB; + } + /* Execute the Device._CID method */ Status = AcpiUtExecute_CID (Node, &CidList); @@ -388,7 +398,7 @@ AcpiGetObjectInfo ( { /* Add size of CID strings and CID pointer array */ - InfoSize += (CidList->ListSize - sizeof (ACPI_DEVICE_ID_LIST)); + InfoSize += (CidList->ListSize - sizeof (ACPI_PNP_DEVICE_ID_LIST)); Valid |= ACPI_VALID_CID; } } @@ -463,14 +473,15 @@ AcpiGetObjectInfo ( NextIdString = ACPI_CAST_PTR (char, Info->CompatibleIdList.Ids); if (CidList) { - /* Point past the CID DEVICE_ID array */ + /* Point past the CID PNP_DEVICE_ID array */ - NextIdString += ((ACPI_SIZE) CidList->Count * sizeof (ACPI_DEVICE_ID)); + NextIdString += ((ACPI_SIZE) CidList->Count * sizeof (ACPI_PNP_DEVICE_ID)); } /* - * Copy the HID, UID, and CIDs to the return buffer. The variable-length - * strings are copied to the reserved area at the end of the buffer. + * Copy the HID, UID, SUB, and CIDs to the return buffer. + * The variable-length strings are copied to the reserved area + * at the end of the buffer. * * For HID and CID, check if the ID is a PCI Root Bridge. */ @@ -491,6 +502,12 @@ AcpiGetObjectInfo ( Uid, NextIdString); } + if (Sub) + { + NextIdString = AcpiNsCopyDeviceId (&Info->SubsystemId, + Sub, NextIdString); + } + if (CidList) { Info->CompatibleIdList.Count = CidList->Count; @@ -531,6 +548,10 @@ Cleanup: { ACPI_FREE (Uid); } + if (Sub) + { + ACPI_FREE (Sub); + } if (CidList) { ACPI_FREE (CidList); diff --git a/source/components/namespace/nsxfobj.c b/source/components/namespace/nsxfobj.c index 02f7777a3965..ea83271a1348 100644 --- a/source/components/namespace/nsxfobj.c +++ b/source/components/namespace/nsxfobj.c @@ -202,8 +202,8 @@ ACPI_EXPORT_SYMBOL (AcpiGetParent) * * RETURN: Status * - * DESCRIPTION: Return the next peer object within the namespace. If Handle is - * valid, Scope is ignored. Otherwise, the first object within + * DESCRIPTION: Return the next peer object within the namespace. If Handle is + * valid, Scope is ignored. Otherwise, the first object within * Scope is returned. * ******************************************************************************/ @@ -282,4 +282,3 @@ UnlockAndExit: } ACPI_EXPORT_SYMBOL (AcpiGetNextObject) - diff --git a/source/components/parser/psargs.c b/source/components/parser/psargs.c index 8140fdbb9d0e..74d0cc8eac1e 100644 --- a/source/components/parser/psargs.c +++ b/source/components/parser/psargs.c @@ -131,7 +131,7 @@ AcpiPsGetNextPackageLength ( * RETURN: Pointer to end-of-package +1 * * DESCRIPTION: Get next package length and return a pointer past the end of - * the package. Consumes the package length field + * the package. Consumes the package length field * ******************************************************************************/ @@ -163,8 +163,8 @@ AcpiPsGetNextPackageEnd ( * RETURN: Pointer to the start of the name string (pointer points into * the AML. * - * DESCRIPTION: Get next raw namestring within the AML stream. Handles all name - * prefix characters. Set parser state to point past the string. + * DESCRIPTION: Get next raw namestring within the AML stream. Handles all name + * prefix characters. Set parser state to point past the string. * (Name is consumed from the AML.) * ******************************************************************************/ @@ -244,7 +244,7 @@ AcpiPsGetNextNamestring ( * * DESCRIPTION: Get next name (if method call, return # of required args). * Names are looked up in the internal namespace to determine - * if the name represents a control method. If a method + * if the name represents a control method. If a method * is found, the number of arguments to the method is returned. * This information is critical for parsing to continue correctly. * diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c index d578c7e36b38..e63dd04e071f 100644 --- a/source/components/parser/psloop.c +++ b/source/components/parser/psloop.c @@ -153,17 +153,44 @@ AcpiPsGetAmlOpcode ( case AML_CLASS_UNKNOWN: - /* The opcode is unrecognized. Just skip unknown opcodes */ + /* The opcode is unrecognized. Complain and skip unknown opcodes */ - ACPI_ERROR ((AE_INFO, - "Found unknown opcode 0x%X at AML address %p offset 0x%X, ignoring", - WalkState->Opcode, WalkState->ParserState.Aml, WalkState->AmlOffset)); + if (WalkState->PassNumber == 2) + { + ACPI_ERROR ((AE_INFO, + "Unknown opcode 0x%.2X at table offset 0x%.4X, ignoring", + WalkState->Opcode, + (UINT32) (WalkState->AmlOffset + sizeof (ACPI_TABLE_HEADER)))); + + ACPI_DUMP_BUFFER (WalkState->ParserState.Aml - 16, 48); + +#ifdef ACPI_ASL_COMPILER + /* + * This is executed for the disassembler only. Output goes + * to the disassembled ASL output file. + */ + AcpiOsPrintf ( + "/*\nError: Unknown opcode 0x%.2X at table offset 0x%.4X, context:\n", + WalkState->Opcode, + (UINT32) (WalkState->AmlOffset + sizeof (ACPI_TABLE_HEADER))); + + /* Dump the context surrounding the invalid opcode */ - ACPI_DUMP_BUFFER (WalkState->ParserState.Aml, 128); + AcpiUtDumpBuffer (((UINT8 *) WalkState->ParserState.Aml - 16), + 48, DB_BYTE_DISPLAY, + WalkState->AmlOffset + sizeof (ACPI_TABLE_HEADER) - 16); + AcpiOsPrintf (" */\n"); +#endif + } - /* Assume one-byte bad opcode */ + /* Increment past one-byte or two-byte opcode */ WalkState->ParserState.Aml++; + if (WalkState->Opcode > 0xFF) /* Can only happen if first byte is 0x5B */ + { + WalkState->ParserState.Aml++; + } + return_ACPI_STATUS (AE_CTRL_PARSE_CONTINUE); default: @@ -551,8 +578,8 @@ AcpiPsGetArguments ( (!Arg)) { ACPI_WARNING ((AE_INFO, - "Detected an unsupported executable opcode " - "at module-level: [0x%.4X] at table offset 0x%.4X", + "Unsupported module-level executable opcode " + "0x%.2X at table offset 0x%.4X", Op->Common.AmlOpcode, (UINT32) (ACPI_PTR_DIFF (AmlOpStart, WalkState->ParserState.AmlStart) + @@ -1265,4 +1292,3 @@ AcpiPsParseLoop ( Status = AcpiPsCompleteFinalOp (WalkState, Op, Status); return_ACPI_STATUS (Status); } - diff --git a/source/components/parser/psopcode.c b/source/components/parser/psopcode.c index ef2257e86ff7..139c93466837 100644 --- a/source/components/parser/psopcode.c +++ b/source/components/parser/psopcode.c @@ -62,7 +62,7 @@ static const UINT8 AcpiGbl_ArgumentCount[] = {0,1,1,1,1,2,2,2,2,3,3,6}; * * DESCRIPTION: Opcode table. Each entry contains <opcode, type, name, operands> * The name is a simple ascii string, the operand specifier is an - * ascii string with one letter per operand. The letter specifies + * ascii string with one letter per operand. The letter specifies * the operand type. * ******************************************************************************/ @@ -187,7 +187,7 @@ static const UINT8 AcpiGbl_ArgumentCount[] = {0,1,1,1,1,2,2,2,2,3,3,6}; /* - * Master Opcode information table. A summary of everything we know about each + * Master Opcode information table. A summary of everything we know about each * opcode, all in one place. */ const ACPI_OPCODE_INFO AcpiGbl_AmlOpInfo[AML_NUM_OPCODES] = @@ -387,7 +387,7 @@ static const UINT8 AcpiGbl_ShortOpIndex[256] = /* * This table is indexed by the second opcode of the extended opcode - * pair. It returns an index into the opcode table (AcpiGbl_AmlOpInfo) + * pair. It returns an index into the opcode table (AcpiGbl_AmlOpInfo) */ static const UINT8 AcpiGbl_LongOpIndex[NUM_EXTENDED_OPCODE] = { diff --git a/source/components/parser/psparse.c b/source/components/parser/psparse.c index bcf46adfe566..b85dac7fb8de 100644 --- a/source/components/parser/psparse.c +++ b/source/components/parser/psparse.c @@ -44,9 +44,9 @@ /* * Parse the AML and build an operation tree as most interpreters, - * like Perl, do. Parsing is done by hand rather than with a YACC + * like Perl, do. Parsing is done by hand rather than with a YACC * generated parser to tightly constrain stack and dynamic memory - * usage. At the same time, parsing is kept flexible and the code + * usage. At the same time, parsing is kept flexible and the code * fairly compact by parsing based on a list of AML opcode * templates in AmlOpInfo[] */ @@ -196,7 +196,7 @@ AcpiPsCompleteThisOp ( case AML_CLASS_CREATE: /* - * These opcodes contain TermArg operands. The current + * These opcodes contain TermArg operands. The current * op must be replaced by a placeholder return op */ ReplacementOp = AcpiPsAllocOp (AML_INT_RETURN_VALUE_OP); @@ -209,7 +209,7 @@ AcpiPsCompleteThisOp ( case AML_CLASS_NAMED_OBJECT: /* - * These opcodes contain TermArg operands. The current + * These opcodes contain TermArg operands. The current * op must be replaced by a placeholder return op */ if ((Op->Common.Parent->Common.AmlOpcode == AML_REGION_OP) || @@ -394,7 +394,7 @@ AcpiPsNextParseState ( case AE_CTRL_FALSE: /* * Either an IF/WHILE Predicate was false or we encountered a BREAK - * opcode. In both cases, we do not execute the rest of the + * opcode. In both cases, we do not execute the rest of the * package; We simply close out the parent (finishing the walk of * this branch of the tree) and continue execution at the parent * level. @@ -508,7 +508,7 @@ AcpiPsParseAml ( AcpiGbl_CurrentWalkList = Thread; /* - * Execute the walk loop as long as there is a valid Walk State. This + * Execute the walk loop as long as there is a valid Walk State. This * handles nested control method invocations without recursion. */ ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "State=%p\n", WalkState)); @@ -707,5 +707,3 @@ AcpiPsParseAml ( AcpiGbl_CurrentWalkList = PrevWalkList; return_ACPI_STATUS (Status); } - - diff --git a/source/components/parser/psscope.c b/source/components/parser/psscope.c index 1df5a33af352..359f350abbfd 100644 --- a/source/components/parser/psscope.c +++ b/source/components/parser/psscope.c @@ -299,4 +299,3 @@ AcpiPsCleanupScope ( return_VOID; } - diff --git a/source/components/parser/pstree.c b/source/components/parser/pstree.c index 8271314e16ab..36771b76f773 100644 --- a/source/components/parser/pstree.c +++ b/source/components/parser/pstree.c @@ -356,5 +356,3 @@ AcpiPsGetChild ( return (Child); } #endif - - diff --git a/source/components/parser/psutils.c b/source/components/parser/psutils.c index e28b75cc8f23..c72173fba275 100644 --- a/source/components/parser/psutils.c +++ b/source/components/parser/psutils.c @@ -120,7 +120,7 @@ AcpiPsInitOp ( * RETURN: Pointer to the new Op, null on failure * * DESCRIPTION: Allocate an acpi_op, choose op type (and thus size) based on - * opcode. A cache of opcodes is available for the pure + * opcode. A cache of opcodes is available for the pure * GENERIC_OP, since this is by far the most commonly used. * ******************************************************************************/ @@ -189,7 +189,7 @@ AcpiPsAllocOp ( * * RETURN: None. * - * DESCRIPTION: Free an Op object. Either put it on the GENERIC_OP cache list + * DESCRIPTION: Free an Op object. Either put it on the GENERIC_OP cache list * or actually free it. * ******************************************************************************/ @@ -287,4 +287,3 @@ AcpiPsSetName ( Op->Named.Name = name; } - diff --git a/source/components/parser/psxface.c b/source/components/parser/psxface.c index a9ceb6d26d17..f8af99ee78b5 100644 --- a/source/components/parser/psxface.c +++ b/source/components/parser/psxface.c @@ -438,5 +438,3 @@ AcpiPsUpdateParameterList ( } } } - - diff --git a/source/components/resources/rsaddr.c b/source/components/resources/rsaddr.c index 90e7d43b6e01..14e59e341fbd 100644 --- a/source/components/resources/rsaddr.c +++ b/source/components/resources/rsaddr.c @@ -403,5 +403,3 @@ AcpiRsSetAddressCommon ( Aml->Address.SpecificFlags = Resource->Data.Address.Info.TypeSpecific; } } - - diff --git a/source/components/resources/rscalc.c b/source/components/resources/rscalc.c index 845ed69c7dee..12af85ea30ce 100644 --- a/source/components/resources/rscalc.c +++ b/source/components/resources/rscalc.c @@ -482,6 +482,16 @@ AcpiRsGetListLength ( * Get the number of vendor data bytes */ ExtraStructBytes = ResourceLength; + + /* + * There is already one byte included in the minimum + * descriptor size. If there are extra struct bytes, + * subtract one from the count. + */ + if (ExtraStructBytes) + { + ExtraStructBytes--; + } break; @@ -626,7 +636,7 @@ AcpiRsGetPciRoutingTableLength ( /* * Calculate the size of the return buffer. * The base size is the number of elements * the sizes of the - * structures. Additional space for the strings is added below. + * structures. Additional space for the strings is added below. * The minus one is to subtract the size of the UINT8 Source[1] * member because it is added below. * diff --git a/source/components/resources/rscreate.c b/source/components/resources/rscreate.c index dcfe7e436174..4c444cedd60d 100644 --- a/source/components/resources/rscreate.c +++ b/source/components/resources/rscreate.c @@ -531,4 +531,3 @@ AcpiRsCreateAmlResources ( OutputBuffer->Pointer, (UINT32) OutputBuffer->Length)); return_ACPI_STATUS (AE_OK); } - diff --git a/source/components/resources/rsdump.c b/source/components/resources/rsdump.c index 68564739eb5e..6e2013253e71 100644 --- a/source/components/resources/rsdump.c +++ b/source/components/resources/rsdump.c @@ -943,4 +943,3 @@ AcpiRsDumpWordList ( } #endif - diff --git a/source/components/resources/rsio.c b/source/components/resources/rsio.c index 065108cfa1f7..83046273e543 100644 --- a/source/components/resources/rsio.c +++ b/source/components/resources/rsio.c @@ -300,5 +300,3 @@ ACPI_RSCONVERT_INFO AcpiRsSetStartDpf[10] = {ACPI_RSC_LENGTH, 0, 0, sizeof (AML_RESOURCE_START_DEPENDENT_NOPRIO)} }; - - diff --git a/source/components/resources/rslist.c b/source/components/resources/rslist.c index 187d56cd42b2..c5aeb1b91797 100644 --- a/source/components/resources/rslist.c +++ b/source/components/resources/rslist.c @@ -125,7 +125,7 @@ AcpiRsConvertAmlToResources ( ACPI_ERROR ((AE_INFO, "Invalid/unsupported resource descriptor: Type 0x%2.2X", ResourceIndex)); - return (AE_AML_INVALID_RESOURCE_TYPE); + return_ACPI_STATUS (AE_AML_INVALID_RESOURCE_TYPE); } /* Convert the AML byte stream resource to a local resource struct */ @@ -225,7 +225,7 @@ AcpiRsConvertResourcesToAml ( ACPI_ERROR ((AE_INFO, "Invalid/unsupported resource descriptor: Type 0x%2.2X", Resource->Type)); - return (AE_AML_INVALID_RESOURCE_TYPE); + return_ACPI_STATUS (AE_AML_INVALID_RESOURCE_TYPE); } Status = AcpiRsConvertResourceToAml (Resource, @@ -272,4 +272,3 @@ AcpiRsConvertResourcesToAml ( return_ACPI_STATUS (AE_AML_NO_RESOURCE_END_TAG); } - diff --git a/source/components/resources/rsmemory.c b/source/components/resources/rsmemory.c index 83d131956ff7..b9452f25c42f 100644 --- a/source/components/resources/rsmemory.c +++ b/source/components/resources/rsmemory.c @@ -247,5 +247,3 @@ ACPI_RSCONVERT_INFO AcpiRsSetVendor[7] = sizeof (AML_RESOURCE_LARGE_HEADER), 0} }; - - diff --git a/source/components/resources/rsmisc.c b/source/components/resources/rsmisc.c index dfad696ca1d1..673492887d70 100644 --- a/source/components/resources/rsmisc.c +++ b/source/components/resources/rsmisc.c @@ -865,5 +865,3 @@ Exit: return_ACPI_STATUS (AE_BAD_DATA); } #endif - - diff --git a/source/components/resources/rsutils.c b/source/components/resources/rsutils.c index 273638f3f4fc..aeac5e70b0bd 100644 --- a/source/components/resources/rsutils.c +++ b/source/components/resources/rsutils.c @@ -858,4 +858,3 @@ Cleanup: ACPI_FREE (Info); return_ACPI_STATUS (Status); } - diff --git a/source/components/tables/tbfadt.c b/source/components/tables/tbfadt.c index 0bc6f28ece2b..f9a6d8e5881c 100644 --- a/source/components/tables/tbfadt.c +++ b/source/components/tables/tbfadt.c @@ -724,4 +724,3 @@ AcpiTbSetupFadtRegisters ( } } } - diff --git a/source/components/tables/tbfind.c b/source/components/tables/tbfind.c index d7e2440b32ac..ab3ec1a64ce1 100644 --- a/source/components/tables/tbfind.c +++ b/source/components/tables/tbfind.c @@ -86,7 +86,7 @@ AcpiTbFindTable ( /* Normalize the input strings */ ACPI_MEMSET (&Header, 0, sizeof (ACPI_TABLE_HEADER)); - ACPI_STRNCPY (Header.Signature, Signature, ACPI_NAME_SIZE); + ACPI_MOVE_NAME (Header.Signature, Signature); ACPI_STRNCPY (Header.OemId, OemId, ACPI_OEM_ID_SIZE); ACPI_STRNCPY (Header.OemTableId, OemTableId, ACPI_OEM_TABLE_ID_SIZE); diff --git a/source/components/tables/tbinstal.c b/source/components/tables/tbinstal.c index 06264404ce9d..5071fc645630 100644 --- a/source/components/tables/tbinstal.c +++ b/source/components/tables/tbinstal.c @@ -577,6 +577,8 @@ AcpiTbTerminate ( ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "ACPI Tables freed\n")); (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); + + return_VOID; } @@ -816,4 +818,3 @@ AcpiTbSetTableLoadedFlag ( (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); } - diff --git a/source/components/tables/tbutils.c b/source/components/tables/tbutils.c index c0a94562adc3..5dda467c582a 100644 --- a/source/components/tables/tbutils.c +++ b/source/components/tables/tbutils.c @@ -329,7 +329,7 @@ AcpiTbChecksum ( Sum = (UINT8) (Sum + *(Buffer++)); } - return Sum; + return (Sum); } diff --git a/source/components/tables/tbxface.c b/source/components/tables/tbxface.c index d2f31ea7b2c4..1224e31abc65 100644 --- a/source/components/tables/tbxface.c +++ b/source/components/tables/tbxface.c @@ -268,22 +268,23 @@ AcpiGetTableHeader ( sizeof (ACPI_TABLE_HEADER)); if (!Header) { - return AE_NO_MEMORY; + return (AE_NO_MEMORY); } - ACPI_MEMCPY (OutTableHeader, Header, sizeof(ACPI_TABLE_HEADER)); - AcpiOsUnmapMemory (Header, sizeof(ACPI_TABLE_HEADER)); + ACPI_MEMCPY (OutTableHeader, Header, + sizeof (ACPI_TABLE_HEADER)); + AcpiOsUnmapMemory (Header, sizeof (ACPI_TABLE_HEADER)); } else { - return AE_NOT_FOUND; + return (AE_NOT_FOUND); } } else { ACPI_MEMCPY (OutTableHeader, AcpiGbl_RootTableList.Tables[i].Pointer, - sizeof(ACPI_TABLE_HEADER)); + sizeof (ACPI_TABLE_HEADER)); } return (AE_OK); @@ -522,4 +523,3 @@ Cleanup: } ACPI_EXPORT_SYMBOL (AcpiRemoveTableHandler) - diff --git a/source/components/tables/tbxfload.c b/source/components/tables/tbxfload.c index 2883babc0e07..ecf87733b4a0 100644 --- a/source/components/tables/tbxfload.c +++ b/source/components/tables/tbxfload.c @@ -219,7 +219,7 @@ UnlockAndExit: * DESCRIPTION: Dynamically load an ACPI table from the caller's buffer. Must * be a valid ACPI table with a valid ACPI table header. * Note1: Mainly intended to support hotplug addition of SSDTs. - * Note2: Does not copy the incoming table. User is reponsible + * Note2: Does not copy the incoming table. User is responsible * to ensure that the table is not deleted or unmapped. * ******************************************************************************/ diff --git a/source/components/tables/tbxfroot.c b/source/components/tables/tbxfroot.c index 604f4d072e10..5124d366fa65 100644 --- a/source/components/tables/tbxfroot.c +++ b/source/components/tables/tbxfroot.c @@ -79,8 +79,6 @@ static ACPI_STATUS AcpiTbValidateRsdp ( ACPI_TABLE_RSDP *Rsdp) { - ACPI_FUNCTION_ENTRY (); - /* * The signature and checksum must both be correct @@ -124,7 +122,7 @@ AcpiTbValidateRsdp ( * RETURN: Status, RSDP physical address * * DESCRIPTION: Search lower 1Mbyte of memory for the root system descriptor - * pointer structure. If it is found, set *RSDP to point to it. + * pointer structure. If it is found, set *RSDP to point to it. * * NOTE1: The RSDP must be either in the first 1K of the Extended * BIOS Data Area or between E0000 and FFFFF (From ACPI Spec.) @@ -296,4 +294,3 @@ AcpiTbScanMemoryForRsdp ( StartAddress)); return_PTR (NULL); } - diff --git a/source/components/utilities/utalloc.c b/source/components/utilities/utalloc.c index d2eb11edcb6f..8c076b17875b 100644 --- a/source/components/utilities/utalloc.c +++ b/source/components/utilities/utalloc.c @@ -413,4 +413,3 @@ AcpiUtAllocateZeroed ( return (Allocation); } - diff --git a/source/components/utilities/utcache.c b/source/components/utilities/utcache.c index 7b3abe2894ca..44edbe5281fc 100644 --- a/source/components/utilities/utcache.c +++ b/source/components/utilities/utcache.c @@ -205,7 +205,7 @@ AcpiOsDeleteCache ( * * RETURN: None * - * DESCRIPTION: Release an object to the specified cache. If cache is full, + * DESCRIPTION: Release an object to the specified cache. If cache is full, * the object is deleted. * ******************************************************************************/ @@ -269,9 +269,9 @@ AcpiOsReleaseObject ( * * PARAMETERS: Cache - Handle to cache object * - * RETURN: the acquired object. NULL on error + * RETURN: the acquired object. NULL on error * - * DESCRIPTION: Get an object from the specified cache. If cache is empty, + * DESCRIPTION: Get an object from the specified cache. If cache is empty, * the object is allocated. * ******************************************************************************/ @@ -357,5 +357,3 @@ AcpiOsAcquireObject ( return (Object); } #endif /* ACPI_USE_LOCAL_CACHE */ - - diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c index d0153ec5d295..c3eeec23954e 100644 --- a/source/components/utilities/utclib.c +++ b/source/components/utilities/utclib.c @@ -49,7 +49,7 @@ /* * These implementations of standard C Library routines can optionally be - * used if a C library is not available. In general, they are less efficient + * used if a C library is not available. In general, they are less efficient * than an inline or assembly implementation */ @@ -745,134 +745,134 @@ AcpiUtToLower ( ******************************************************************************/ const UINT8 _acpi_ctype[257] = { - _ACPI_CN, /* 0x0 0. */ - _ACPI_CN, /* 0x1 1. */ - _ACPI_CN, /* 0x2 2. */ - _ACPI_CN, /* 0x3 3. */ - _ACPI_CN, /* 0x4 4. */ - _ACPI_CN, /* 0x5 5. */ - _ACPI_CN, /* 0x6 6. */ - _ACPI_CN, /* 0x7 7. */ - _ACPI_CN, /* 0x8 8. */ - _ACPI_CN|_ACPI_SP, /* 0x9 9. */ - _ACPI_CN|_ACPI_SP, /* 0xA 10. */ - _ACPI_CN|_ACPI_SP, /* 0xB 11. */ - _ACPI_CN|_ACPI_SP, /* 0xC 12. */ - _ACPI_CN|_ACPI_SP, /* 0xD 13. */ - _ACPI_CN, /* 0xE 14. */ - _ACPI_CN, /* 0xF 15. */ - _ACPI_CN, /* 0x10 16. */ - _ACPI_CN, /* 0x11 17. */ - _ACPI_CN, /* 0x12 18. */ - _ACPI_CN, /* 0x13 19. */ - _ACPI_CN, /* 0x14 20. */ - _ACPI_CN, /* 0x15 21. */ - _ACPI_CN, /* 0x16 22. */ - _ACPI_CN, /* 0x17 23. */ - _ACPI_CN, /* 0x18 24. */ - _ACPI_CN, /* 0x19 25. */ - _ACPI_CN, /* 0x1A 26. */ - _ACPI_CN, /* 0x1B 27. */ - _ACPI_CN, /* 0x1C 28. */ - _ACPI_CN, /* 0x1D 29. */ - _ACPI_CN, /* 0x1E 30. */ - _ACPI_CN, /* 0x1F 31. */ - _ACPI_XS|_ACPI_SP, /* 0x20 32. ' ' */ - _ACPI_PU, /* 0x21 33. '!' */ - _ACPI_PU, /* 0x22 34. '"' */ - _ACPI_PU, /* 0x23 35. '#' */ - _ACPI_PU, /* 0x24 36. '$' */ - _ACPI_PU, /* 0x25 37. '%' */ - _ACPI_PU, /* 0x26 38. '&' */ - _ACPI_PU, /* 0x27 39. ''' */ - _ACPI_PU, /* 0x28 40. '(' */ - _ACPI_PU, /* 0x29 41. ')' */ - _ACPI_PU, /* 0x2A 42. '*' */ - _ACPI_PU, /* 0x2B 43. '+' */ - _ACPI_PU, /* 0x2C 44. ',' */ - _ACPI_PU, /* 0x2D 45. '-' */ - _ACPI_PU, /* 0x2E 46. '.' */ - _ACPI_PU, /* 0x2F 47. '/' */ - _ACPI_XD|_ACPI_DI, /* 0x30 48. '0' */ - _ACPI_XD|_ACPI_DI, /* 0x31 49. '1' */ - _ACPI_XD|_ACPI_DI, /* 0x32 50. '2' */ - _ACPI_XD|_ACPI_DI, /* 0x33 51. '3' */ - _ACPI_XD|_ACPI_DI, /* 0x34 52. '4' */ - _ACPI_XD|_ACPI_DI, /* 0x35 53. '5' */ - _ACPI_XD|_ACPI_DI, /* 0x36 54. '6' */ - _ACPI_XD|_ACPI_DI, /* 0x37 55. '7' */ - _ACPI_XD|_ACPI_DI, /* 0x38 56. '8' */ - _ACPI_XD|_ACPI_DI, /* 0x39 57. '9' */ - _ACPI_PU, /* 0x3A 58. ':' */ - _ACPI_PU, /* 0x3B 59. ';' */ - _ACPI_PU, /* 0x3C 60. '<' */ - _ACPI_PU, /* 0x3D 61. '=' */ - _ACPI_PU, /* 0x3E 62. '>' */ - _ACPI_PU, /* 0x3F 63. '?' */ - _ACPI_PU, /* 0x40 64. '@' */ - _ACPI_XD|_ACPI_UP, /* 0x41 65. 'A' */ - _ACPI_XD|_ACPI_UP, /* 0x42 66. 'B' */ - _ACPI_XD|_ACPI_UP, /* 0x43 67. 'C' */ - _ACPI_XD|_ACPI_UP, /* 0x44 68. 'D' */ - _ACPI_XD|_ACPI_UP, /* 0x45 69. 'E' */ - _ACPI_XD|_ACPI_UP, /* 0x46 70. 'F' */ - _ACPI_UP, /* 0x47 71. 'G' */ - _ACPI_UP, /* 0x48 72. 'H' */ - _ACPI_UP, /* 0x49 73. 'I' */ - _ACPI_UP, /* 0x4A 74. 'J' */ - _ACPI_UP, /* 0x4B 75. 'K' */ - _ACPI_UP, /* 0x4C 76. 'L' */ - _ACPI_UP, /* 0x4D 77. 'M' */ - _ACPI_UP, /* 0x4E 78. 'N' */ - _ACPI_UP, /* 0x4F 79. 'O' */ - _ACPI_UP, /* 0x50 80. 'P' */ - _ACPI_UP, /* 0x51 81. 'Q' */ - _ACPI_UP, /* 0x52 82. 'R' */ - _ACPI_UP, /* 0x53 83. 'S' */ - _ACPI_UP, /* 0x54 84. 'T' */ - _ACPI_UP, /* 0x55 85. 'U' */ - _ACPI_UP, /* 0x56 86. 'V' */ - _ACPI_UP, /* 0x57 87. 'W' */ - _ACPI_UP, /* 0x58 88. 'X' */ - _ACPI_UP, /* 0x59 89. 'Y' */ - _ACPI_UP, /* 0x5A 90. 'Z' */ - _ACPI_PU, /* 0x5B 91. '[' */ - _ACPI_PU, /* 0x5C 92. '\' */ - _ACPI_PU, /* 0x5D 93. ']' */ - _ACPI_PU, /* 0x5E 94. '^' */ - _ACPI_PU, /* 0x5F 95. '_' */ - _ACPI_PU, /* 0x60 96. '`' */ - _ACPI_XD|_ACPI_LO, /* 0x61 97. 'a' */ - _ACPI_XD|_ACPI_LO, /* 0x62 98. 'b' */ - _ACPI_XD|_ACPI_LO, /* 0x63 99. 'c' */ - _ACPI_XD|_ACPI_LO, /* 0x64 100. 'd' */ - _ACPI_XD|_ACPI_LO, /* 0x65 101. 'e' */ - _ACPI_XD|_ACPI_LO, /* 0x66 102. 'f' */ - _ACPI_LO, /* 0x67 103. 'g' */ - _ACPI_LO, /* 0x68 104. 'h' */ - _ACPI_LO, /* 0x69 105. 'i' */ - _ACPI_LO, /* 0x6A 106. 'j' */ - _ACPI_LO, /* 0x6B 107. 'k' */ - _ACPI_LO, /* 0x6C 108. 'l' */ - _ACPI_LO, /* 0x6D 109. 'm' */ - _ACPI_LO, /* 0x6E 110. 'n' */ - _ACPI_LO, /* 0x6F 111. 'o' */ - _ACPI_LO, /* 0x70 112. 'p' */ - _ACPI_LO, /* 0x71 113. 'q' */ - _ACPI_LO, /* 0x72 114. 'r' */ - _ACPI_LO, /* 0x73 115. 's' */ - _ACPI_LO, /* 0x74 116. 't' */ - _ACPI_LO, /* 0x75 117. 'u' */ - _ACPI_LO, /* 0x76 118. 'v' */ - _ACPI_LO, /* 0x77 119. 'w' */ - _ACPI_LO, /* 0x78 120. 'x' */ - _ACPI_LO, /* 0x79 121. 'y' */ - _ACPI_LO, /* 0x7A 122. 'z' */ - _ACPI_PU, /* 0x7B 123. '{' */ - _ACPI_PU, /* 0x7C 124. '|' */ - _ACPI_PU, /* 0x7D 125. '}' */ - _ACPI_PU, /* 0x7E 126. '~' */ - _ACPI_CN, /* 0x7F 127. */ + _ACPI_CN, /* 0x00 0 NUL */ + _ACPI_CN, /* 0x01 1 SOH */ + _ACPI_CN, /* 0x02 2 STX */ + _ACPI_CN, /* 0x03 3 ETX */ + _ACPI_CN, /* 0x04 4 EOT */ + _ACPI_CN, /* 0x05 5 ENQ */ + _ACPI_CN, /* 0x06 6 ACK */ + _ACPI_CN, /* 0x07 7 BEL */ + _ACPI_CN, /* 0x08 8 BS */ + _ACPI_CN|_ACPI_SP, /* 0x09 9 TAB */ + _ACPI_CN|_ACPI_SP, /* 0x0A 10 LF */ + _ACPI_CN|_ACPI_SP, /* 0x0B 11 VT */ + _ACPI_CN|_ACPI_SP, /* 0x0C 12 FF */ + _ACPI_CN|_ACPI_SP, /* 0x0D 13 CR */ + _ACPI_CN, /* 0x0E 14 SO */ + _ACPI_CN, /* 0x0F 15 SI */ + _ACPI_CN, /* 0x10 16 DLE */ + _ACPI_CN, /* 0x11 17 DC1 */ + _ACPI_CN, /* 0x12 18 DC2 */ + _ACPI_CN, /* 0x13 19 DC3 */ + _ACPI_CN, /* 0x14 20 DC4 */ + _ACPI_CN, /* 0x15 21 NAK */ + _ACPI_CN, /* 0x16 22 SYN */ + _ACPI_CN, /* 0x17 23 ETB */ + _ACPI_CN, /* 0x18 24 CAN */ + _ACPI_CN, /* 0x19 25 EM */ + _ACPI_CN, /* 0x1A 26 SUB */ + _ACPI_CN, /* 0x1B 27 ESC */ + _ACPI_CN, /* 0x1C 28 FS */ + _ACPI_CN, /* 0x1D 29 GS */ + _ACPI_CN, /* 0x1E 30 RS */ + _ACPI_CN, /* 0x1F 31 US */ + _ACPI_XS|_ACPI_SP, /* 0x20 32 ' ' */ + _ACPI_PU, /* 0x21 33 '!' */ + _ACPI_PU, /* 0x22 34 '"' */ + _ACPI_PU, /* 0x23 35 '#' */ + _ACPI_PU, /* 0x24 36 '$' */ + _ACPI_PU, /* 0x25 37 '%' */ + _ACPI_PU, /* 0x26 38 '&' */ + _ACPI_PU, /* 0x27 39 ''' */ + _ACPI_PU, /* 0x28 40 '(' */ + _ACPI_PU, /* 0x29 41 ')' */ + _ACPI_PU, /* 0x2A 42 '*' */ + _ACPI_PU, /* 0x2B 43 '+' */ + _ACPI_PU, /* 0x2C 44 ',' */ + _ACPI_PU, /* 0x2D 45 '-' */ + _ACPI_PU, /* 0x2E 46 '.' */ + _ACPI_PU, /* 0x2F 47 '/' */ + _ACPI_XD|_ACPI_DI, /* 0x30 48 '0' */ + _ACPI_XD|_ACPI_DI, /* 0x31 49 '1' */ + _ACPI_XD|_ACPI_DI, /* 0x32 50 '2' */ + _ACPI_XD|_ACPI_DI, /* 0x33 51 '3' */ + _ACPI_XD|_ACPI_DI, /* 0x34 52 '4' */ + _ACPI_XD|_ACPI_DI, /* 0x35 53 '5' */ + _ACPI_XD|_ACPI_DI, /* 0x36 54 '6' */ + _ACPI_XD|_ACPI_DI, /* 0x37 55 '7' */ + _ACPI_XD|_ACPI_DI, /* 0x38 56 '8' */ + _ACPI_XD|_ACPI_DI, /* 0x39 57 '9' */ + _ACPI_PU, /* 0x3A 58 ':' */ + _ACPI_PU, /* 0x3B 59 ';' */ + _ACPI_PU, /* 0x3C 60 '<' */ + _ACPI_PU, /* 0x3D 61 '=' */ + _ACPI_PU, /* 0x3E 62 '>' */ + _ACPI_PU, /* 0x3F 63 '?' */ + _ACPI_PU, /* 0x40 64 '@' */ + _ACPI_XD|_ACPI_UP, /* 0x41 65 'A' */ + _ACPI_XD|_ACPI_UP, /* 0x42 66 'B' */ + _ACPI_XD|_ACPI_UP, /* 0x43 67 'C' */ + _ACPI_XD|_ACPI_UP, /* 0x44 68 'D' */ + _ACPI_XD|_ACPI_UP, /* 0x45 69 'E' */ + _ACPI_XD|_ACPI_UP, /* 0x46 70 'F' */ + _ACPI_UP, /* 0x47 71 'G' */ + _ACPI_UP, /* 0x48 72 'H' */ + _ACPI_UP, /* 0x49 73 'I' */ + _ACPI_UP, /* 0x4A 74 'J' */ + _ACPI_UP, /* 0x4B 75 'K' */ + _ACPI_UP, /* 0x4C 76 'L' */ + _ACPI_UP, /* 0x4D 77 'M' */ + _ACPI_UP, /* 0x4E 78 'N' */ + _ACPI_UP, /* 0x4F 79 'O' */ + _ACPI_UP, /* 0x50 80 'P' */ + _ACPI_UP, /* 0x51 81 'Q' */ + _ACPI_UP, /* 0x52 82 'R' */ + _ACPI_UP, /* 0x53 83 'S' */ + _ACPI_UP, /* 0x54 84 'T' */ + _ACPI_UP, /* 0x55 85 'U' */ + _ACPI_UP, /* 0x56 86 'V' */ + _ACPI_UP, /* 0x57 87 'W' */ + _ACPI_UP, /* 0x58 88 'X' */ + _ACPI_UP, /* 0x59 89 'Y' */ + _ACPI_UP, /* 0x5A 90 'Z' */ + _ACPI_PU, /* 0x5B 91 '[' */ + _ACPI_PU, /* 0x5C 92 '\' */ + _ACPI_PU, /* 0x5D 93 ']' */ + _ACPI_PU, /* 0x5E 94 '^' */ + _ACPI_PU, /* 0x5F 95 '_' */ + _ACPI_PU, /* 0x60 96 '`' */ + _ACPI_XD|_ACPI_LO, /* 0x61 97 'a' */ + _ACPI_XD|_ACPI_LO, /* 0x62 98 'b' */ + _ACPI_XD|_ACPI_LO, /* 0x63 99 'c' */ + _ACPI_XD|_ACPI_LO, /* 0x64 100 'd' */ + _ACPI_XD|_ACPI_LO, /* 0x65 101 'e' */ + _ACPI_XD|_ACPI_LO, /* 0x66 102 'f' */ + _ACPI_LO, /* 0x67 103 'g' */ + _ACPI_LO, /* 0x68 104 'h' */ + _ACPI_LO, /* 0x69 105 'i' */ + _ACPI_LO, /* 0x6A 106 'j' */ + _ACPI_LO, /* 0x6B 107 'k' */ + _ACPI_LO, /* 0x6C 108 'l' */ + _ACPI_LO, /* 0x6D 109 'm' */ + _ACPI_LO, /* 0x6E 110 'n' */ + _ACPI_LO, /* 0x6F 111 'o' */ + _ACPI_LO, /* 0x70 112 'p' */ + _ACPI_LO, /* 0x71 113 'q' */ + _ACPI_LO, /* 0x72 114 'r' */ + _ACPI_LO, /* 0x73 115 's' */ + _ACPI_LO, /* 0x74 116 't' */ + _ACPI_LO, /* 0x75 117 'u' */ + _ACPI_LO, /* 0x76 118 'v' */ + _ACPI_LO, /* 0x77 119 'w' */ + _ACPI_LO, /* 0x78 120 'x' */ + _ACPI_LO, /* 0x79 121 'y' */ + _ACPI_LO, /* 0x7A 122 'z' */ + _ACPI_PU, /* 0x7B 123 '{' */ + _ACPI_PU, /* 0x7C 124 '|' */ + _ACPI_PU, /* 0x7D 125 '}' */ + _ACPI_PU, /* 0x7E 126 '~' */ + _ACPI_CN, /* 0x7F 127 DEL */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x80 to 0x8F */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x90 to 0x9F */ @@ -881,9 +881,9 @@ const UINT8 _acpi_ctype[257] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xC0 to 0xCF */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xD0 to 0xDF */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xE0 to 0xEF */ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* 0xF0 to 0x100 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xF0 to 0xFF */ + 0 /* 0x100 */ }; #endif /* ACPI_USE_SYSTEM_CLIBRARY */ - diff --git a/source/components/utilities/utcopy.c b/source/components/utilities/utcopy.c index ab04a7a7aac8..e6437c9b4179 100644 --- a/source/components/utilities/utcopy.c +++ b/source/components/utilities/utcopy.c @@ -1074,5 +1074,3 @@ AcpiUtCopyIobjectToIobject ( return_ACPI_STATUS (Status); } - - diff --git a/source/components/utilities/utdebug.c b/source/components/utilities/utdebug.c index 051d47b4430a..ea38e98bd4fb 100644 --- a/source/components/utilities/utdebug.c +++ b/source/components/utilities/utdebug.c @@ -250,7 +250,7 @@ ACPI_EXPORT_SYMBOL (AcpiDebugPrint) * * RETURN: None * - * DESCRIPTION: Print message with no headers. Has same interface as + * DESCRIPTION: Print message with no headers. Has same interface as * DebugPrint so that the same macros can be used. * ******************************************************************************/ @@ -293,7 +293,7 @@ ACPI_EXPORT_SYMBOL (AcpiDebugPrintRaw) * * RETURN: None * - * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is + * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is * set in DebugLevel * ******************************************************************************/ @@ -329,7 +329,7 @@ ACPI_EXPORT_SYMBOL (AcpiUtTrace) * * RETURN: None * - * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is + * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is * set in DebugLevel * ******************************************************************************/ @@ -342,6 +342,7 @@ AcpiUtTracePtr ( UINT32 ComponentId, void *Pointer) { + AcpiGbl_NestingLevel++; AcpiUtTrackStackPtr (); @@ -363,7 +364,7 @@ AcpiUtTracePtr ( * * RETURN: None * - * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is + * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is * set in DebugLevel * ******************************************************************************/ @@ -398,7 +399,7 @@ AcpiUtTraceStr ( * * RETURN: None * - * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is + * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is * set in DebugLevel * ******************************************************************************/ @@ -432,7 +433,7 @@ AcpiUtTraceU32 ( * * RETURN: None * - * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is + * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is * set in DebugLevel * ******************************************************************************/ @@ -467,8 +468,8 @@ ACPI_EXPORT_SYMBOL (AcpiUtExit) * * RETURN: None * - * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is - * set in DebugLevel. Prints exit status also. + * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is + * set in DebugLevel. Prints exit status also. * ******************************************************************************/ @@ -514,8 +515,8 @@ ACPI_EXPORT_SYMBOL (AcpiUtStatusExit) * * RETURN: None * - * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is - * set in DebugLevel. Prints exit value also. + * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is + * set in DebugLevel. Prints exit value also. * ******************************************************************************/ @@ -551,8 +552,8 @@ ACPI_EXPORT_SYMBOL (AcpiUtValueExit) * * RETURN: None * - * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is - * set in DebugLevel. Prints exit value also. + * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is + * set in DebugLevel. Prints exit value also. * ******************************************************************************/ @@ -582,7 +583,7 @@ AcpiUtPtrExit ( * PARAMETERS: Buffer - Buffer to dump * Count - Amount to dump, in bytes * Display - BYTE, WORD, DWORD, or QWORD display - * ComponentID - Caller's component ID + * Offset - Beginning buffer offset (display only) * * RETURN: None * @@ -591,10 +592,11 @@ AcpiUtPtrExit ( ******************************************************************************/ void -AcpiUtDumpBuffer2 ( +AcpiUtDumpBuffer ( UINT8 *Buffer, UINT32 Count, - UINT32 Display) + UINT32 Display, + UINT32 BaseOffset) { UINT32 i = 0; UINT32 j; @@ -619,7 +621,7 @@ AcpiUtDumpBuffer2 ( { /* Print current offset */ - AcpiOsPrintf ("%6.4X: ", i); + AcpiOsPrintf ("%6.4X: ", (BaseOffset + i)); /* Print 16 hex chars */ @@ -706,7 +708,7 @@ AcpiUtDumpBuffer2 ( /******************************************************************************* * - * FUNCTION: AcpiUtDumpBuffer + * FUNCTION: AcpiUtDebugDumpBuffer * * PARAMETERS: Buffer - Buffer to dump * Count - Amount to dump, in bytes @@ -720,7 +722,7 @@ AcpiUtDumpBuffer2 ( ******************************************************************************/ void -AcpiUtDumpBuffer ( +AcpiUtDebugDumpBuffer ( UINT8 *Buffer, UINT32 Count, UINT32 Display, @@ -735,7 +737,5 @@ AcpiUtDumpBuffer ( return; } - AcpiUtDumpBuffer2 (Buffer, Count, Display); + AcpiUtDumpBuffer (Buffer, Count, Display, 0); } - - diff --git a/source/components/utilities/utdelete.c b/source/components/utilities/utdelete.c index fb3261112107..4ed629762768 100644 --- a/source/components/utilities/utdelete.c +++ b/source/components/utilities/utdelete.c @@ -773,5 +773,3 @@ AcpiUtRemoveReference ( (void) AcpiUtUpdateObjectReference (Object, REF_DECREMENT); return_VOID; } - - diff --git a/source/components/utilities/utids.c b/source/components/utilities/utids.c index 226d8c1631b6..86aea0493562 100644 --- a/source/components/utilities/utids.c +++ b/source/components/utilities/utids.c @@ -73,10 +73,10 @@ ACPI_STATUS AcpiUtExecute_HID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID **ReturnId) + ACPI_PNP_DEVICE_ID **ReturnId) { ACPI_OPERAND_OBJECT *ObjDesc; - ACPI_DEVICE_ID *Hid; + ACPI_PNP_DEVICE_ID *Hid; UINT32 Length; ACPI_STATUS Status; @@ -104,16 +104,16 @@ AcpiUtExecute_HID ( /* Allocate a buffer for the HID */ - Hid = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_DEVICE_ID) + (ACPI_SIZE) Length); + Hid = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_PNP_DEVICE_ID) + (ACPI_SIZE) Length); if (!Hid) { Status = AE_NO_MEMORY; goto Cleanup; } - /* Area for the string starts after DEVICE_ID struct */ + /* Area for the string starts after PNP_DEVICE_ID struct */ - Hid->String = ACPI_ADD_PTR (char, Hid, sizeof (ACPI_DEVICE_ID)); + Hid->String = ACPI_ADD_PTR (char, Hid, sizeof (ACPI_PNP_DEVICE_ID)); /* Convert EISAID to a string or simply copy existing string */ @@ -141,6 +141,77 @@ Cleanup: /******************************************************************************* * + * FUNCTION: AcpiUtExecute_SUB + * + * PARAMETERS: DeviceNode - Node for the device + * ReturnId - Where the _SUB is returned + * + * RETURN: Status + * + * DESCRIPTION: Executes the _SUB control method that returns the subsystem + * ID of the device. The _SUB value is always a string containing + * either a valid PNP or ACPI ID. + * + * NOTE: Internal function, no parameter validation + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUtExecute_SUB ( + ACPI_NAMESPACE_NODE *DeviceNode, + ACPI_PNP_DEVICE_ID **ReturnId) +{ + ACPI_OPERAND_OBJECT *ObjDesc; + ACPI_PNP_DEVICE_ID *Sub; + UINT32 Length; + ACPI_STATUS Status; + + + ACPI_FUNCTION_TRACE (UtExecute_SUB); + + + Status = AcpiUtEvaluateObject (DeviceNode, METHOD_NAME__SUB, + ACPI_BTYPE_STRING, &ObjDesc); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + + /* Get the size of the String to be returned, includes null terminator */ + + Length = ObjDesc->String.Length + 1; + + /* Allocate a buffer for the SUB */ + + Sub = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_PNP_DEVICE_ID) + (ACPI_SIZE) Length); + if (!Sub) + { + Status = AE_NO_MEMORY; + goto Cleanup; + } + + /* Area for the string starts after PNP_DEVICE_ID struct */ + + Sub->String = ACPI_ADD_PTR (char, Sub, sizeof (ACPI_PNP_DEVICE_ID)); + + /* Simply copy existing string */ + + ACPI_STRCPY (Sub->String, ObjDesc->String.Pointer); + Sub->Length = Length; + *ReturnId = Sub; + + +Cleanup: + + /* On exit, we must delete the return object */ + + AcpiUtRemoveReference (ObjDesc); + return_ACPI_STATUS (Status); +} + + +/******************************************************************************* + * * FUNCTION: AcpiUtExecute_UID * * PARAMETERS: DeviceNode - Node for the device @@ -160,10 +231,10 @@ Cleanup: ACPI_STATUS AcpiUtExecute_UID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID **ReturnId) + ACPI_PNP_DEVICE_ID **ReturnId) { ACPI_OPERAND_OBJECT *ObjDesc; - ACPI_DEVICE_ID *Uid; + ACPI_PNP_DEVICE_ID *Uid; UINT32 Length; ACPI_STATUS Status; @@ -191,16 +262,16 @@ AcpiUtExecute_UID ( /* Allocate a buffer for the UID */ - Uid = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_DEVICE_ID) + (ACPI_SIZE) Length); + Uid = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_PNP_DEVICE_ID) + (ACPI_SIZE) Length); if (!Uid) { Status = AE_NO_MEMORY; goto Cleanup; } - /* Area for the string starts after DEVICE_ID struct */ + /* Area for the string starts after PNP_DEVICE_ID struct */ - Uid->String = ACPI_ADD_PTR (char, Uid, sizeof (ACPI_DEVICE_ID)); + Uid->String = ACPI_ADD_PTR (char, Uid, sizeof (ACPI_PNP_DEVICE_ID)); /* Convert an Integer to string, or just copy an existing string */ @@ -252,11 +323,11 @@ Cleanup: ACPI_STATUS AcpiUtExecute_CID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID_LIST **ReturnCidList) + ACPI_PNP_DEVICE_ID_LIST **ReturnCidList) { ACPI_OPERAND_OBJECT **CidObjects; ACPI_OPERAND_OBJECT *ObjDesc; - ACPI_DEVICE_ID_LIST *CidList; + ACPI_PNP_DEVICE_ID_LIST *CidList; char *NextIdString; UINT32 StringAreaSize; UINT32 Length; @@ -320,11 +391,11 @@ AcpiUtExecute_CID ( /* * Now that we know the length of the CIDs, allocate return buffer: * 1) Size of the base structure + - * 2) Size of the CID DEVICE_ID array + + * 2) Size of the CID PNP_DEVICE_ID array + * 3) Size of the actual CID strings */ - CidListSize = sizeof (ACPI_DEVICE_ID_LIST) + - ((Count - 1) * sizeof (ACPI_DEVICE_ID)) + + CidListSize = sizeof (ACPI_PNP_DEVICE_ID_LIST) + + ((Count - 1) * sizeof (ACPI_PNP_DEVICE_ID)) + StringAreaSize; CidList = ACPI_ALLOCATE_ZEROED (CidListSize); @@ -334,10 +405,10 @@ AcpiUtExecute_CID ( goto Cleanup; } - /* Area for CID strings starts after the CID DEVICE_ID array */ + /* Area for CID strings starts after the CID PNP_DEVICE_ID array */ NextIdString = ACPI_CAST_PTR (char, CidList->Ids) + - ((ACPI_SIZE) Count * sizeof (ACPI_DEVICE_ID)); + ((ACPI_SIZE) Count * sizeof (ACPI_PNP_DEVICE_ID)); /* Copy/convert the CIDs to the return buffer */ @@ -377,4 +448,3 @@ Cleanup: AcpiUtRemoveReference (ObjDesc); return_ACPI_STATUS (Status); } - diff --git a/source/components/utilities/utinit.c b/source/components/utilities/utinit.c index 6831595e686b..861b00c2f627 100644 --- a/source/components/utilities/utinit.c +++ b/source/components/utilities/utinit.c @@ -188,5 +188,3 @@ AcpiUtSubsystemShutdown ( (void) AcpiUtDeleteCaches (); return_VOID; } - - diff --git a/source/components/utilities/utlock.c b/source/components/utilities/utlock.c index 61585ad499cd..1e4648e1b2bb 100644 --- a/source/components/utilities/utlock.c +++ b/source/components/utilities/utlock.c @@ -202,4 +202,3 @@ AcpiUtReleaseWriteLock ( AcpiOsReleaseMutex (Lock->WriterMutex); } - diff --git a/source/components/utilities/utmath.c b/source/components/utilities/utmath.c index d0fad7cb6cab..bbb2ffccd1be 100644 --- a/source/components/utilities/utmath.c +++ b/source/components/utilities/utmath.c @@ -90,7 +90,7 @@ typedef union uint64_overlay * RETURN: Status (Checks for divide-by-zero) * * DESCRIPTION: Perform a short (maximum 64 bits divided by 32 bits) - * divide and modulo. The result is a 64-bit quotient and a + * divide and modulo. The result is a 64-bit quotient and a * 32-bit remainder. * ******************************************************************************/ @@ -375,5 +375,3 @@ AcpiUtDivide ( } #endif - - diff --git a/source/components/utilities/utmisc.c b/source/components/utilities/utmisc.c index a92121ffa733..c0c1f2063629 100644 --- a/source/components/utilities/utmisc.c +++ b/source/components/utilities/utmisc.c @@ -281,7 +281,7 @@ Exit: * control method or unloading a table. Either way, we would * ignore any error anyway. * - * DESCRIPTION: Release a table or method owner ID. Valid IDs are 1 - 255 + * DESCRIPTION: Release a table or method owner ID. Valid IDs are 1 - 255 * ******************************************************************************/ @@ -612,8 +612,8 @@ AcpiUtDwordByteSwap ( * RETURN: None * * DESCRIPTION: Set the global integer bit width based upon the revision - * of the DSDT. For Revision 1 and 0, Integers are 32 bits. - * For Revision 2 and above, Integers are 64 bits. Yes, this + * of the DSDT. For Revision 1 and 0, Integers are 32 bits. + * For Revision 2 and above, Integers are 64 bits. Yes, this * makes a difference. * ******************************************************************************/ @@ -768,7 +768,7 @@ AcpiUtValidAcpiChar ( * * RETURN: TRUE if the name is valid, FALSE otherwise * - * DESCRIPTION: Check for a valid ACPI name. Each character must be one of: + * DESCRIPTION: Check for a valid ACPI name. Each character must be one of: * 1) Upper case alpha * 2) numeric * 3) underscore @@ -825,11 +825,14 @@ AcpiUtRepairName ( { UINT32 i; BOOLEAN FoundBadChar = FALSE; + UINT32 OriginalName; ACPI_FUNCTION_NAME (UtRepairName); + ACPI_MOVE_NAME (&OriginalName, Name); + /* Check each character in the name */ for (i = 0; i < ACPI_NAME_SIZE; i++) @@ -855,12 +858,14 @@ AcpiUtRepairName ( if (!AcpiGbl_EnableInterpreterSlack) { ACPI_WARNING ((AE_INFO, - "Found bad character(s) in name, repaired: [%4.4s]\n", Name)); + "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]", + OriginalName, Name)); } else { ACPI_DEBUG_PRINT ((ACPI_DB_INFO, - "Found bad character(s) in name, repaired: [%4.4s]\n", Name)); + "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]", + OriginalName, Name)); } } } @@ -1167,10 +1172,10 @@ AcpiUtWalkPackageTree ( /* * Check for: - * 1) An uninitialized package element. It is completely + * 1) An uninitialized package element. It is completely * legal to declare a package and leave it uninitialized * 2) Not an internal object - can be a namespace node instead - * 3) Any type other than a package. Packages are handled in else + * 3) Any type other than a package. Packages are handled in else * case below. */ if ((!ThisSourceObj) || @@ -1189,7 +1194,7 @@ AcpiUtWalkPackageTree ( { /* * We've handled all of the objects at this level, This means - * that we have just completed a package. That package may + * that we have just completed a package. That package may * have contained one or more packages itself. * * Delete this state and pop the previous state (package). diff --git a/source/components/utilities/utmutex.c b/source/components/utilities/utmutex.c index f1cdb0180442..3ea056d7fc3d 100644 --- a/source/components/utilities/utmutex.c +++ b/source/components/utilities/utmutex.c @@ -225,6 +225,8 @@ AcpiUtDeleteMutex ( AcpiGbl_MutexInfo[MutexId].Mutex = NULL; AcpiGbl_MutexInfo[MutexId].ThreadId = ACPI_MUTEX_NOT_ACQUIRED; + + return_VOID; } @@ -264,9 +266,9 @@ AcpiUtAcquireMutex ( /* * Mutex debug code, for internal debugging only. * - * Deadlock prevention. Check if this thread owns any mutexes of value - * greater than or equal to this one. If so, the thread has violated - * the mutex ordering rule. This indicates a coding error somewhere in + * Deadlock prevention. Check if this thread owns any mutexes of value + * greater than or equal to this one. If so, the thread has violated + * the mutex ordering rule. This indicates a coding error somewhere in * the ACPI subsystem code. */ for (i = MutexId; i < ACPI_NUM_MUTEX; i++) @@ -337,6 +339,7 @@ AcpiUtReleaseMutex ( { ACPI_FUNCTION_NAME (UtReleaseMutex); + ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Thread %u releasing Mutex [%s]\n", (UINT32) AcpiOsGetThreadId (), AcpiUtGetMutexName (MutexId))); @@ -362,9 +365,9 @@ AcpiUtReleaseMutex ( /* * Mutex debug code, for internal debugging only. * - * Deadlock prevention. Check if this thread owns any mutexes of value - * greater than this one. If so, the thread has violated the mutex - * ordering rule. This indicates a coding error somewhere in + * Deadlock prevention. Check if this thread owns any mutexes of value + * greater than this one. If so, the thread has violated the mutex + * ordering rule. This indicates a coding error somewhere in * the ACPI subsystem code. */ for (i = MutexId; i < ACPI_NUM_MUTEX; i++) @@ -393,5 +396,3 @@ AcpiUtReleaseMutex ( AcpiOsReleaseMutex (AcpiGbl_MutexInfo[MutexId].Mutex); return (AE_OK); } - - diff --git a/source/components/utilities/utobject.c b/source/components/utilities/utobject.c index 03fa9dc1cf0e..2841541d44fe 100644 --- a/source/components/utilities/utobject.c +++ b/source/components/utilities/utobject.c @@ -86,7 +86,7 @@ AcpiUtGetElementLength ( * * NOTE: We always allocate the worst-case object descriptor because * these objects are cached, and we want them to be - * one-size-satisifies-any-request. This in itself may not be + * one-size-satisifies-any-request. This in itself may not be * the most memory efficient, but the efficiency of the object * cache should more than make up for this! * @@ -415,9 +415,9 @@ AcpiUtValidInternalObject ( * LineNumber - Caller's line number (for error output) * ComponentId - Caller's component ID (for error output) * - * RETURN: Pointer to newly allocated object descriptor. Null on error + * RETURN: Pointer to newly allocated object descriptor. Null on error * - * DESCRIPTION: Allocate a new object descriptor. Gracefully handle + * DESCRIPTION: Allocate a new object descriptor. Gracefully handle * error conditions. * ******************************************************************************/ @@ -620,7 +620,7 @@ AcpiUtGetSimpleObjectSize ( /* * Account for the space required by the object rounded up to the next - * multiple of the machine word size. This keeps each object aligned + * multiple of the machine word size. This keeps each object aligned * on a machine word boundary. (preventing alignment faults on some * machines.) */ @@ -783,5 +783,3 @@ AcpiUtGetObjectSize ( return (Status); } - - diff --git a/source/components/utilities/utresrc.c b/source/components/utilities/utresrc.c index 9855af5708a3..a1a6c5bfbcc3 100644 --- a/source/components/utilities/utresrc.c +++ b/source/components/utilities/utresrc.c @@ -919,5 +919,3 @@ AcpiUtGetResourceEndTag ( return_ACPI_STATUS (Status); } - - diff --git a/source/components/utilities/utstate.c b/source/components/utilities/utstate.c index 62a1aefec7d4..f144bca2fde4 100644 --- a/source/components/utilities/utstate.c +++ b/source/components/utilities/utstate.c @@ -163,7 +163,7 @@ AcpiUtPopGenericState ( * * RETURN: The new state object. NULL on failure. * - * DESCRIPTION: Create a generic state object. Attempt to obtain one from + * DESCRIPTION: Create a generic state object. Attempt to obtain one from * the global state cache; If none available, create a new one. * ******************************************************************************/ @@ -394,5 +394,3 @@ AcpiUtDeleteGenericState ( } return_VOID; } - - diff --git a/source/components/utilities/uttrack.c b/source/components/utilities/uttrack.c index 7d58f5c8a824..2e37aebba1e2 100644 --- a/source/components/utilities/uttrack.c +++ b/source/components/utilities/uttrack.c @@ -45,9 +45,9 @@ * These procedures are used for tracking memory leaks in the subsystem, and * they get compiled out when the ACPI_DBG_TRACK_ALLOCATIONS is not set. * - * Each memory allocation is tracked via a doubly linked list. Each + * Each memory allocation is tracked via a doubly linked list. Each * element contains the caller's component, module name, function name, and - * line number. AcpiUtAllocate and AcpiUtAllocateZeroed call + * line number. AcpiUtAllocate and AcpiUtAllocateZeroed call * AcpiUtTrackAllocation to add an element to the list; deletion * occurs in the body of AcpiUtFree. */ @@ -62,11 +62,12 @@ #define _COMPONENT ACPI_UTILITIES ACPI_MODULE_NAME ("uttrack") + /* Local prototypes */ static ACPI_DEBUG_MEM_BLOCK * AcpiUtFindAllocation ( - void *Allocation); + ACPI_DEBUG_MEM_BLOCK *Allocation); static ACPI_STATUS AcpiUtTrackAllocation ( @@ -296,29 +297,52 @@ AcpiUtFreeAndTrack ( * * PARAMETERS: Allocation - Address of allocated memory * - * RETURN: A list element if found; NULL otherwise. + * RETURN: Three cases: + * 1) List is empty, NULL is returned. + * 2) Element was found. Returns Allocation parameter. + * 3) Element was not found. Returns position where it should be + * inserted into the list. * * DESCRIPTION: Searches for an element in the global allocation tracking list. + * If the element is not found, returns the location within the + * list where the element should be inserted. + * + * Note: The list is ordered by larger-to-smaller addresses. + * + * This global list is used to detect memory leaks in ACPICA as + * well as other issues such as an attempt to release the same + * internal object more than once. Although expensive as far + * as cpu time, this list is much more helpful for finding these + * types of issues than using memory leak detectors outside of + * the ACPICA code. * ******************************************************************************/ static ACPI_DEBUG_MEM_BLOCK * AcpiUtFindAllocation ( - void *Allocation) + ACPI_DEBUG_MEM_BLOCK *Allocation) { ACPI_DEBUG_MEM_BLOCK *Element; - ACPI_FUNCTION_ENTRY (); - - Element = AcpiGbl_GlobalList->ListHead; + if (!Element) + { + return (NULL); + } - /* Search for the address. */ - - while (Element) + /* + * Search for the address. + * + * Note: List is ordered by larger-to-smaller addresses, on the + * assumption that a new allocation usually has a larger address + * than previous allocations. + */ + while (Element > Allocation) { - if (Element == Allocation) + /* Check for end-of-list */ + + if (!Element->Next) { return (Element); } @@ -326,7 +350,12 @@ AcpiUtFindAllocation ( Element = Element->Next; } - return (NULL); + if (Element == Allocation) + { + return (Element); + } + + return (Element->Previous); } @@ -341,7 +370,7 @@ AcpiUtFindAllocation ( * Module - Source file name of caller * Line - Line number of caller * - * RETURN: None. + * RETURN: Status * * DESCRIPTION: Inserts an element into the global allocation tracking list. * @@ -377,23 +406,19 @@ AcpiUtTrackAllocation ( } /* - * Search list for this address to make sure it is not already on the list. - * This will catch several kinds of problems. + * Search the global list for this address to make sure it is not + * already present. This will catch several kinds of problems. */ Element = AcpiUtFindAllocation (Allocation); - if (Element) + if (Element == Allocation) { ACPI_ERROR ((AE_INFO, - "UtTrackAllocation: Allocation already present in list! (%p)", + "UtTrackAllocation: Allocation (%p) already present in global list!", Allocation)); - - ACPI_ERROR ((AE_INFO, "Element %p Address %p", - Element, Allocation)); - goto UnlockAndExit; } - /* Fill in the instance data. */ + /* Fill in the instance data */ Allocation->Size = (UINT32) Size; Allocation->AllocType = AllocType; @@ -403,17 +428,34 @@ AcpiUtTrackAllocation ( ACPI_STRNCPY (Allocation->Module, Module, ACPI_MAX_MODULE_NAME); Allocation->Module[ACPI_MAX_MODULE_NAME-1] = 0; - /* Insert at list head */ - - if (MemList->ListHead) + if (!Element) { - ((ACPI_DEBUG_MEM_BLOCK *)(MemList->ListHead))->Previous = Allocation; + /* Insert at list head */ + + if (MemList->ListHead) + { + ((ACPI_DEBUG_MEM_BLOCK *)(MemList->ListHead))->Previous = Allocation; + } + + Allocation->Next = MemList->ListHead; + Allocation->Previous = NULL; + + MemList->ListHead = Allocation; } + else + { + /* Insert after element */ - Allocation->Next = MemList->ListHead; - Allocation->Previous = NULL; + Allocation->Next = Element->Next; + Allocation->Previous = Element; - MemList->ListHead = Allocation; + if (Element->Next) + { + (Element->Next)->Previous = Allocation; + } + + Element->Next = Allocation; + } UnlockAndExit: @@ -431,7 +473,7 @@ UnlockAndExit: * Module - Source file name of caller * Line - Line number of caller * - * RETURN: + * RETURN: Status * * DESCRIPTION: Deletes an element from the global allocation tracking list. * @@ -505,7 +547,7 @@ AcpiUtRemoveAllocation ( * * FUNCTION: AcpiUtDumpAllocationInfo * - * PARAMETERS: + * PARAMETERS: None * * RETURN: None * @@ -566,7 +608,7 @@ AcpiUtDumpAllocationInfo ( * FUNCTION: AcpiUtDumpAllocations * * PARAMETERS: Component - Component(s) to dump info for. - * Module - Module to dump info for. NULL means all. + * Module - Module to dump info for. NULL means all. * * RETURN: None * @@ -590,7 +632,7 @@ AcpiUtDumpAllocations ( if (AcpiGbl_DisableMemTracking) { - return; + return_VOID; } /* @@ -598,7 +640,7 @@ AcpiUtDumpAllocations ( */ if (ACPI_FAILURE (AcpiUtAcquireMutex (ACPI_MTX_MEMORY))) { - return; + return_VOID; } Element = AcpiGbl_GlobalList->ListHead; @@ -708,4 +750,3 @@ AcpiUtDumpAllocations ( } #endif /* ACPI_DBG_TRACK_ALLOCATIONS */ - diff --git a/source/components/utilities/utxface.c b/source/components/utilities/utxface.c index 38f7195769ab..9574c268e65c 100644 --- a/source/components/utilities/utxface.c +++ b/source/components/utilities/utxface.c @@ -160,7 +160,7 @@ ACPI_EXPORT_SYMBOL (AcpiSubsystemStatus) * RETURN: Status - the status of the call * * DESCRIPTION: This function is called to get information about the current - * state of the ACPI subsystem. It will return system information + * state of the ACPI subsystem. It will return system information * in the OutBuffer. * * If the function fails an appropriate status will be returned @@ -310,7 +310,7 @@ AcpiInstallInitializationHandler ( } AcpiGbl_InitHandler = Handler; - return AE_OK; + return (AE_OK); } ACPI_EXPORT_SYMBOL (AcpiInstallInitializationHandler) @@ -334,10 +334,12 @@ AcpiPurgeCachedObjects ( { ACPI_FUNCTION_TRACE (AcpiPurgeCachedObjects); + (void) AcpiOsPurgeCache (AcpiGbl_StateCache); (void) AcpiOsPurgeCache (AcpiGbl_OperandCache); (void) AcpiOsPurgeCache (AcpiGbl_PsNodeCache); (void) AcpiOsPurgeCache (AcpiGbl_PsNodeExtCache); + return_ACPI_STATUS (AE_OK); } diff --git a/source/components/utilities/utxferror.c b/source/components/utilities/utxferror.c index beeb7c7ce961..dcf52f140e00 100644 --- a/source/components/utilities/utxferror.c +++ b/source/components/utilities/utxferror.c @@ -472,7 +472,7 @@ AcpiUtNamespaceError ( /* There is a non-ascii character in the name */ ACPI_MOVE_32_TO_32 (&BadName, ACPI_CAST_PTR (UINT32, InternalName)); - AcpiOsPrintf ("[0x%4.4X] (NON-ASCII)", BadName); + AcpiOsPrintf ("[0x%.8X] (NON-ASCII)", BadName); } else { diff --git a/source/include/acapps.h b/source/include/acapps.h index 0382ca85475c..c0b171bb94b4 100644 --- a/source/include/acapps.h +++ b/source/include/acapps.h @@ -214,4 +214,3 @@ AdWriteTable ( char *OemTableId); #endif /* _ACAPPS */ - diff --git a/source/include/acconfig.h b/source/include/acconfig.h index 7880516e4755..b414383b496b 100644 --- a/source/include/acconfig.h +++ b/source/include/acconfig.h @@ -53,8 +53,8 @@ /* * ACPI_DEBUG_OUTPUT - This switch enables all the debug facilities of the - * ACPI subsystem. This includes the DEBUG_PRINT output - * statements. When disabled, all DEBUG_PRINT + * ACPI subsystem. This includes the DEBUG_PRINT output + * statements. When disabled, all DEBUG_PRINT * statements are compiled out. * * ACPI_APPLICATION - Use this switch if the subsystem is going to be run @@ -63,12 +63,12 @@ */ /* - * 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, * but there is a large base of ASL/AML code in existing machines that check - * for the string below. The use of this string usually guarantees that - * the ASL will execute down the most tested code path. Also, there is some + * for the string below. The use of this string usually guarantees that + * the ASL will execute down the most tested code path. Also, there is some * code that will not execute the _OSI method unless _OS matches the string - * below. Therefore, change this string at your own risk. + * below. Therefore, change this string at your own risk. */ #define ACPI_OS_NAME "Microsoft Windows NT" @@ -195,7 +195,7 @@ #define ACPI_MAX_ADDRESS_SPACE 255 -/* Array sizes. Used for range checking also */ +/* Array sizes. Used for range checking also */ #define ACPI_MAX_MATCH_OPCODE 5 @@ -230,4 +230,3 @@ #endif /* _ACCONFIG_H */ - diff --git a/source/include/acexcep.h b/source/include/acexcep.h index 856a359845ce..072ddf923855 100644 --- a/source/include/acexcep.h +++ b/source/include/acexcep.h @@ -127,7 +127,7 @@ /* - * AML exceptions. These are caused by problems with + * AML exceptions. These are caused by problems with * the actual AML byte stream */ #define AE_AML_BAD_OPCODE (ACPI_STATUS) (0x0001 | AE_CODE_AML) diff --git a/source/include/acglobal.h b/source/include/acglobal.h index 1fc2bc6bae41..42c623457dae 100644 --- a/source/include/acglobal.h +++ b/source/include/acglobal.h @@ -72,7 +72,7 @@ /* * Enable "slack" in the AML interpreter? Default is FALSE, and the - * interpreter strictly follows the ACPI specification. Setting to TRUE + * interpreter strictly follows the ACPI specification. Setting to TRUE * allows the interpreter to ignore certain errors and/or bad AML constructs. * * Currently, these features are enabled by this flag: diff --git a/source/include/aclocal.h b/source/include/aclocal.h index 8a3514772f9c..d54455fd8fde 100644 --- a/source/include/aclocal.h +++ b/source/include/aclocal.h @@ -305,7 +305,7 @@ ACPI_STATUS (*ACPI_INTERNAL_METHOD) ( /* - * Bitmapped ACPI types. Used internally only + * Bitmapped ACPI types. Used internally only */ #define ACPI_BTYPE_ANY 0x00000000 #define ACPI_BTYPE_INTEGER 0x00000001 @@ -689,7 +689,7 @@ typedef struct acpi_pscope_state /* - * Thread state - one per thread across multiple walk states. Multiple walk + * Thread state - one per thread across multiple walk states. Multiple walk * states are created when there are nested control methods executing. */ typedef struct acpi_thread_state diff --git a/source/include/acmacros.h b/source/include/acmacros.h index 92cd7a25e800..8a0e3842a1a9 100644 --- a/source/include/acmacros.h +++ b/source/include/acmacros.h @@ -464,7 +464,7 @@ #define ACPI_DUMP_OPERANDS(a, b ,c) AcpiExDumpOperands(a, b, c) #define ACPI_DUMP_ENTRY(a, b) AcpiNsDumpEntry (a, b) #define ACPI_DUMP_PATHNAME(a, b, c, d) AcpiNsDumpPathname(a, b, c, d) -#define ACPI_DUMP_BUFFER(a, b) AcpiUtDumpBuffer((UINT8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT) +#define ACPI_DUMP_BUFFER(a, b) AcpiUtDebugDumpBuffer((UINT8 *) a, b, DB_BYTE_DISPLAY, _COMPONENT) #else /* diff --git a/source/include/acnames.h b/source/include/acnames.h index e56f3cdf93d9..1987b169efc7 100644 --- a/source/include/acnames.h +++ b/source/include/acnames.h @@ -50,6 +50,7 @@ #define METHOD_NAME__HID "_HID" #define METHOD_NAME__CID "_CID" #define METHOD_NAME__UID "_UID" +#define METHOD_NAME__SUB "_SUB" #define METHOD_NAME__ADR "_ADR" #define METHOD_NAME__INI "_INI" #define METHOD_NAME__STA "_STA" @@ -81,5 +82,3 @@ #define ACPI_NS_ROOT_PATH "\\" #endif /* __ACNAMES_H__ */ - - diff --git a/source/include/acobject.h b/source/include/acobject.h index daf1afffb832..2f173755fea4 100644 --- a/source/include/acobject.h +++ b/source/include/acobject.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Name: acobject.h - Definition of ACPI_OPERAND_OBJECT (Internal object only) @@ -238,7 +237,7 @@ typedef struct acpi_object_method /****************************************************************************** * - * Objects that can be notified. All share a common NotifyInfo area. + * Objects that can be notified. All share a common NotifyInfo area. * *****************************************************************************/ @@ -301,7 +300,7 @@ typedef struct acpi_object_thermal_zone /****************************************************************************** * - * Fields. All share a common header/info field. + * Fields. All share a common header/info field. * *****************************************************************************/ diff --git a/source/include/acopcode.h b/source/include/acopcode.h index e182a07e6197..edd134986f50 100644 --- a/source/include/acopcode.h +++ b/source/include/acopcode.h @@ -54,7 +54,7 @@ #define _UNK 0x6B /* - * Reserved ASCII characters. Do not use any of these for + * Reserved ASCII characters. Do not use any of these for * internal opcodes, since they are used to differentiate * name strings from AML opcodes */ @@ -64,7 +64,7 @@ /* - * All AML opcodes and the parse-time arguments for each. Used by the AML + * All AML opcodes and the parse-time arguments for each. Used by the AML * parser Each list is compressed into a 32-bit number and stored in the * master opcode table (in psopcode.c). */ @@ -195,7 +195,7 @@ /* - * All AML opcodes and the runtime arguments for each. Used by the AML + * All AML opcodes and the runtime arguments for each. Used by the AML * interpreter Each list is compressed into a 32-bit number and stored * in the master opcode table (in psopcode.c). * diff --git a/source/include/acpiosxf.h b/source/include/acpiosxf.h index fc9c8f0d7a54..6fcda9e53b84 100644 --- a/source/include/acpiosxf.h +++ b/source/include/acpiosxf.h @@ -1,7 +1,6 @@ - /****************************************************************************** * - * Name: acpiosxf.h - All interfaces to the OS Services Layer (OSL). These + * Name: acpiosxf.h - All interfaces to the OS Services Layer (OSL). These * interfaces must be implemented by OSL to interface the * ACPI components to the host operating system. * @@ -122,9 +121,11 @@ AcpiOsPhysicalTableOverride ( /* * Spinlock primitives */ +#ifndef AcpiOsCreateLock ACPI_STATUS AcpiOsCreateLock ( ACPI_SPINLOCK *OutHandle); +#endif void AcpiOsDeleteLock ( diff --git a/source/include/acpixf.h b/source/include/acpixf.h index cd04e260acee..dfc3165c57da 100644 --- a/source/include/acpixf.h +++ b/source/include/acpixf.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Name: acpixf.h - External interfaces to the ACPI subsystem @@ -48,7 +47,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20120913 +#define ACPI_CA_VERSION 0x20121018 #include "acconfig.h" #include "actypes.h" diff --git a/source/include/acrestyp.h b/source/include/acrestyp.h index b927c9c58eb4..c2ce4f08b886 100644 --- a/source/include/acrestyp.h +++ b/source/include/acrestyp.h @@ -689,4 +689,3 @@ typedef struct acpi_pci_routing_table } ACPI_PCI_ROUTING_TABLE; #endif /* __ACRESTYP_H__ */ - diff --git a/source/include/acstruct.h b/source/include/acstruct.h index b3927caa41fa..ff01e864a32b 100644 --- a/source/include/acstruct.h +++ b/source/include/acstruct.h @@ -54,7 +54,7 @@ /* - * Walk state - current state of a parse tree walk. Used for both a leisurely + * Walk state - current state of a parse tree walk. Used for both a leisurely * stroll through the tree (for whatever reason), and for control method * execution. */ diff --git a/source/include/actbl2.h b/source/include/actbl2.h index 44f7de321b58..2d2d5caceab8 100644 --- a/source/include/actbl2.h +++ b/source/include/actbl2.h @@ -1334,4 +1334,3 @@ typedef struct acpi_table_wdrt #pragma pack() #endif /* __ACTBL2_H__ */ - diff --git a/source/include/actbl3.h b/source/include/actbl3.h index ce0b1581bfe4..874e348e9ea1 100644 --- a/source/include/actbl3.h +++ b/source/include/actbl3.h @@ -319,10 +319,10 @@ typedef struct acpi_table_gtdt ******************************************************************************/ #define ACPI_MPST_CHANNEL_INFO \ - UINT16 Reserved1; \ UINT8 ChannelId; \ - UINT8 Reserved2; \ - UINT16 PowerNodeCount; + UINT8 Reserved1[3]; \ + UINT16 PowerNodeCount; \ + UINT16 Reserved2; /* Main table */ @@ -353,9 +353,8 @@ typedef struct acpi_mpst_power_node UINT32 Length; UINT64 RangeAddress; UINT64 RangeLength; - UINT8 NumPowerStates; - UINT8 NumPhysicalComponents; - UINT16 Reserved2; + UINT32 NumPowerStates; + UINT32 NumPhysicalComponents; } ACPI_MPST_POWER_NODE; @@ -390,12 +389,13 @@ typedef struct acpi_mpst_component typedef struct acpi_mpst_data_hdr { UINT16 CharacteristicsCount; + UINT16 Reserved; } ACPI_MPST_DATA_HDR; typedef struct acpi_mpst_power_data { - UINT8 Revision; + UINT8 StructureId; UINT8 Flags; UINT16 Reserved1; UINT32 AveragePower; @@ -419,10 +419,10 @@ typedef struct acpi_mpst_shared UINT32 Signature; UINT16 PccCommand; UINT16 PccStatus; - UINT16 CommandRegister; - UINT16 StatusRegister; - UINT16 PowerStateId; - UINT16 PowerNodeId; + UINT32 CommandRegister; + UINT32 StatusRegister; + UINT32 PowerStateId; + UINT32 PowerNodeId; UINT64 EnergyConsumed; UINT64 AveragePower; diff --git a/source/include/actypes.h b/source/include/actypes.h index eef510acd484..611c41836af4 100644 --- a/source/include/actypes.h +++ b/source/include/actypes.h @@ -454,10 +454,14 @@ typedef UINT64 ACPI_INTEGER; #define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i) #define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i) +/* Optimizations for 4-character (32-bit) ACPI_NAME manipulation */ + #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED #define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (UINT32, (a)) == *ACPI_CAST_PTR (UINT32, (b))) +#define ACPI_MOVE_NAME(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src))) #else #define ACPI_COMPARE_NAME(a,b) (!ACPI_STRNCMP (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE)) +#define ACPI_MOVE_NAME(dest,src) (ACPI_STRNCPY (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE)) #endif @@ -1105,22 +1109,22 @@ UINT32 (*ACPI_INTERFACE_HANDLER) ( #define ACPI_UUID_LENGTH 16 -/* Structures used for device/processor HID, UID, CID */ +/* Structures used for device/processor HID, UID, CID, and SUB */ -typedef struct acpi_device_id +typedef struct acpi_pnp_device_id { UINT32 Length; /* Length of string + null */ char *String; -} ACPI_DEVICE_ID; +} ACPI_PNP_DEVICE_ID; -typedef struct acpi_device_id_list +typedef struct acpi_pnp_device_id_list { UINT32 Count; /* Number of IDs in Ids array */ UINT32 ListSize; /* Size of list, including ID strings */ - ACPI_DEVICE_ID Ids[1]; /* ID array */ + ACPI_PNP_DEVICE_ID Ids[1]; /* ID array */ -} ACPI_DEVICE_ID_LIST; +} ACPI_PNP_DEVICE_ID_LIST; /* * Structure returned from AcpiGetObjectInfo. @@ -1138,9 +1142,10 @@ typedef struct acpi_device_info UINT8 LowestDstates[5]; /* _SxW values: 0xFF indicates not valid */ UINT32 CurrentStatus; /* _STA value */ UINT64 Address; /* _ADR value */ - ACPI_DEVICE_ID HardwareId; /* _HID value */ - ACPI_DEVICE_ID UniqueId; /* _UID value */ - ACPI_DEVICE_ID_LIST CompatibleIdList; /* _CID list <must be last> */ + ACPI_PNP_DEVICE_ID HardwareId; /* _HID value */ + ACPI_PNP_DEVICE_ID UniqueId; /* _UID value */ + ACPI_PNP_DEVICE_ID SubsystemId; /* _SUB value */ + ACPI_PNP_DEVICE_ID_LIST CompatibleIdList; /* _CID list <must be last> */ } ACPI_DEVICE_INFO; @@ -1154,11 +1159,12 @@ typedef struct acpi_device_info #define ACPI_VALID_ADR 0x02 #define ACPI_VALID_HID 0x04 #define ACPI_VALID_UID 0x08 -#define ACPI_VALID_CID 0x10 -#define ACPI_VALID_SXDS 0x20 -#define ACPI_VALID_SXWS 0x40 +#define ACPI_VALID_SUB 0x10 +#define ACPI_VALID_CID 0x20 +#define ACPI_VALID_SXDS 0x40 +#define ACPI_VALID_SXWS 0x80 -/* Flags for _STA method */ +/* Flags for _STA return value (CurrentStatus above) */ #define ACPI_STA_DEVICE_PRESENT 0x01 #define ACPI_STA_DEVICE_ENABLED 0x02 diff --git a/source/include/acutils.h b/source/include/acutils.h index d720fcc92a1f..239126075200 100644 --- a/source/include/acutils.h +++ b/source/include/acutils.h @@ -425,17 +425,18 @@ AcpiUtPtrExit ( UINT8 *Ptr); void -AcpiUtDumpBuffer ( +AcpiUtDebugDumpBuffer ( UINT8 *Buffer, UINT32 Count, UINT32 Display, UINT32 ComponentId); void -AcpiUtDumpBuffer2 ( +AcpiUtDumpBuffer ( UINT8 *Buffer, UINT32 Count, - UINT32 Display); + UINT32 Display, + UINT32 Offset); void AcpiUtReportError ( @@ -511,17 +512,22 @@ AcpiUtExecutePowerMethods ( ACPI_STATUS AcpiUtExecute_HID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID **ReturnId); + ACPI_PNP_DEVICE_ID **ReturnId); ACPI_STATUS AcpiUtExecute_UID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID **ReturnId); + ACPI_PNP_DEVICE_ID **ReturnId); + +ACPI_STATUS +AcpiUtExecute_SUB ( + ACPI_NAMESPACE_NODE *DeviceNode, + ACPI_PNP_DEVICE_ID **ReturnId); ACPI_STATUS AcpiUtExecute_CID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID_LIST **ReturnCidList); + ACPI_PNP_DEVICE_ID_LIST **ReturnCidList); /* diff --git a/source/include/amlresrc.h b/source/include/amlresrc.h index 6d85b8a2d05b..2202bb97361f 100644 --- a/source/include/amlresrc.h +++ b/source/include/amlresrc.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: amlresrc.h - AML resource descriptors @@ -576,4 +575,3 @@ typedef union aml_resource } AML_RESOURCE; #endif - diff --git a/source/include/platform/acenv.h b/source/include/platform/acenv.h index 8dfc143f8976..dc18e8651f8c 100644 --- a/source/include/platform/acenv.h +++ b/source/include/platform/acenv.h @@ -367,7 +367,7 @@ typedef char *va_list; #define _Bnd(X, bnd) (((sizeof (X)) + (bnd)) & (~(bnd))) #define va_arg(ap, T) (*(T *)(((ap) += (_Bnd (T, _AUPBND))) - (_Bnd (T,_ADNBND)))) -#define va_end(ap) (void) 0 +#define va_end(ap) (ap = (va_list) NULL) #define va_start(ap, A) (void) ((ap) = (((char *) &(A)) + (_Bnd (A,_AUPBND)))) #endif /* va_arg */ diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h index edfff150ed58..45c73f427734 100644 --- a/source/include/platform/aclinux.h +++ b/source/include/platform/aclinux.h @@ -55,11 +55,9 @@ #include <linux/string.h> #include <linux/kernel.h> -#include <linux/module.h> #include <linux/ctype.h> #include <linux/sched.h> -#include <asm/system.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include <asm/div64.h> #include <asm/acpi.h> #include <linux/slab.h> @@ -87,18 +85,17 @@ /* Host-dependent types and defines for user-space ACPICA */ #define ACPI_FLUSH_CPU_CACHE() +#define ACPI_CAST_PTHREAD_T(pthread) ((ACPI_THREAD_ID) (pthread)) #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 @@ -113,12 +110,13 @@ #ifdef __KERNEL__ +#include <acpi/actypes.h> /* * Overrides for in-kernel ACPICA */ static inline acpi_thread_id acpi_os_get_thread_id(void) { - return current; + return (ACPI_THREAD_ID) (unsigned long) current; } /* @@ -127,7 +125,6 @@ static inline acpi_thread_id acpi_os_get_thread_id(void) * However, boot has (system_state != SYSTEM_RUNNING) * to quiet __might_sleep() in kmalloc() and resume does not. */ -#include <acpi/actypes.h> static inline void *acpi_os_allocate(acpi_size size) { return kmalloc(size, irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL); @@ -148,13 +145,35 @@ static inline void *acpi_os_acquire_object(acpi_cache_t * cache) #define ACPI_ALLOCATE_ZEROED(a) acpi_os_allocate_zeroed(a) #define ACPI_FREE(a) kfree(a) -/* Used within ACPICA to show where it is safe to preempt execution */ - +#ifndef CONFIG_PREEMPT +/* + * Used within ACPICA to show where it is safe to preempt execution + * when CONFIG_PREEMPT=n + */ #define ACPI_PREEMPTION_POINT() \ do { \ if (!irqs_disabled()) \ cond_resched(); \ } while (0) +#endif + +/* + * When lockdep is enabled, the spin_lock_init() macro stringifies it's + * argument and uses that as a name for the lock in debugging. + * By executing spin_lock_init() in a macro the key changes from "lock" for + * all locks to the name of the argument of acpi_os_create_lock(), which + * prevents lockdep from reporting false positives for ACPICA locks. + */ +#define AcpiOsCreateLock(__handle) \ +({ \ + spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock)); \ + \ + if (lock) { \ + *(__handle) = lock; \ + spin_lock_init(*(__handle)); \ + } \ + lock ? AE_OK : AE_NO_MEMORY; \ +}) #endif /* __KERNEL__ */ diff --git a/source/os_specific/service_layers/osunixdir.c b/source/os_specific/service_layers/osunixdir.c index 20b153c3d485..7916c0315964 100644 --- a/source/os_specific/service_layers/osunixdir.c +++ b/source/os_specific/service_layers/osunixdir.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: osunixdir - Unix directory access interfaces @@ -60,7 +59,7 @@ typedef struct ExternalFindInfo { char *DirPathname; DIR *DirPtr; - char temp_buffer[128]; + char temp_buffer[256]; char *WildcardSpec; char RequestedFileType; @@ -93,7 +92,7 @@ AcpiOsOpenDirectory ( /* Allocate the info struct that will be returned to the caller */ - ExternalInfo = calloc (sizeof (EXTERNAL_FIND_INFO), 1); + ExternalInfo = calloc (1, sizeof (EXTERNAL_FIND_INFO)); if (!ExternalInfo) { return (NULL); diff --git a/source/os_specific/service_layers/oswindir.c b/source/os_specific/service_layers/oswindir.c index 2cdcb945860b..ab2d810a944f 100644 --- a/source/os_specific/service_layers/oswindir.c +++ b/source/os_specific/service_layers/oswindir.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: oswindir - Windows directory access interfaces @@ -248,4 +247,3 @@ AcpiOsCloseDirectory ( free (SearchInfo->FullWildcardSpec); free (DirHandle); } - diff --git a/source/os_specific/service_layers/oswintbl.c b/source/os_specific/service_layers/oswintbl.c index db34966a0d9e..2158b05377d1 100644 --- a/source/os_specific/service_layers/oswintbl.c +++ b/source/os_specific/service_layers/oswintbl.c @@ -219,4 +219,3 @@ Cleanup: RegCloseKey (Handle); return (ReturnTable); } - diff --git a/source/os_specific/service_layers/oswinxf.c b/source/os_specific/service_layers/oswinxf.c index 68629a272efd..b8b3e37cb14d 100644 --- a/source/os_specific/service_layers/oswinxf.c +++ b/source/os_specific/service_layers/oswinxf.c @@ -268,8 +268,8 @@ AcpiOsTableOverride ( /* Construct a null-terminated string from table signature */ + ACPI_MOVE_NAME (TableName, ExistingTable->Signature); TableName[ACPI_NAME_SIZE] = 0; - ACPI_STRNCPY (TableName, ExistingTable->Signature, ACPI_NAME_SIZE); *NewTable = OsGetTable (TableName); if (*NewTable) @@ -1503,4 +1503,3 @@ AcpiOsWaitEventsComplete ( { return; } - diff --git a/source/tools/acpibin/abcompare.c b/source/tools/acpibin/abcompare.c index 46122274d4a9..a0b241f5c4fd 100644 --- a/source/tools/acpibin/abcompare.c +++ b/source/tools/acpibin/abcompare.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: abcompare - compare AML files @@ -158,10 +157,10 @@ AbValidateHeader ( if (!AcpiUtValidAcpiName (* (UINT32 *) &Header->Signature)) { printf ("Header signature is invalid\n"); - return FALSE; + return (FALSE); } - return TRUE; + return (TRUE); } @@ -398,14 +397,14 @@ AbCompareAmlFiles ( if (!File1) { printf ("Could not open file %s\n", File1Path); - return -1; + return (-1); } File2 = fopen (File2Path, "rb"); if (!File2) { printf ("Could not open file %s\n", File2Path); - return -1; + return (-1); } /* Read the ACPI header from each file */ @@ -414,20 +413,20 @@ AbCompareAmlFiles ( if (Actual1 < sizeof (ACPI_TABLE_HEADER)) { printf ("File %s does not contain an ACPI table header\n", File1Path); - return -1; + return (-1); } Actual2 = fread (&Header2, 1, sizeof (ACPI_TABLE_HEADER), File2); if (Actual2 < sizeof (ACPI_TABLE_HEADER)) { printf ("File %s does not contain an ACPI table header\n", File2Path); - return -1; + return (-1); } if ((!AbValidateHeader (&Header1)) || (!AbValidateHeader (&Header2))) { - return -1; + return (-1); } /* Table signatures must match */ @@ -435,7 +434,7 @@ AbCompareAmlFiles ( if (*((UINT32 *) Header1.Signature) != *((UINT32 *) Header2.Signature)) { printf ("Table signatures do not match\n"); - return -1; + return (-1); } if (!Gbl_TerseMode) @@ -446,7 +445,7 @@ AbCompareAmlFiles ( AbPrintHeaderInfo (&Header2); } - if (memcmp (Header1.Signature, Header2.Signature, sizeof (ACPI_TABLE_HEADER))) + if (memcmp (&Header1, &Header2, sizeof (ACPI_TABLE_HEADER))) { printf ("Headers do not match exactly\n"); HeaderMismatch = TRUE; @@ -468,7 +467,7 @@ AbCompareAmlFiles ( if (Mismatches > 100) { printf ("100 Mismatches: Too many mismatches\n"); - return -1; + return (-1); } } @@ -500,7 +499,7 @@ AbCompareAmlFiles ( } printf ("%u Mismatches found\n", Mismatches); - return 0; + return (0); } @@ -528,7 +527,7 @@ AbGetFile ( if (!FileHandle) { printf ("Could not open %s\n", Filename); - return NULL; + return (NULL); } /* Need file size to allocate a buffer */ @@ -596,12 +595,12 @@ AbDumpAmlFile ( if (!FileOutHandle) { printf ("Could not open %s\n", File2Path); - return -1; + return (-1); } if (!AbValidateHeader ((ACPI_TABLE_HEADER *) FileBuffer)) { - return -1; + return (-1); } /* Convert binary AML to text, using common dump buffer routine */ @@ -611,10 +610,10 @@ AbDumpAmlFile ( AcpiOsPrintf ("%4.4s\n", ((ACPI_TABLE_HEADER *) FileBuffer)->Signature); AcpiDbgLevel = ACPI_UINT32_MAX; - AcpiUtDumpBuffer ((UINT8 *) FileBuffer, FileSize, + AcpiUtDebugDumpBuffer ((UINT8 *) FileBuffer, FileSize, DB_BYTE_DISPLAY, ACPI_UINT32_MAX); - return 0; + return (0); } @@ -648,14 +647,14 @@ AbExtractAmlFile ( if (!FileHandle) { printf ("Could not open %s\n", File1Path); - return -1; + return (-1); } FileOutHandle = fopen (File2Path, "w+b"); if (!FileOutHandle) { printf ("Could not open %s\n", File2Path); - return -1; + return (-1); } /* Force input table sig to uppercase */ @@ -672,7 +671,7 @@ AbExtractAmlFile ( { /* The 4-char ACPI signature appears at the beginning of a line */ - if (!strncmp (Buffer, TableSig, 4)) + if (ACPI_COMPARE_NAME (Buffer, TableSig)) { printf ("Found table [%4.4s]\n", TableSig); @@ -710,7 +709,12 @@ AbExtractAmlFile ( /* Write the converted (binary) byte */ - fwrite (&Value, 1, 1, FileOutHandle); + if (fwrite (&Value, 1, 1, FileOutHandle) < 1) + { + printf ("Error writing byte %u to output file: %s\n", + Count, File2Path); + goto Exit; + } Count++; } } @@ -725,13 +729,13 @@ AbExtractAmlFile ( printf ("Could not match table signature\n"); fclose (FileHandle); - return -1; + return (-1); Exit: printf ("%u (0x%X) bytes written to %s\n", Count, Count, File2Path); fclose (FileHandle); fclose (FileOutHandle); - return 0; + return (0); } @@ -747,7 +751,7 @@ ACPI_PHYSICAL_ADDRESS AeLocalGetRootPointer ( void) { - return AE_OK; + return (AE_OK); } ACPI_THREAD_ID diff --git a/source/tools/acpibin/abmain.c b/source/tools/acpibin/abmain.c index cb9c329521f0..b09ab846747f 100644 --- a/source/tools/acpibin/abmain.c +++ b/source/tools/acpibin/abmain.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: abmain - Main module for the acpi binary utility @@ -109,7 +108,7 @@ main ( if (argc < 2) { AbDisplayUsage (0); - return 0; + return (0); } /* Command line options */ @@ -121,7 +120,7 @@ main ( if (argc < 4) { AbDisplayUsage (2); - return -1; + return (-1); } Status = AbCompareAmlFiles (AcpiGbl_Optarg, argv[AcpiGbl_Optind]); @@ -132,7 +131,7 @@ main ( if (argc < 4) { AbDisplayUsage (2); - return -1; + return (-1); } Status = AbDumpAmlFile (AcpiGbl_Optarg, argv[AcpiGbl_Optind]); @@ -143,7 +142,7 @@ main ( if (argc < 5) { AbDisplayUsage (3); - return -1; + return (-1); } Status = AbExtractAmlFile (AcpiGbl_Optarg, argv[AcpiGbl_Optind], @@ -155,7 +154,7 @@ main ( if (argc < 3) { AbDisplayUsage (1); - return -1; + return (-1); } AbDisplayHeader (AcpiGbl_Optarg); @@ -166,7 +165,7 @@ main ( if (argc < 3) { AbDisplayUsage (1); - return -1; + return (-1); } AbComputeChecksum (AcpiGbl_Optarg); @@ -179,7 +178,7 @@ main ( default: AbDisplayUsage (0); - return -1; + return (-1); } return Status; diff --git a/source/tools/acpibin/acpibin.h b/source/tools/acpibin/acpibin.h index 63109cc738cf..e831f5109873 100644 --- a/source/tools/acpibin/acpibin.h +++ b/source/tools/acpibin/acpibin.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: acpibinh - Include file for AcpiBin utility @@ -67,7 +66,7 @@ #define ACPI_DB_REDIRECTABLE_OUTPUT 0x01 /* - * Global variables. Defined in main.c only, externed in all other files + * Global variables. Defined in main.c only, externed in all other files */ #ifdef _DECLARE_GLOBALS @@ -110,4 +109,3 @@ AbComputeChecksum ( void AbDisplayHeader ( char *File1Path); - diff --git a/source/tools/acpiexec/aecommon.h b/source/tools/acpiexec/aecommon.h index 66995e7ecd0e..111e995d390b 100644 --- a/source/tools/acpiexec/aecommon.h +++ b/source/tools/acpiexec/aecommon.h @@ -197,4 +197,3 @@ AeGlobalEventHandler ( void *Context); #endif /* _AECOMMON */ - diff --git a/source/tools/acpiexec/aeexec.c b/source/tools/acpiexec/aeexec.c index 6bc138138c87..8c0ec265aea7 100644 --- a/source/tools/acpiexec/aeexec.c +++ b/source/tools/acpiexec/aeexec.c @@ -770,4 +770,3 @@ AeMiscellaneousTests ( #endif /* !ACPI_REDUCED_HARDWARE */ } - diff --git a/source/tools/acpiexec/aehandlers.c b/source/tools/acpiexec/aehandlers.c index 84ed57e1b340..d830d804276c 100644 --- a/source/tools/acpiexec/aehandlers.c +++ b/source/tools/acpiexec/aehandlers.c @@ -167,7 +167,7 @@ static ACPI_CONNECTION_INFO AeMyContext; * * RETURN: none * - * DESCRIPTION: Control-C handler. Abort running control method if any. + * DESCRIPTION: Control-C handler. Abort running control method if any. * *****************************************************************************/ @@ -299,7 +299,7 @@ AeCommonNotifyHandler ( * * RETURN: Status * - * DESCRIPTION: System notify handler for AcpiExec utility. Used by the ASL + * DESCRIPTION: System notify handler for AcpiExec utility. Used by the ASL * test suite(s) to communicate errors and other information to * this utility via the Notify() operator. * @@ -332,7 +332,7 @@ AeSystemNotifyHandler ( * * RETURN: Status * - * DESCRIPTION: Device notify handler for AcpiExec utility. Used by the ASL + * DESCRIPTION: Device notify handler for AcpiExec utility. Used by the ASL * test suite(s) to communicate errors and other information to * this utility via the Notify() operator. * @@ -1366,5 +1366,3 @@ DoFunction: return (AE_OK); } - - diff --git a/source/tools/acpiexec/aetables.c b/source/tools/acpiexec/aetables.c index afada0d71417..fb530e1dabf8 100644 --- a/source/tools/acpiexec/aetables.c +++ b/source/tools/acpiexec/aetables.c @@ -173,7 +173,7 @@ AeBuildLocalTables ( } ACPI_MEMSET (LocalXSDT, 0, XsdtSize); - ACPI_STRNCPY (LocalXSDT->Header.Signature, ACPI_SIG_XSDT, 4); + ACPI_MOVE_NAME (LocalXSDT->Header.Signature, ACPI_SIG_XSDT); LocalXSDT->Header.Length = XsdtSize; LocalXSDT->Header.Revision = 1; @@ -307,7 +307,7 @@ AeBuildLocalTables ( * Build a local FADT so we can test the hardware/event init */ ACPI_MEMSET (&LocalFADT, 0, sizeof (ACPI_TABLE_FADT)); - ACPI_STRNCPY (LocalFADT.Header.Signature, ACPI_SIG_FADT, 4); + ACPI_MOVE_NAME (LocalFADT.Header.Signature, ACPI_SIG_FADT); /* Setup FADT header and DSDT/FACS addresses */ @@ -358,7 +358,7 @@ AeBuildLocalTables ( /* Build a FACS */ ACPI_MEMSET (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS)); - ACPI_STRNCPY (LocalFACS.Signature, ACPI_SIG_FACS, 4); + ACPI_MOVE_NAME (LocalFACS.Signature, ACPI_SIG_FACS); LocalFACS.Length = sizeof (ACPI_TABLE_FACS); LocalFACS.GlobalLock = 0x11AA0011; @@ -368,7 +368,7 @@ AeBuildLocalTables ( * ACPICA core ignores it */ ACPI_MEMSET (&LocalTEST, 0, sizeof (ACPI_TABLE_HEADER)); - ACPI_STRNCPY (LocalTEST.Signature, "TEST", 4); + ACPI_MOVE_NAME (LocalTEST.Signature, "TEST"); LocalTEST.Revision = 1; LocalTEST.Length = sizeof (ACPI_TABLE_HEADER); @@ -380,7 +380,7 @@ AeBuildLocalTables ( * sure that the ACPICA core ignores it */ ACPI_MEMSET (&LocalBADTABLE, 0, sizeof (ACPI_TABLE_HEADER)); - ACPI_STRNCPY (LocalBADTABLE.Signature, "BAD!", 4); + ACPI_MOVE_NAME (LocalBADTABLE.Signature, "BAD!"); LocalBADTABLE.Revision = 1; LocalBADTABLE.Length = sizeof (ACPI_TABLE_HEADER); diff --git a/source/tools/acpinames/acpinames.h b/source/tools/acpinames/acpinames.h index 260124af8ee6..3439f8f673fd 100644 --- a/source/tools/acpinames/acpinames.h +++ b/source/tools/acpinames/acpinames.h @@ -54,4 +54,3 @@ #define ACPI_MAX_INIT_TABLES (32) #endif - diff --git a/source/tools/acpinames/anmain.c b/source/tools/acpinames/anmain.c index 682cc5f61570..5fb51bafe8f0 100644 --- a/source/tools/acpinames/anmain.c +++ b/source/tools/acpinames/anmain.c @@ -272,4 +272,3 @@ main ( */ return (NsDumpEntireNamespace (argv[AcpiGbl_Optind])); } - diff --git a/source/tools/acpinames/anstubs.c b/source/tools/acpinames/anstubs.c index a69c425e3776..b823f3253122 100644 --- a/source/tools/acpinames/anstubs.c +++ b/source/tools/acpinames/anstubs.c @@ -77,7 +77,7 @@ AcpiUtExecute_STA ( ACPI_STATUS AcpiUtExecute_HID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID **ReturnId) + ACPI_PNP_DEVICE_ID **ReturnId) { return (AE_NOT_IMPLEMENTED); } @@ -85,7 +85,7 @@ AcpiUtExecute_HID ( ACPI_STATUS AcpiUtExecute_CID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID_LIST **ReturnCidList) + ACPI_PNP_DEVICE_ID_LIST **ReturnCidList) { return (AE_NOT_IMPLEMENTED); } @@ -93,7 +93,15 @@ AcpiUtExecute_CID ( ACPI_STATUS AcpiUtExecute_UID ( ACPI_NAMESPACE_NODE *DeviceNode, - ACPI_DEVICE_ID **ReturnId) + ACPI_PNP_DEVICE_ID **ReturnId) +{ + return (AE_NOT_IMPLEMENTED); +} + +ACPI_STATUS +AcpiUtExecute_SUB ( + ACPI_NAMESPACE_NODE *DeviceNode, + ACPI_PNP_DEVICE_ID **ReturnId) { return (AE_NOT_IMPLEMENTED); } diff --git a/source/tools/acpinames/antables.c b/source/tools/acpinames/antables.c index 37fa24ae5f9f..c6545b834273 100644 --- a/source/tools/acpinames/antables.c +++ b/source/tools/acpinames/antables.c @@ -129,7 +129,7 @@ AeBuildLocalTables ( } ACPI_MEMSET (LocalXSDT, 0, XsdtSize); - ACPI_STRNCPY (LocalXSDT->Header.Signature, ACPI_SIG_XSDT, 4); + ACPI_MOVE_NAME (LocalXSDT->Header.Signature, ACPI_SIG_XSDT); LocalXSDT->Header.Length = XsdtSize; LocalXSDT->Header.Revision = 1; @@ -222,7 +222,7 @@ AeBuildLocalTables ( * Build a local FADT so we can test the hardware/event init */ ACPI_MEMSET (&LocalFADT, 0, sizeof (ACPI_TABLE_FADT)); - ACPI_STRNCPY (LocalFADT.Header.Signature, ACPI_SIG_FADT, 4); + ACPI_MOVE_NAME (LocalFADT.Header.Signature, ACPI_SIG_FADT); /* Setup FADT header and DSDT/FACS addresses */ @@ -273,7 +273,7 @@ AeBuildLocalTables ( /* Build a FACS */ ACPI_MEMSET (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS)); - ACPI_STRNCPY (LocalFACS.Signature, ACPI_SIG_FACS, 4); + ACPI_MOVE_NAME (LocalFACS.Signature, ACPI_SIG_FACS); LocalFACS.Length = sizeof (ACPI_TABLE_FACS); LocalFACS.GlobalLock = 0x11AA0011; diff --git a/source/tools/acpisrc/acpisrc.h b/source/tools/acpisrc/acpisrc.h index bc3f497e89c1..1d2e8dc50124 100644 --- a/source/tools/acpisrc/acpisrc.h +++ b/source/tools/acpisrc/acpisrc.h @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: acpisrc.h - Include file for AcpiSrc utility @@ -135,6 +134,7 @@ extern BOOLEAN Gbl_Overwrite; extern BOOLEAN Gbl_WidenDeclarations; extern BOOLEAN Gbl_IgnoreLoneLineFeeds; extern BOOLEAN Gbl_HasLoneLineFeeds; +extern BOOLEAN Gbl_Cleanup; extern void *Gbl_StructDefs; #define PARAM_LIST(pl) pl @@ -367,6 +367,16 @@ AsCheckForDirectory ( char **SourcePath, char **TargetPath); +void +AsRemoveExtraLines ( + char *FileBuffer, + char *Filename); + +void +AsRemoveSpacesAfterPeriod ( + char *FileBuffer, + char *Filename); + BOOLEAN AsMatchExactWord ( char *Word, @@ -402,5 +412,3 @@ AsInsertCarriageReturns ( void AsConvertToLineFeeds ( char *Buffer); - - diff --git a/source/tools/acpisrc/ascase.c b/source/tools/acpisrc/ascase.c index 7e115b7aeb65..96e1269eaaf3 100644 --- a/source/tools/acpisrc/ascase.c +++ b/source/tools/acpisrc/ascase.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: ascase - Source conversion - lower/upper case utilities @@ -57,7 +56,7 @@ AsUppercaseTokens ( * FUNCTION: AsLowerCaseString * * DESCRIPTION: LowerCase all instances of a target string with a replacement - * string. Returns count of the strings replaced. + * string. Returns count of the strings replaced. * ******************************************************************************/ @@ -86,7 +85,7 @@ AsLowerCaseString ( SubString1 = strstr (SubBuffer, Target); if (!SubString1) { - return LowerCaseCount; + return (LowerCaseCount); } /* @@ -105,7 +104,7 @@ AsLowerCaseString ( { /* Didn't find terminator */ - return LowerCaseCount; + return (LowerCaseCount); } /* Move buffer to end of escape block and continue */ @@ -142,7 +141,7 @@ AsLowerCaseString ( } } - return LowerCaseCount; + return (LowerCaseCount); } @@ -465,7 +464,7 @@ AsMixedCaseToUnderscores ( * * FUNCTION: AsLowerCaseIdentifiers * - * DESCRIPTION: Converts mixed case identifiers to lower case. Leaves comments, + * DESCRIPTION: Converts mixed case identifiers to lower case. Leaves comments, * quoted strings, and all-upper-case macros alone. * ******************************************************************************/ diff --git a/source/tools/acpisrc/asconvrt.c b/source/tools/acpisrc/asconvrt.c index 1669f9d20e79..ff2804d72fce 100644 --- a/source/tools/acpisrc/asconvrt.c +++ b/source/tools/acpisrc/asconvrt.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asconvrt - Source conversion code @@ -63,6 +62,89 @@ char *HeaderBegin = "/*************************************************** /****************************************************************************** * + * FUNCTION: AsRemoveExtraLines + * + * DESCRIPTION: Remove all extra lines at the start and end of the file. + * + ******************************************************************************/ + +void +AsRemoveExtraLines ( + char *FileBuffer, + char *Filename) +{ + char *FileEnd; + int Length; + + + /* Remove any extra lines at the start of the file */ + + while (*FileBuffer == '\n') + { + printf ("Removing extra line at start of file: %s\n", Filename); + AsRemoveData (FileBuffer, FileBuffer + 1); + } + + /* Remove any extra lines at the end of the file */ + + Length = strlen (FileBuffer); + FileEnd = FileBuffer + (Length - 2); + + while (*FileEnd == '\n') + { + printf ("Removing extra line at end of file: %s\n", Filename); + AsRemoveData (FileEnd, FileEnd + 1); + FileEnd--; + } +} + + +/****************************************************************************** + * + * FUNCTION: AsRemoveSpacesAfterPeriod + * + * DESCRIPTION: Remove an extra space after a period. + * + ******************************************************************************/ + +void +AsRemoveSpacesAfterPeriod ( + char *FileBuffer, + char *Filename) +{ + int ReplaceCount = 0; + char *Possible; + + + Possible = FileBuffer; + while (Possible) + { + Possible = strstr (Possible, ". "); + if (Possible) + { + if ((*(Possible -1) == '.') || + (*(Possible -1) == '\"') || + (*(Possible -1) == '\n')) + { + Possible += 3; + continue; + } + + Possible = AsReplaceData (Possible, 3, ". ", 2); + ReplaceCount++; + } + } + + if (ReplaceCount) + { + printf ("Removed %d extra blanks after a period: %s\n", + ReplaceCount, Filename); + } +} + + +/****************************************************************************** + * * FUNCTION: AsMatchExactWord * * DESCRIPTION: Check previous and next characters for whitespace @@ -146,7 +228,7 @@ AsCheckAndSkipLiterals ( if (!LiteralEnd) { - return SubBuffer; + return (SubBuffer); } while (SubBuffer < LiteralEnd) @@ -170,7 +252,7 @@ AsCheckAndSkipLiterals ( LiteralEnd = AsSkipPastChar (SubBuffer, '\"'); if (!LiteralEnd) { - return SubBuffer; + return (SubBuffer); } } @@ -178,7 +260,7 @@ AsCheckAndSkipLiterals ( { (*TotalLines) += NewLines; } - return SubBuffer; + return (SubBuffer); } @@ -278,7 +360,7 @@ AsCheckForBraces ( * * FUNCTION: AsTrimLines * - * DESCRIPTION: Remove extra blanks from the end of source lines. Does not + * DESCRIPTION: Remove extra blanks from the end of source lines. Does not * check for tabs. * ******************************************************************************/ @@ -404,7 +486,7 @@ AsReplaceHeader ( * FUNCTION: AsReplaceString * * DESCRIPTION: Replace all instances of a target string with a replacement - * string. Returns count of the strings replaced. + * string. Returns count of the strings replaced. * ******************************************************************************/ @@ -436,7 +518,7 @@ AsReplaceString ( SubString1 = strstr (SubBuffer, Target); if (!SubString1) { - return ReplaceCount; + return (ReplaceCount); } /* @@ -455,7 +537,7 @@ AsReplaceString ( { /* Didn't find terminator */ - return ReplaceCount; + return (ReplaceCount); } /* Move buffer to end of escape block and continue */ @@ -488,7 +570,7 @@ AsReplaceString ( } } - return ReplaceCount; + return (ReplaceCount); } @@ -725,7 +807,7 @@ AsBracesOnSameLine ( * * FUNCTION: AsTabify4 * - * DESCRIPTION: Convert the text to tabbed text. Alignment of text is + * DESCRIPTION: Convert the text to tabbed text. Alignment of text is * preserved. * ******************************************************************************/ @@ -815,7 +897,7 @@ AsTabify4 ( * * FUNCTION: AsTabify8 * - * DESCRIPTION: Convert the text to tabbed text. Alignment of text is + * DESCRIPTION: Convert the text to tabbed text. Alignment of text is * preserved. * ******************************************************************************/ @@ -863,7 +945,7 @@ AsTabify8 ( /* * This mechanism limits the difference in tab counts from - * line to line. It helps avoid the situation where a second + * line to line. It helps avoid the situation where a second * continuation line (which was indented correctly for tabs=4) would * get indented off the screen if we just blindly converted to tabs. */ @@ -1015,7 +1097,7 @@ AsTabify8 ( * * FUNCTION: AsCountLines * - * DESCRIPTION: Count the number of lines in the input buffer. Also count + * DESCRIPTION: Count the number of lines in the input buffer. Also count * the number of long lines (lines longer than 80 chars). * ******************************************************************************/ @@ -1037,7 +1119,7 @@ AsCountLines ( if (!EndOfLine) { Gbl_TotalLines += LineCount; - return LineCount; + return (LineCount); } if ((EndOfLine - SubBuffer) > 80) @@ -1057,7 +1139,7 @@ AsCountLines ( } Gbl_TotalLines += LineCount; - return LineCount; + return (LineCount); } @@ -1100,7 +1182,7 @@ AsCountTabs ( * * FUNCTION: AsCountNonAnsiComments * - * DESCRIPTION: Count the number of "//" comments. This type of comment is + * DESCRIPTION: Count the number of "//" comments. This type of comment is * non-ANSI C. * ******************************************************************************/ @@ -1136,7 +1218,7 @@ AsCountNonAnsiComments ( * * FUNCTION: AsCountSourceLines * - * DESCRIPTION: Count the number of C source lines. Defined by 1) not a + * DESCRIPTION: Count the number of C source lines. Defined by 1) not a * comment, and 2) not a blank line. * ******************************************************************************/ @@ -1444,5 +1526,3 @@ Exit: } } #endif - - diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c index d3257385ff9a..70be229928ea 100644 --- a/source/tools/acpisrc/asfile.c +++ b/source/tools/acpisrc/asfile.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asfile - Main module for the acpi source processor utility @@ -159,7 +158,7 @@ AsDoWildcard ( * * FUNCTION: AsProcessTree * - * DESCRIPTION: Process the directory tree. Files with the extension ".C" and + * DESCRIPTION: Process the directory tree. Files with the extension ".C" and * ".H" are processed as the tree is traversed. * ******************************************************************************/ @@ -188,7 +187,7 @@ AsProcessTree ( if (errno != EEXIST) { printf ("Could not create target directory\n"); - return -1; + return (-1); } } } @@ -223,7 +222,7 @@ AsProcessTree ( AsDoWildcard (ConversionTable, SourcePath, TargetPath, MaxPathLength, FILE_TYPE_DIRECTORY, "*"); - return 0; + return (0); } @@ -247,7 +246,7 @@ AsDetectLoneLineFeeds ( if (!Buffer[0]) { - return FALSE; + return (FALSE); } while (Buffer[i]) @@ -277,7 +276,7 @@ AsDetectLoneLineFeeds ( { printf ("%s: %u lone linefeeds in file\n", Filename, LfCount); } - return TRUE; + return (TRUE); } return (FALSE); @@ -340,6 +339,12 @@ AsConvertFile ( VERBOSE_PRINT (("Processing %u bytes\n", (unsigned int) strlen (FileBuffer))); + if (Gbl_Cleanup) + { + AsRemoveExtraLines (FileBuffer, Filename); + AsRemoveSpacesAfterPeriod (FileBuffer, Filename); + } + if (ConversionTable->LowerCaseTable) { for (i = 0; ConversionTable->LowerCaseTable[i].Identifier; i++) @@ -514,7 +519,7 @@ AsConvertFile ( * * FUNCTION: AsProcessOneFile * - * DESCRIPTION: Process one source file. The file is opened, read entirely + * DESCRIPTION: Process one source file. The file is opened, read entirely * into a buffer, converted, then written to a new file. * ******************************************************************************/ @@ -538,7 +543,7 @@ AsProcessOneFile ( if (!Pathname) { printf ("Could not allocate buffer for file pathnames\n"); - return -1; + return (-1); } Gbl_FileType = FileType; @@ -555,7 +560,7 @@ AsProcessOneFile ( if (AsGetFile (Pathname, &Gbl_FileBuffer, &Gbl_FileSize)) { - return -1; + return (-1); } Gbl_HeaderSize = 0; @@ -597,7 +602,7 @@ AsProcessOneFile ( if (!OutPathname) { printf ("Could not allocate buffer for file pathnames\n"); - return -1; + return (-1); } strcpy (OutPathname, TargetPath); @@ -618,7 +623,7 @@ AsProcessOneFile ( free (OutPathname); } - return 0; + return (0); } @@ -626,7 +631,7 @@ AsProcessOneFile ( * * FUNCTION: AsCheckForDirectory * - * DESCRIPTION: Check if the current file is a valid directory. If not, + * DESCRIPTION: Check if the current file is a valid directory. If not, * construct the full pathname for the source and target paths. * Checks for the dot and dot-dot files (they are ignored) * @@ -647,14 +652,14 @@ AsCheckForDirectory ( if (!(strcmp (Filename, ".")) || !(strcmp (Filename, ".."))) { - return -1; + return (-1); } SrcPath = calloc (strlen (SourceDirPath) + strlen (Filename) + 2, 1); if (!SrcPath) { printf ("Could not allocate buffer for directory source pathname\n"); - return -1; + return (-1); } TgtPath = calloc (strlen (TargetDirPath) + strlen (Filename) + 2, 1); @@ -662,7 +667,7 @@ AsCheckForDirectory ( { printf ("Could not allocate buffer for directory target pathname\n"); free (SrcPath); - return -1; + return (-1); } strcpy (SrcPath, SourceDirPath); @@ -675,7 +680,7 @@ AsCheckForDirectory ( *SourcePath = SrcPath; *TargetPath = TgtPath; - return 0; + return (0); } @@ -705,7 +710,7 @@ AsGetFile ( if (!FileHandle) { printf ("Could not open %s\n", Filename); - return -1; + return (-1); } if (fstat (FileHandle, &Gbl_StatBuf)) @@ -745,7 +750,7 @@ AsGetFile ( Gbl_HasLoneLineFeeds = AsDetectLoneLineFeeds (Filename, Buffer); /* - * Convert all CR/LF pairs to LF only. We do this locally so that + * Convert all CR/LF pairs to LF only. We do this locally so that * this code is portable across operating systems. */ AsConvertToLineFeeds (Buffer); @@ -753,13 +758,13 @@ AsGetFile ( *FileBuffer = Buffer; *FileSize = Size; - return 0; + return (0); ErrorExit: close (FileHandle); - return -1; + return (-1); } @@ -768,7 +773,7 @@ ErrorExit: * FUNCTION: AsPutFile * * DESCRIPTION: Create a new output file and write the entire contents of the - * buffer to the new file. Buffer must be a zero terminated string + * buffer to the new file. Buffer must be a zero terminated string * ******************************************************************************/ @@ -799,7 +804,7 @@ AsPutFile ( { perror ("Could not create destination file"); printf ("Could not create destination file \"%s\"\n", Pathname); - return -1; + return (-1); } /* Write the buffer to the file */ @@ -809,7 +814,5 @@ AsPutFile ( close (DestHandle); - return 0; + return (0); } - - diff --git a/source/tools/acpisrc/asmain.c b/source/tools/acpisrc/asmain.c index e36855b5d872..2e38e3481f57 100644 --- a/source/tools/acpisrc/asmain.c +++ b/source/tools/acpisrc/asmain.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asmain - Main module for the acpi source processor utility @@ -97,6 +96,7 @@ BOOLEAN Gbl_Overwrite = FALSE; BOOLEAN Gbl_WidenDeclarations = FALSE; BOOLEAN Gbl_IgnoreLoneLineFeeds = FALSE; BOOLEAN Gbl_HasLoneLineFeeds = FALSE; +BOOLEAN Gbl_Cleanup = FALSE; /****************************************************************************** @@ -154,7 +154,7 @@ AsExaminePaths ( if (Status) { printf ("Source path \"%s\" does not exist\n", Source); - return -1; + return (-1); } /* Return the filetype -- file or a directory */ @@ -171,7 +171,7 @@ AsExaminePaths ( if ((ConversionTable->Flags & FLG_NO_FILE_OUTPUT) || (Gbl_BatchMode)) { - return 0; + return (0); } if (!AsStricmp (Source, Target)) @@ -183,7 +183,7 @@ AsExaminePaths ( if (Response != 'y') { - return -1; + return (-1); } Gbl_Overwrite = TRUE; @@ -200,12 +200,12 @@ AsExaminePaths ( if (Response != 'y') { - return -1; + return (-1); } } } - return 0; + return (0); } @@ -325,7 +325,7 @@ main ( if (argc < 2) { AsDisplayUsage (); - return 0; + return (0); } /* Command line options */ @@ -346,6 +346,7 @@ main ( printf ("Code cleanup\n"); ConversionTable = &CleanupConversionTable; + Gbl_Cleanup = TRUE; break; case 'h': @@ -393,7 +394,7 @@ main ( default: AsDisplayUsage (); - return -1; + return (-1); } @@ -402,14 +403,14 @@ main ( { printf ("Missing source path\n"); AsDisplayUsage (); - return -1; + return (-1); } TargetPath = argv[AcpiGbl_Optind+1]; if (!ConversionTable) { - /* Just generate statistics. Ignore target path */ + /* Just generate statistics. Ignore target path */ TargetPath = SourcePath; @@ -430,7 +431,7 @@ main ( if (AsExaminePaths (ConversionTable, SourcePath, TargetPath, &FileType)) { - return -1; + return (-1); } /* Source/target can be either directories or a files */ @@ -461,5 +462,5 @@ main ( AsDisplayStats (); - return 0; + return (0); } diff --git a/source/tools/acpisrc/asremove.c b/source/tools/acpisrc/asremove.c index 8fe29e158a2a..54da0af0b191 100644 --- a/source/tools/acpisrc/asremove.c +++ b/source/tools/acpisrc/asremove.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asremove - Source conversion - removal functions @@ -59,7 +58,7 @@ AsRemoveStatement ( * * DESCRIPTION: Remove all statements that contain the given keyword. * Limitations: Removes text from the start of the line that - * contains the keyword to the next semicolon. Currently + * contains the keyword to the next semicolon. Currently * doesn't ignore comments. * ******************************************************************************/ @@ -297,7 +296,7 @@ AsRemoveConditionalCompile ( * * FUNCTION: AsRemoveMacro * - * DESCRIPTION: Remove every line that contains the keyword. Does not + * DESCRIPTION: Remove every line that contains the keyword. Does not * skip comments. * ******************************************************************************/ @@ -368,7 +367,7 @@ AsRemoveMacro ( * * FUNCTION: AsRemoveLine * - * DESCRIPTION: Remove every line that contains the keyword. Does not + * DESCRIPTION: Remove every line that contains the keyword. Does not * skip comments. * ******************************************************************************/ @@ -459,7 +458,7 @@ AsReduceTypedefs ( } SubString++; - /* Find the closing brace. Handles nested braces */ + /* Find the closing brace. Handles nested braces */ NestLevel = 1; while (*SubString) @@ -505,7 +504,7 @@ AsReduceTypedefs ( * * FUNCTION: AsRemoveEmptyBlocks * - * DESCRIPTION: Remove any C blocks (e.g., if {}) that contain no code. This + * DESCRIPTION: Remove any C blocks (e.g., if {}) that contain no code. This * can happen as a result of removing lines such as DEBUG_PRINT. * ******************************************************************************/ @@ -612,5 +611,3 @@ AsRemoveDebugMacros ( AsReplaceString ("return_acpi_status", "return", REPLACE_WHOLE_WORD, Buffer); AsReplaceString ("return_VALUE", "return", REPLACE_WHOLE_WORD, Buffer); } - - diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c index 3159b4435074..fa04e8b64475 100644 --- a/source/tools/acpisrc/astable.c +++ b/source/tools/acpisrc/astable.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: astable - Tables used for source conversion @@ -206,8 +205,6 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_DEBUG_MEM_HEADER", SRC_TYPE_STRUCT}, {"ACPI_DEBUG_PRINT_INFO", SRC_TYPE_STRUCT}, {"ACPI_DESCRIPTOR", SRC_TYPE_UNION}, - {"ACPI_DEVICE_ID", SRC_TYPE_STRUCT}, - {"ACPI_DEVICE_ID_LIST", SRC_TYPE_STRUCT}, {"ACPI_DEVICE_INFO", SRC_TYPE_STRUCT}, {"ACPI_DEVICE_WALK_INFO", SRC_TYPE_STRUCT}, {"ACPI_DMTABLE_DATA", SRC_TYPE_STRUCT}, @@ -331,6 +328,8 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_PKG_INFO", SRC_TYPE_STRUCT}, {"ACPI_PKG_STATE", SRC_TYPE_STRUCT}, {"ACPI_PMTT_HEADER", SRC_TYPE_STRUCT}, + {"ACPI_PNP_DEVICE_ID", SRC_TYPE_STRUCT}, + {"ACPI_PNP_DEVICE_ID_LIST", SRC_TYPE_STRUCT}, {"ACPI_POINTER", SRC_TYPE_STRUCT}, {"ACPI_POINTERS", SRC_TYPE_UNION}, {"ACPI_PORT_INFO", SRC_TYPE_STRUCT}, @@ -818,10 +817,12 @@ ACPI_CONVERSION_TABLE LicenseConversionTable = { ACPI_STRING_TABLE CustomReplacements[] = { - {"(c) 1999 - 2012", "(c) 1999 - 2012", REPLACE_WHOLE_WORD}, /* Main ACPICA source */ - {"(c) 2006 - 2012", "(c) 2006 - 2012", REPLACE_WHOLE_WORD}, /* Test suites */ - #if 0 + {"SUPPORT, ASSISTANCE", "SUPPORT, ASSISTANCE", REPLACE_WHOLE_WORD}, /* Fix intel header */ + + {"(c) 1999 - 2012", "(c) 1999 - 2012", REPLACE_WHOLE_WORD}, /* Main ACPICA source */ + {"(c) 2006 - 2012", "(c) 2006 - 2012", REPLACE_WHOLE_WORD}, /* Test suites */ + {"(ACPI_INTEGER)", "(UINT64)", REPLACE_WHOLE_WORD}, {"ACPI_INTEGER ", "UINT64 ", REPLACE_WHOLE_WORD}, {"ACPI_INTEGER", "UINT64", REPLACE_WHOLE_WORD}, @@ -894,4 +895,3 @@ ACPI_CONVERSION_TABLE CustomConversionTable = { (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES | CVT_TRIM_LINES | CVT_TRIM_WHITESPACE), }; - diff --git a/source/tools/acpisrc/asutils.c b/source/tools/acpisrc/asutils.c index a596ea8cee06..f3d9350a3108 100644 --- a/source/tools/acpisrc/asutils.c +++ b/source/tools/acpisrc/asutils.c @@ -1,4 +1,3 @@ - /****************************************************************************** * * Module Name: asutils - common utilities @@ -63,7 +62,7 @@ AsSkipUntilChar ( { if (!*Buffer) { - return NULL; + return (NULL); } Buffer++; @@ -92,7 +91,7 @@ AsSkipPastChar ( { if (!*Buffer) { - return NULL; + return (NULL); } Buffer++; @@ -110,7 +109,7 @@ AsSkipPastChar ( * * DESCRIPTION: This function inserts and removes data from the file buffer. * if more data is inserted than is removed, the data in the buffer - * is moved to make room. If less data is inserted than is removed, + * is moved to make room. If less data is inserted than is removed, * the remaining data is moved to close the hole. * ******************************************************************************/ @@ -163,7 +162,7 @@ AsReplaceData ( * * DESCRIPTION: This function inserts and removes data from the file buffer. * if more data is inserted than is removed, the data in the buffer - * is moved to make room. If less data is inserted than is removed, + * is moved to make room. If less data is inserted than is removed, * the remaining data is moved to close the hole. * ******************************************************************************/ @@ -208,7 +207,7 @@ AsInsertData ( * * DESCRIPTION: This function inserts and removes data from the file buffer. * if more data is inserted than is removed, the data in the buffer - * is moved to make room. If less data is inserted than is removed, + * is moved to make room. If less data is inserted than is removed, * the remaining data is moved to close the hole. * ******************************************************************************/ @@ -231,4 +230,3 @@ AsRemoveData ( return (StartPointer); } - diff --git a/source/tools/acpixtract/acpixtract.c b/source/tools/acpixtract/acpixtract.c index 85ce346af152..ef5b28a1d91b 100644 --- a/source/tools/acpixtract/acpixtract.c +++ b/source/tools/acpixtract/acpixtract.c @@ -352,7 +352,7 @@ AxCountTableInstances ( } AxNormalizeSignature (InstanceBuffer); - if (!strncmp (InstanceBuffer, Signature, 4)) + if (ACPI_COMPARE_NAME (InstanceBuffer, Signature)) { Instances++; } @@ -527,13 +527,13 @@ AxExtractTables ( } AxNormalizeSignature (LineBuffer); - strncpy (ThisSignature, LineBuffer, 4); + ACPI_MOVE_NAME (ThisSignature, LineBuffer); if (Signature) { /* Ignore signatures that don't match */ - if (strncmp (ThisSignature, Signature, 4)) + if (!ACPI_COMPARE_NAME (ThisSignature, Signature)) { continue; } @@ -716,7 +716,7 @@ AxListTables ( /* FACS has only signature and length */ - if (!strncmp (TableHeader->Signature, "FACS", 4)) + if (ACPI_COMPARE_NAME (TableHeader->Signature, "FACS")) { printf ("\n"); continue; |