Deleted Added
sdiff udiff text old ( 241973 ) new ( 243347 )
full compact
1/******************************************************************************
2 *
3 * Module Name: dmextern - Support for External() ASL statements
4 *
5 *****************************************************************************/
6
7/*
8 * Copyright (C) 2000 - 2012, Intel Corp.

--- 139 unchanged lines hidden (view full) ---

148AcpiDmNormalizeParentPrefix (
149 ACPI_PARSE_OBJECT *Op,
150 char *Path)
151{
152 ACPI_NAMESPACE_NODE *Node;
153 char *Fullpath;
154 char *ParentPath;
155 ACPI_SIZE Length;
156
157
158 /* Search upwards in the parse tree until we reach a namespace node */
159
160 while (Op)
161 {
162 if (Op->Common.Node)
163 {
164 break;
165 }
166
167 Op = Op->Common.Parent;

--- 32 unchanged lines hidden (view full) ---

200 Length = (ACPI_STRLEN (ParentPath) + ACPI_STRLEN (Path) + 1);
201 if (ParentPath[1])
202 {
203 /*
204 * If ParentPath is not just a simple '\', increment the length
205 * for the required dot separator (ParentPath.Path)
206 */
207 Length++;
208 }
209
210 Fullpath = ACPI_ALLOCATE_ZEROED (Length);
211 if (!Fullpath)
212 {
213 goto Cleanup;
214 }
215
216 /*
217 * Concatenate parent fullpath and path. For example,
218 * parent fullpath "\_SB_", Path "^INIT", Fullpath "\_SB_.INIT"
219 *
220 * Copy the parent path
221 */
222 ACPI_STRCAT (Fullpath, ParentPath);
223
224 /*
225 * Add dot separator
226 * (don't need dot if parent fullpath is a single backslash)
227 */
228 if (ParentPath[1])
229 {
230 ACPI_STRCAT (Fullpath, ".");

--- 130 unchanged lines hidden (view full) ---

361 ACPI_STATUS Status;
362
363
364 if (!Path)
365 {
366 return;
367 }
368
369 /* Externalize the ACPI path */
370
371 Status = AcpiNsExternalizeName (ACPI_UINT32_MAX, Path,
372 NULL, &ExternalPath);
373 if (ACPI_FAILURE (Status))
374 {
375 return;
376 }
377
378 /* Get the full pathname from root if "Path" has a parent prefix */
379
380 if (*Path == (UINT8) AML_PARENT_PREFIX)
381 {
382 Fullpath = AcpiDmNormalizeParentPrefix (Op, ExternalPath);
383 if (Fullpath)
384 {
385 /* Set new external path */
386
387 ACPI_FREE (ExternalPath);

--- 302 unchanged lines hidden ---