Print this page
update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure

*** 3,13 **** * Module Name: nswalk - Functions for walking the ACPI namespace * *****************************************************************************/ /* ! * Copyright (C) 2000 - 2011, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: --- 3,13 ---- * Module Name: nswalk - Functions for walking the ACPI namespace * *****************************************************************************/ /* ! * Copyright (C) 2000 - 2014, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met:
*** 163,175 **** * PARAMETERS: Type - ACPI_OBJECT_TYPE to search for * StartNode - Handle in namespace where search begins * MaxDepth - Depth to which search is to reach * Flags - Whether to unlock the NS before invoking * the callback routine ! * PreOrderVisit - Called during tree pre-order visit * when an object of "Type" is found ! * PostOrderVisit - Called during tree post-order visit * when an object of "Type" is found * Context - Passed to user function(s) above * ReturnValue - from the UserFunction if terminated * early. Otherwise, returns NULL. * RETURNS: Status --- 163,175 ---- * PARAMETERS: Type - ACPI_OBJECT_TYPE to search for * StartNode - Handle in namespace where search begins * MaxDepth - Depth to which search is to reach * Flags - Whether to unlock the NS before invoking * the callback routine ! * DescendingCallback - Called during tree descent * when an object of "Type" is found ! * AscendingCallback - Called during tree ascent * when an object of "Type" is found * Context - Passed to user function(s) above * ReturnValue - from the UserFunction if terminated * early. Otherwise, returns NULL. * RETURNS: Status
*** 193,204 **** AcpiNsWalkNamespace ( ACPI_OBJECT_TYPE Type, ACPI_HANDLE StartNode, UINT32 MaxDepth, UINT32 Flags, ! ACPI_WALK_CALLBACK PreOrderVisit, ! ACPI_WALK_CALLBACK PostOrderVisit, void *Context, void **ReturnValue) { ACPI_STATUS Status; ACPI_STATUS MutexStatus; --- 193,204 ---- AcpiNsWalkNamespace ( ACPI_OBJECT_TYPE Type, ACPI_HANDLE StartNode, UINT32 MaxDepth, UINT32 Flags, ! ACPI_WALK_CALLBACK DescendingCallback, ! ACPI_WALK_CALLBACK AscendingCallback, void *Context, void **ReturnValue) { ACPI_STATUS Status; ACPI_STATUS MutexStatus;
*** 272,297 **** return_ACPI_STATUS (MutexStatus); } } /* ! * Invoke the user function, either pre-order or post-order * or both. */ if (!NodePreviouslyVisited) { ! if (PreOrderVisit) { ! Status = PreOrderVisit (ChildNode, Level, Context, ReturnValue); } } else { ! if (PostOrderVisit) { ! Status = PostOrderVisit (ChildNode, Level, Context, ReturnValue); } } if (Flags & ACPI_NS_WALK_UNLOCK) --- 272,297 ---- return_ACPI_STATUS (MutexStatus); } } /* ! * Invoke the user function, either descending, ascending, * or both. */ if (!NodePreviouslyVisited) { ! if (DescendingCallback) { ! Status = DescendingCallback (ChildNode, Level, Context, ReturnValue); } } else { ! if (AscendingCallback) { ! Status = AscendingCallback (ChildNode, Level, Context, ReturnValue); } } if (Flags & ACPI_NS_WALK_UNLOCK)
*** 380,386 **** /* Complete walk, not terminated by user function */ return_ACPI_STATUS (AE_OK); } - - --- 380,384 ----