Hi,
This diff removes the second argument of aml_showvalue which was
probably supposed to set the verbosity level through dnprintf() but in
fact it does nothing.
OK?
Index: acpicpu.c
===================================================================
RCS file: /cvs/src/sys/dev/acpi/acpicpu.c,v
retrieving revision 1.75
diff -u -p -u -p -r1.75 acpicpu.c
--- acpicpu.c 28 Jul 2016 21:57:56 -0000 1.75
+++ acpicpu.c 2 Sep 2016 13:44:42 -0000
@@ -368,7 +368,7 @@ acpicpu_add_cstatepkg(struct aml_value *
int state, method, flags;
#if defined(ACPI_DEBUG) && !defined(SMALL_KERNEL)
- aml_showvalue(val, 0);
+ aml_showvalue(val);
#endif
if (val->type != AML_OBJTYPE_PACKAGE || val->length != 4)
return;
@@ -468,7 +468,7 @@ void
acpicpu_add_cdeppkg(struct aml_value *val, void *arg)
{
#if 1 || defined(ACPI_DEBUG) && !defined(SMALL_KERNEL)
- aml_showvalue(val, 0);
+ aml_showvalue(val);
#endif
if (val->type != AML_OBJTYPE_PACKAGE || val->length < 6 ||
val->length != val->v_package[0]->v_integer) {
Index: dsdt.c
===================================================================
RCS file: /cvs/src/sys/dev/acpi/dsdt.c,v
retrieving revision 1.223
diff -u -p -u -p -r1.223 dsdt.c
--- dsdt.c 8 May 2016 11:08:01 -0000 1.223
+++ dsdt.c 2 Sep 2016 13:44:45 -0000
@@ -289,14 +289,14 @@ _aml_die(const char *fn, int line, const
sp = aml_getstack(root, AMLOP_ARG0+idx);
if (sp && sp->type) {
printf(" arg%d: ", idx);
- aml_showvalue(sp, 0);
+ aml_showvalue(sp);
}
}
for (idx = 0; idx < AML_MAX_LOCAL; idx++) {
sp = aml_getstack(root, AMLOP_LOCAL0+idx);
if (sp && sp->type) {
printf(" local%d: ", idx);
- aml_showvalue(sp, 0);
+ aml_showvalue(sp);
}
}
}
@@ -786,7 +786,7 @@ aml_unlockfield(struct aml_scope *scope,
#ifndef SMALL_KERNEL
void
-aml_showvalue(struct aml_value *val, int lvl)
+aml_showvalue(struct aml_value *val)
{
int idx;
@@ -809,7 +809,7 @@ aml_showvalue(struct aml_value *val, int
case AML_OBJTYPE_PACKAGE:
printf(" package: %.2x\n", val->length);
for (idx = 0; idx < val->length; idx++)
- aml_showvalue(val->v_package[idx], lvl);
+ aml_showvalue(val->v_package[idx]);
break;
case AML_OBJTYPE_BUFFER:
printf(" buffer: %.2x {", val->length);
@@ -862,7 +862,7 @@ aml_showvalue(struct aml_value *val, int
case AML_OBJTYPE_OBJREF:
printf(" objref: %p index:%x opcode:%s\n", val->v_objref.ref,
val->v_objref.index, aml_mnem(val->v_objref.type, 0));
- aml_showvalue(val->v_objref.ref, lvl);
+ aml_showvalue(val->v_objref.ref);
break;
default:
printf(" !!type: %x\n", val->type);
@@ -1855,14 +1855,14 @@ aml_showstack(struct aml_scope *scope)
sp = aml_getstack(scope, AMLOP_ARG0+idx);
if (sp && sp->type) {
dnprintf(10," Arg%d: ", idx);
- aml_showvalue(sp, 10);
+ aml_showvalue(sp);
}
}
for (idx=0; scope->locals && idx<8; idx++) {
sp = aml_getstack(scope, AMLOP_LOCAL0+idx);
if (sp && sp->type) {
dnprintf(10," Local%d: ", idx);
- aml_showvalue(sp, 10);
+ aml_showvalue(sp);
}
}
}
@@ -2070,7 +2070,7 @@ aml_convert(struct aml_value *a, int cty
}
if (c == NULL) {
#ifndef SMALL_KERNEL
- aml_showvalue(a, 0);
+ aml_showvalue(a);
#endif
aml_die("Could not convert %x to %x\n", a->type, ctype);
}
@@ -3174,7 +3174,7 @@ aml_eval(struct aml_scope *scope, struct
dnprintf(10,"\n--==Finished evaluating method: %s %c\n",
aml_nodename(tmp->node), ret_type);
#ifdef ACPI_DEBUG
- aml_showvalue(my_ret, 0);
+ aml_showvalue(my_ret);
aml_showstack(ms);
#endif
aml_popscope(ms);
@@ -3189,7 +3189,7 @@ aml_eval(struct aml_scope *scope, struct
}
if (ret_type == 'i' && my_ret && my_ret->type != AML_OBJTYPE_INTEGER) {
#ifndef SMALL_KERNEL
- aml_showvalue(my_ret, 8-100);
+ aml_showvalue(my_ret);
#endif
aml_die("Not Integer");
}
@@ -3725,7 +3725,7 @@ aml_parse(struct aml_scope *scope, int r
idx = opargs[1]->v_integer;
if (idx >= opargs[0]->length || idx < 0) {
#ifndef SMALL_KERNEL
- aml_showvalue(opargs[0], 0);
+ aml_showvalue(opargs[0]);
#endif
aml_die("Index out of bounds %d/%d\n", idx,
opargs[0]->length);
Index: dsdt.h
===================================================================
RCS file: /cvs/src/sys/dev/acpi/dsdt.h,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 dsdt.h
--- dsdt.h 8 May 2016 00:03:12 -0000 1.71
+++ dsdt.h 2 Sep 2016 13:44:45 -0000
@@ -49,7 +49,7 @@ struct aml_value *aml_getstack(struct am
struct aml_value *aml_allocvalue(int, int64_t, const void *);
void aml_freevalue(struct aml_value *);
void aml_notify(struct aml_node *, int);
-void aml_showvalue(struct aml_value *, int);
+void aml_showvalue(struct aml_value *);
void aml_walkroot(void);
void aml_walktree(struct aml_node *);
