Make acpi_getpropint() return uint64_t, as ACPI integers are in fact that

wide and some _DSD properties depend on it.

ok kettenis@

diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 3f5d8ea..65b53fb 100644 (file)
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.404 2022/01/04 13:40:58 patrick Exp $ */
+/* $OpenBSD: acpi.c,v 1.405 2022/01/12 11:18:30 patrick Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -3015,8 +3015,8 @@ acpi_getprop(struct aml_node *node, const char *prop, void *buf, int buflen)
        return -1;
 }
 
-uint32_t
-acpi_getpropint(struct aml_node *node, const char *prop, uint32_t defval)
+uint64_t
+acpi_getpropint(struct aml_node *node, const char *prop, uint64_t defval)
 {
        struct aml_value dsd;
        int i;

diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index 706a2ae..ff544e7 100644 (file)
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: acpivar.h,v 1.115 2021/12/26 13:55:36 kettenis Exp $  */
+/*     $OpenBSD: acpivar.h,v 1.116 2022/01/12 11:18:30 patrick Exp $   */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -386,7 +386,7 @@ int acpi_parsehid(struct aml_node *, void *, char *, char *, size_t);
 int64_t        acpi_getsta(struct acpi_softc *sc, struct aml_node *);
 
 int    acpi_getprop(struct aml_node *, const char *, void *, int);
-uint32_t acpi_getpropint(struct aml_node *, const char *, uint32_t);
+uint64_t acpi_getpropint(struct aml_node *, const char *, uint64_t);
 
 int    acpi_record_event(struct acpi_softc *, u_int);