4c4
< * $Revision: 37 $
---
> * $Revision: 40 $
160c160
< DEBUG_PRINTP (TRACE_DISPATCH, ("Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", Op, WalkState));
187,188c187,188
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("State=%p Op=%p Type=%x\n", WalkState, Op, DataType));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "State=%p Op=%p Type=%x\n", WalkState, Op, DataType));
193,194c193,194
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("State=%p Op=%p Type=%x\n", WalkState, Op, DataType));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "State=%p Op=%p Type=%x\n", WalkState, Op, DataType));
264c264
< DEBUG_PRINT (TRACE_DISPATCH, ("Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", Op, WalkState));
296c296
< DEBUG_PRINTP (TRACE_DISPATCH, ("(%s): Popping scope for Op %p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "(%s): Popping scope for Op %p\n",
336c336
< DEBUG_PRINTP (TRACE_DISPATCH, ("Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", Op, WalkState));
391,392c391,392
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("State=%p Op=%p Type=%x\n", WalkState, Op, DataType));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "State=%p Op=%p Type=%x\n", WalkState, Op, DataType));
409,412c409,410
< Status = AcpiNsLookup (WalkState->ScopeInfo, BufferPtr,
< DataType, IMODE_EXECUTE,
< NS_SEARCH_PARENT, WalkState,
< &(Node));
---
> Status = AcpiNsLookup (WalkState->ScopeInfo, BufferPtr, DataType,
> IMODE_EXECUTE, NS_SEARCH_PARENT, WalkState, &(Node));
424,426c422
< Status = AcpiDsScopeStackPush (Node,
< DataType,
< WalkState);
---
> Status = AcpiDsScopeStackPush (Node, DataType, WalkState);
472c468
< DEBUG_PRINTP (ACPI_INFO, ("old %p new %p\n", Original, Node));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "old %p new %p\n", Original, Node));
476,477c472,473
< DEBUG_PRINTP (ACPI_INFO,
< ("Lookup match error: old %p new %p\n", Original, Node));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
> "Lookup match error: old %p new %p\n", Original, Node));
514c510
< DEBUG_PRINTP (TRACE_DISPATCH, ("Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Op=%p State=%p\n", Op, WalkState));
523,524c519,520
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("Ending scope Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "Ending scope Op=%p State=%p\n", Op, WalkState));
528c524
< DEBUG_PRINTP (ACPI_ERROR, ("Unnamed scope! Op=%p State=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Unnamed scope! Op=%p State=%p\n",
556c552
< DEBUG_PRINTP (TRACE_DISPATCH, ("(%s) Popping scope for Op %p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "(%s) Popping scope for Op %p\n",
609,610c605,606
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("CreateXxxField: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "CreateXxxField: State=%p Op=%p NamedObj=%p\n",
670,671c666,667
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("RESOLVING-MethodCall: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "RESOLVING-MethodCall: State=%p Op=%p NamedObj=%p\n",
706,707c702,703
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-Processor: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-Processor: State=%p Op=%p NamedObj=%p\n",
716,717c712,713
< DEBUG_PRINT (TRACE_DISPATCH,
< ("Completed Processor Init, Op=%p State=%p entry=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "Completed Processor Init, Op=%p State=%p entry=%p\n",
726,727c722,723
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-PowerResource: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-PowerResource: State=%p Op=%p NamedObj=%p\n",
736,737c732,733
< DEBUG_PRINT (TRACE_DISPATCH,
< ("Completed PowerResource Init, Op=%p State=%p entry=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "Completed PowerResource Init, Op=%p State=%p entry=%p\n",
746,747c742,743
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-ThermalZone: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-ThermalZone: State=%p Op=%p NamedObj=%p\n",
754,755c750,751
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-Field: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-Field: State=%p Op=%p NamedObj=%p\n",
766,767c762,763
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-IndexField: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-IndexField: State=%p Op=%p NamedObj=%p\n",
779,780c775,776
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-BankField: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-BankField: State=%p Op=%p NamedObj=%p\n",
793,794c789,790
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-Method: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-Method: State=%p Op=%p NamedObj=%p\n",
801c797
< Arg->Value.Integer, Node);
---
> Arg->Value.Integer32, Node);
808,809c804,805
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-Mutex: Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-Mutex: Op=%p State=%p\n", Op, WalkState));
823,824c819,820
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-Event: Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-Event: Op=%p State=%p\n", Op, WalkState));
843,844c839,840
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-Opregion: Op=%p State=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-Opregion: Op=%p State=%p NamedObj=%p\n",
855,856c851,852
< DEBUG_PRINT (TRACE_DISPATCH,
< ("Completed OpRegion Init, Op=%p State=%p entry=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "Completed OpRegion Init, Op=%p State=%p entry=%p\n",
865,866c861,862
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-Alias: Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-Alias: Op=%p State=%p\n", Op, WalkState));
880,881c876,877
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-Name: Op=%p State=%p\n", Op, WalkState));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-Name: Op=%p State=%p\n", Op, WalkState));
888d883
<
899,900c894,895
< DEBUG_PRINTP (TRACE_DISPATCH,
< ("LOADING-NamePath object: State=%p Op=%p NamedObj=%p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
> "LOADING-NamePath object: State=%p Op=%p NamedObj=%p\n",