From 7e489a2fdd8d7900946b032e93ca626907357c53 Mon Sep 17 00:00:00 2001 From: Takanori Watanabe Date: Tue, 23 Oct 2001 14:54:15 +0000 Subject: [PATCH] Collect multi name handling. Reported by : Stephan Kulow --- usr.sbin/acpi/acpidump/asl_dump.c | 2 ++ usr.sbin/acpi/amldb/aml/aml_parse.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/usr.sbin/acpi/acpidump/asl_dump.c b/usr.sbin/acpi/acpidump/asl_dump.c index 58f71f643459..25f6777aed71 100644 --- a/usr.sbin/acpi/acpidump/asl_dump.c +++ b/usr.sbin/acpi/acpidump/asl_dump.c @@ -371,6 +371,7 @@ asl_dump_field(u_int8_t **dpp, u_int32_t offset) case 'A' ... 'Z': case '_': case '.': + case '/': name = asl_dump_namestring(&dp); width = asl_dump_pkglength(&dp); offset += width; @@ -751,6 +752,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent) case 'A' ... 'Z': case '_': case '.': + case '/': dp--; print_namestring((name = asl_dump_namestring(&dp))); if (scope_within_method == 1) { diff --git a/usr.sbin/acpi/amldb/aml/aml_parse.c b/usr.sbin/acpi/amldb/aml/aml_parse.c index 348c616a7a78..83eb34fd8703 100644 --- a/usr.sbin/acpi/amldb/aml/aml_parse.c +++ b/usr.sbin/acpi/amldb/aml/aml_parse.c @@ -703,6 +703,7 @@ aml_parse_field(struct aml_environ *env, struct aml_field *template) case 'A'...'Z': case '_': case '.': + case '/': name = aml_parse_namestring(env); width = aml_parse_pkglength(env); template->bitlen = width; @@ -1309,6 +1310,7 @@ aml_parse_termobj(struct aml_environ *env, int indent) case 'A' ... 'Z': case '_': case '.': + case '/': env->dp--; ret->type = aml_t_namestr; ret->nstr.dp = aml_parse_namestring(env);