From 919fac9de7a640c17e71e8b0559cc8916b92e9b1 Mon Sep 17 00:00:00 2001 From: kettenis Date: Thu, 6 Jan 2022 08:46:50 +0000 Subject: [PATCH] Use a 64-bit integer for pcitag_t and define PCITAG_NODE and PCITAG_OFFSET macros to make armv7 build again. ok deraadt@ --- sys/arch/arm/include/pci_machdep.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/arch/arm/include/pci_machdep.h b/sys/arch/arm/include/pci_machdep.h index b6d95c7eecf..4deef99f18e 100644 --- a/sys/arch/arm/include/pci_machdep.h +++ b/sys/arch/arm/include/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.17 2021/02/25 23:07:48 patrick Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.18 2022/01/06 08:46:50 kettenis Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -27,7 +27,11 @@ */ typedef struct arm32_pci_chipset *pci_chipset_tag_t; -typedef u_long pcitag_t; +typedef uint64_t pcitag_t; + +#define PCITAG_NODE(x) ((x) >> 32) +#define PCITAG_OFFSET(x) ((x) & 0xffffffff) + typedef u_long pci_intr_handle_t; struct pci_attach_args; -- 2.20.1