diff options
| author | Bob Moore <robert.moore@intel.com> | 2012-05-22 12:26:53 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-06-01 19:51:52 +0400 |
| commit | c6e1733e6fc384ff1a219d7dfcb8b072030ae792 (patch) | |
| tree | ae21cf8ec14697e9c030fda0d18f51e16372e9d1 | |
| parent | 43e1c6892c88ae0730cb0eb7bd5a2812b960c32a (diff) | |
| download | linux-c6e1733e6fc384ff1a219d7dfcb8b072030ae792.tar.xz | |
ACPICA: iASL: Improved pathname support
For include files, merge the prefix pathname with the file
pathname. Convert backslashes in all pathnames to forward
slashes, for readability. Include file pathname changes affect
both #include and Include() type operators.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/acpica/acutils.h | 2 | ||||
| -rw-r--r-- | drivers/acpi/acpica/utmisc.c | 29 |
2 files changed, 31 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acutils.h b/drivers/acpi/acpica/acutils.h index 925ccf22101b..5035327ebccc 100644 --- a/drivers/acpi/acpica/acutils.h +++ b/drivers/acpi/acpica/acutils.h @@ -460,6 +460,8 @@ acpi_ut_short_divide(u64 in_dividend, /* * utmisc */ +void ut_convert_backslashes(char *pathname); + const char *acpi_ut_validate_exception(acpi_status status); u8 acpi_ut_is_pci_root_bridge(char *id); diff --git a/drivers/acpi/acpica/utmisc.c b/drivers/acpi/acpica/utmisc.c index 86f19db74e05..e86f897767e8 100644 --- a/drivers/acpi/acpica/utmisc.c +++ b/drivers/acpi/acpica/utmisc.c @@ -52,6 +52,34 @@ ACPI_MODULE_NAME("utmisc") /******************************************************************************* * + * FUNCTION: ut_convert_backslashes + * + * PARAMETERS: Pathname - File pathname string to be converted + * + * RETURN: Modifies the input Pathname + * + * DESCRIPTION: Convert all backslashes (0x5C) to forward slashes (0x2F) within + * the entire input file pathname string. + * + ******************************************************************************/ +void ut_convert_backslashes(char *pathname) +{ + + if (!pathname) { + return; + } + + while (*pathname) { + if (*pathname == '\\') { + *pathname = '/'; + } + + pathname++; + } +} + +/******************************************************************************* + * * FUNCTION: acpi_ut_validate_exception * * PARAMETERS: Status - The acpi_status code to be formatted @@ -63,6 +91,7 @@ ACPI_MODULE_NAME("utmisc") * an ASCII string. * ******************************************************************************/ + const char *acpi_ut_validate_exception(acpi_status status) { u32 sub_status; |