Module Name: src
Committed By: jmcneill
Date: Mon Dec 7 10:02:51 UTC 2020
Modified Files:
src/sys/dev/acpi: ahcisata_acpi.c amdccp_acpi.c atppc_acpi.c
dwiic_acpi.c ehci_acpi.c fdc_acpi.c genet_acpi.c lpt_acpi.c
mpu_acpi.c plgpio_acpi.c spic_acpi.c virtio_acpi.c wb_acpi.c
xhci_acpi.c
Log Message:
Fix 32-bit build.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/ahcisata_acpi.c \
src/sys/dev/acpi/plgpio_acpi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/amdccp_acpi.c \
src/sys/dev/acpi/dwiic_acpi.c src/sys/dev/acpi/ehci_acpi.c \
src/sys/dev/acpi/virtio_acpi.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/atppc_acpi.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/acpi/fdc_acpi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/genet_acpi.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/acpi/lpt_acpi.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/mpu_acpi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/spic_acpi.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/wb_acpi.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/xhci_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/ahcisata_acpi.c
diff -u src/sys/dev/acpi/ahcisata_acpi.c:1.5 src/sys/dev/acpi/ahcisata_acpi.c:1.6
--- src/sys/dev/acpi/ahcisata_acpi.c:1.5 Wed Apr 15 19:26:51 2020
+++ src/sys/dev/acpi/ahcisata_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_acpi.c,v 1.5 2020/04/15 19:26:51 jmcneill Exp $ */
+/* $NetBSD: ahcisata_acpi.c,v 1.6 2020/12/07 10:02:51 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_acpi.c,v 1.5 2020/04/15 19:26:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_acpi.c,v 1.6 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -112,7 +112,8 @@ ahcisata_acpi_attach(device_t parent, de
sc->sc_dmat = aa->aa_dmat;
}
- ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_BIO, false, ahci_intr, sc, device_xname(self));
if (ih == NULL) {
aprint_error_dev(self, "couldn't install interrupt handler\n");
Index: src/sys/dev/acpi/plgpio_acpi.c
diff -u src/sys/dev/acpi/plgpio_acpi.c:1.5 src/sys/dev/acpi/plgpio_acpi.c:1.6
--- src/sys/dev/acpi/plgpio_acpi.c:1.5 Fri Nov 23 14:08:40 2018
+++ src/sys/dev/acpi/plgpio_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: plgpio_acpi.c,v 1.5 2018/11/23 14:08:40 jmcneill Exp $ */
+/* $NetBSD: plgpio_acpi.c,v 1.6 2020/12/07 10:02:51 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plgpio_acpi.c,v 1.5 2018/11/23 14:08:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plgpio_acpi.c,v 1.6 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -131,7 +131,8 @@ plgpio_acpi_attach(device_t parent, devi
goto done;
}
- ih = acpi_intr_establish(self, (uint64_t)asc->sc_handle,
+ ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)asc->sc_handle,
IPL_VM, false, plgpio_acpi_intr, asc, device_xname(self));
if (ih == NULL)
aprint_error_dev(self, "couldn't establish interrupt\n");
Index: src/sys/dev/acpi/amdccp_acpi.c
diff -u src/sys/dev/acpi/amdccp_acpi.c:1.3 src/sys/dev/acpi/amdccp_acpi.c:1.4
--- src/sys/dev/acpi/amdccp_acpi.c:1.3 Sun Dec 6 12:23:13 2020
+++ src/sys/dev/acpi/amdccp_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: amdccp_acpi.c,v 1.3 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: amdccp_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
/*
* Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.3 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -95,7 +95,8 @@ amdccp_acpi_attach(device_t parent, devi
}
#if notyet
- ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_VM, true, amdccp_intr, sc, device_xname(self));
if (ih == NULL) {
aprint_error_dev(self, "couldn't install interrupt handler\n");
Index: src/sys/dev/acpi/dwiic_acpi.c
diff -u src/sys/dev/acpi/dwiic_acpi.c:1.3 src/sys/dev/acpi/dwiic_acpi.c:1.4
--- src/sys/dev/acpi/dwiic_acpi.c:1.3 Mon Sep 23 08:50:52 2019
+++ src/sys/dev/acpi/dwiic_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_acpi.c,v 1.3 2019/09/23 08:50:52 jmcneill Exp $ */
+/* $NetBSD: dwiic_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.3 2019/09/23 08:50:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -115,7 +115,8 @@ dwiic_acpi_attach(device_t parent, devic
return;
}
- ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_VM, true, dwiic_intr, sc, device_xname(self));
if (ih == NULL) {
aprint_error_dev(self, "couldn't install interrupt handler\n");
Index: src/sys/dev/acpi/ehci_acpi.c
diff -u src/sys/dev/acpi/ehci_acpi.c:1.3 src/sys/dev/acpi/ehci_acpi.c:1.4
--- src/sys/dev/acpi/ehci_acpi.c:1.3 Fri Nov 16 23:18:17 2018
+++ src/sys/dev/acpi/ehci_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_acpi.c,v 1.3 2018/11/16 23:18:17 jmcneill Exp $ */
+/* $NetBSD: ehci_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,v 1.3 2018/11/16 23:18:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -131,7 +131,8 @@ ehci_acpi_attach(device_t parent, device
sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
EOWRITE4(sc, EHCI_USBINTR, 0);
- ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_USB, true, ehci_intr, sc, device_xname(self));
if (ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt\n");
Index: src/sys/dev/acpi/virtio_acpi.c
diff -u src/sys/dev/acpi/virtio_acpi.c:1.3 src/sys/dev/acpi/virtio_acpi.c:1.4
--- src/sys/dev/acpi/virtio_acpi.c:1.3 Sat Oct 24 07:21:01 2020
+++ src/sys/dev/acpi/virtio_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio_acpi.c,v 1.3 2020/10/24 07:21:01 skrll Exp $ */
+/* $NetBSD: virtio_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.3 2020/10/24 07:21:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -174,7 +174,8 @@ virtio_acpi_setup_interrupts(struct virt
struct virtio_acpi_softc * const sc = (struct virtio_acpi_softc *)msc;
struct virtio_softc * const vsc = &msc->sc_sc;
- msc->sc_ih = acpi_intr_establish(vsc->sc_dev, (uint64_t)sc->sc_handle,
+ msc->sc_ih = acpi_intr_establish(vsc->sc_dev,
+ (uint64_t)(uintptr_t)sc->sc_handle,
IPL_VM, false, virtio_mmio_intr, msc, device_xname(vsc->sc_dev));
if (msc->sc_ih == NULL) {
aprint_error_dev(vsc->sc_dev, "couldn't install interrupt handler\n");
Index: src/sys/dev/acpi/atppc_acpi.c
diff -u src/sys/dev/acpi/atppc_acpi.c:1.18 src/sys/dev/acpi/atppc_acpi.c:1.19
--- src/sys/dev/acpi/atppc_acpi.c:1.18 Sun Dec 6 12:23:13 2020
+++ src/sys/dev/acpi/atppc_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_acpi.c,v 1.18 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: atppc_acpi.c,v 1.19 2020/12/07 10:02:51 jmcneill Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.18 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.19 2020/12/07 10:02:51 jmcneill Exp $");
#include "opt_atppc.h"
@@ -140,7 +140,8 @@ atppc_acpi_attach(device_t parent, devic
goto out;
}
- sc->sc_ieh = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ sc->sc_ieh = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_TTY, false, atppcintr, self device_xname(self));
if (sc->sc_ieh == NULL) {
aprint_error_dev(self, "unable to establish interrupt\n");
Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.44 src/sys/dev/acpi/fdc_acpi.c:1.45
--- src/sys/dev/acpi/fdc_acpi.c:1.44 Sun Dec 6 12:23:13 2020
+++ src/sys/dev/acpi/fdc_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.44 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.45 2020/12/07 10:02:51 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.44 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.45 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -181,7 +181,8 @@ fdc_acpi_attach(device_t parent, device_
}
}
- sc->sc_ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ sc->sc_ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_BIO, false, fdcintr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");
Index: src/sys/dev/acpi/genet_acpi.c
diff -u src/sys/dev/acpi/genet_acpi.c:1.2 src/sys/dev/acpi/genet_acpi.c:1.3
--- src/sys/dev/acpi/genet_acpi.c:1.2 Mon May 25 19:49:28 2020
+++ src/sys/dev/acpi/genet_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genet_acpi.c,v 1.2 2020/05/25 19:49:28 jmcneill Exp $ */
+/* $NetBSD: genet_acpi.c,v 1.3 2020/12/07 10:02:51 jmcneill Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_net_mpsafe.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genet_acpi.c,v 1.2 2020/05/25 19:49:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genet_acpi.c,v 1.3 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -144,7 +144,7 @@ genet_acpi_attach(device_t parent, devic
if (genet_attach(sc) != 0)
goto done;
- ih = acpi_intr_establish(self, (uint64_t)handle, IPL_NET,
+ ih = acpi_intr_establish(self, (uint64_t)(uintptr_t)handle, IPL_NET,
GENET_INTR_MPSAFE, genet_intr, sc, device_xname(self));
if (ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt\n");
Index: src/sys/dev/acpi/lpt_acpi.c
diff -u src/sys/dev/acpi/lpt_acpi.c:1.21 src/sys/dev/acpi/lpt_acpi.c:1.22
--- src/sys/dev/acpi/lpt_acpi.c:1.21 Sun Dec 6 12:23:13 2020
+++ src/sys/dev/acpi/lpt_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_acpi.c,v 1.21 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: lpt_acpi.c,v 1.22 2020/12/07 10:02:51 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.21 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.22 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -114,7 +114,8 @@ lpt_acpi_attach(device_t parent, device_
lpt_attach_subr(sc);
- sc->sc_ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ sc->sc_ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_TTY, false, lptintr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt\n");
Index: src/sys/dev/acpi/mpu_acpi.c
diff -u src/sys/dev/acpi/mpu_acpi.c:1.14 src/sys/dev/acpi/mpu_acpi.c:1.15
--- src/sys/dev/acpi/mpu_acpi.c:1.14 Sun Dec 6 12:23:13 2020
+++ src/sys/dev/acpi/mpu_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.14 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.15 2020/12/07 10:02:51 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.14 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.15 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -116,7 +116,8 @@ mpu_acpi_attach(device_t parent, device_
mutex_init(&asc->sc_lock, MUTEX_DEFAULT, IPL_AUDIO);
mpu_attach(sc);
- sc->arg = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ sc->arg = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_AUDIO, true, mpu_intr, sc, device_xname(self));
if (sc->arg == NULL) {
aprint_error_dev(self, "unable to establish interrupt\n");
Index: src/sys/dev/acpi/spic_acpi.c
diff -u src/sys/dev/acpi/spic_acpi.c:1.7 src/sys/dev/acpi/spic_acpi.c:1.8
--- src/sys/dev/acpi/spic_acpi.c:1.7 Sun Dec 6 12:23:13 2020
+++ src/sys/dev/acpi/spic_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: spic_acpi.c,v 1.7 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: spic_acpi.c,v 1.8 2020/12/07 10:02:51 jmcneill Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.7 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.8 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -114,7 +114,8 @@ spic_acpi_attach(device_t parent, device
goto out;
}
#if 0
- sc->sc_ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ sc->sc_ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_TTY, false, spic_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt\n");
Index: src/sys/dev/acpi/wb_acpi.c
diff -u src/sys/dev/acpi/wb_acpi.c:1.6 src/sys/dev/acpi/wb_acpi.c:1.7
--- src/sys/dev/acpi/wb_acpi.c:1.6 Sun Dec 6 12:23:13 2020
+++ src/sys/dev/acpi/wb_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wb_acpi.c,v 1.6 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: wb_acpi.c,v 1.7 2020/12/07 10:02:51 jmcneill Exp $ */
/*
* Copyright (c) 2009 Jared D. McNeill <[email protected]>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wb_acpi.c,v 1.6 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wb_acpi.c,v 1.7 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -129,7 +129,8 @@ wb_acpi_attach(device_t parent, device_t
}
sc->sc_ioh_length = io->ar_length;
- sc->sc_ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ sc->sc_ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_SDMMC, false, wb_intr, &sc->sc_wb, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self,
Index: src/sys/dev/acpi/xhci_acpi.c
diff -u src/sys/dev/acpi/xhci_acpi.c:1.9 src/sys/dev/acpi/xhci_acpi.c:1.10
--- src/sys/dev/acpi/xhci_acpi.c:1.9 Tue Oct 27 13:50:57 2020
+++ src/sys/dev/acpi/xhci_acpi.c Mon Dec 7 10:02:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci_acpi.c,v 1.9 2020/10/27 13:50:57 skrll Exp $ */
+/* $NetBSD: xhci_acpi.c,v 1.10 2020/12/07 10:02:51 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,v 1.9 2020/10/27 13:50:57 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_acpi.c,v 1.10 2020/12/07 10:02:51 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -143,7 +143,8 @@ xhci_acpi_attach(device_t parent, device
sc->sc_bus.ub_dmatag = aa->aa_dmat;
}
- ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+ ih = acpi_intr_establish(self,
+ (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
IPL_USB, true, xhci_intr, sc, device_xname(self));
if (ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt\n");
