aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorErik Schmauss <erik.schmauss@intel.com>2019-10-25 14:36:57 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-10-28 22:12:46 +0100
commit760935064252d7a897707539bc4fb84e31f11829 (patch)
treed4d8af678adf1fdf4afa2566d8dc0315f4de0c1b /drivers/acpi
parentACPICA: debugger: surround field unit output with braces '{' (diff)
downloadlinux-dev-760935064252d7a897707539bc4fb84e31f11829.tar.xz
linux-dev-760935064252d7a897707539bc4fb84e31f11829.zip
ACPICA: debugger: add field unit support for acpi_db_get_next_token
ACPICA commit d509afa88e9415f13a3283c38ce9ee034634ae24 Since field unit data output from the debugger are now surrounded by braces '{', support has been added to acpi_db_get_next_token to recognize strings beginning with this character as a ACPI_TYPE_FIELD_UNIT. Link: https://github.com/acpica/acpica/commit/d509afa8 Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/dbinput.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/dbinput.c b/drivers/acpi/acpica/dbinput.c
index 44d6d7246e6e..e1632b340182 100644
--- a/drivers/acpi/acpica/dbinput.c
+++ b/drivers/acpi/acpica/dbinput.c
@@ -511,6 +511,21 @@ char *acpi_db_get_next_token(char *string,
}
break;
+ case '{':
+
+ /* This is the start of a field unit, scan until closing brace */
+
+ string++;
+ start = string;
+ type = ACPI_TYPE_FIELD_UNIT;
+
+ /* Find end of buffer */
+
+ while (*string && (*string != '}')) {
+ string++;
+ }
+ break;
+
case '[':
/* This is the start of a package, scan until closing bracket */