Print this page
acpica-unix2-20130823
PANKOVs restructure

*** 3,13 **** * Module Name: dmnames - AML disassembler, names, namestrings, pathnames * ******************************************************************************/ /* ! * 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: dmnames - AML disassembler, names, namestrings, pathnames * ******************************************************************************/ /* ! * Copyright (C) 2000 - 2013, 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:
*** 42,52 **** */ #include "acpi.h" #include "accommon.h" - #include "acparser.h" #include "amlcode.h" #include "acnamesp.h" #include "acdisasm.h" --- 42,51 ----
*** 224,234 **** return; } /* Handle all Scope Prefix operators */ ! while (AcpiPsIsPrefixChar (ACPI_GET8 (Name))) { /* Append prefix character */ AcpiOsPrintf ("%1c", ACPI_GET8 (Name)); Name++; --- 223,234 ---- return; } /* Handle all Scope Prefix operators */ ! while (ACPI_IS_ROOT_PREFIX (ACPI_GET8 (Name)) || ! ACPI_IS_PARENT_PREFIX (ACPI_GET8 (Name))) { /* Append prefix character */ AcpiOsPrintf ("%1c", ACPI_GET8 (Name)); Name++;
*** 235,258 **** --- 235,262 ---- } switch (ACPI_GET8 (Name)) { case 0: + SegCount = 0; break; case AML_DUAL_NAME_PREFIX: + SegCount = 2; Name++; break; case AML_MULTI_NAME_PREFIX_OP: + SegCount = (UINT32) ACPI_GET8 (Name + 1); Name += 2; break; default: + SegCount = 1; break; } while (SegCount)
*** 321,331 **** NamePath = AcpiPsGetArg (Op, 2); } if ((NamePath) && (NamePath->Common.Value.String) && ! (NamePath->Common.Value.String[0] == '\\')) { AcpiDmNamestring (NamePath->Common.Value.String); return; } } --- 325,335 ---- NamePath = AcpiPsGetArg (Op, 2); } if ((NamePath) && (NamePath->Common.Value.String) && ! (ACPI_IS_ROOT_PREFIX (NamePath->Common.Value.String[0]))) { AcpiDmNamestring (NamePath->Common.Value.String); return; } }
*** 447,453 **** } } #endif #endif - - --- 451,455 ----