From d5fe2ac32f518d9f35ff576071df61d77c134648 Mon Sep 17 00:00:00 2001
From: kleink <kleink@NetBSD.org>
Date: Mon, 25 Feb 2002 00:34:13 +0000
Subject: [PATCH] Declare the id argument to pci_conf_hook(9) as pcireg_t,
 which is more appropriate.

---
 sys/arch/prep/include/pci_machdep.h   | 6 +++---
 sys/arch/prep/pci/pci_machdep.c       | 2 +-
 sys/arch/walnut/include/pci_machdep.h | 4 ++--
 sys/arch/walnut/pci/pci_machdep.c     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/arch/prep/include/pci_machdep.h b/sys/arch/prep/include/pci_machdep.h
index 861fb9cdfc0c..e0207bce135b 100644
--- a/sys/arch/prep/include/pci_machdep.h
+++ b/sys/arch/prep/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.7 2002/02/24 13:19:07 kleink Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.8 2002/02/25 00:34:13 kleink Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -69,7 +69,7 @@ struct prep_pci_chipset {
 	void		(*pc_conf_interrupt)(void *, int, int, int, int, int *);
 	void		(*pc_decompose_tag)(void *, pcitag_t, int *,
 			    int *, int *);
-	int		(*pc_conf_hook)(void *, int, int, int, int);
+	int		(*pc_conf_hook)(void *, int, int, int, pcireg_t);
 };
 
 /*
@@ -115,7 +115,7 @@ void *prep_pci_intr_establish(void *, pci_intr_handle_t, int, int (*)(void *),
     void *);
 void prep_pci_intr_disestablish(void *, void *);
 void prep_pci_conf_interrupt(void *, int, int, int, int, int *);
-int prep_pci_conf_hook(void *, int, int, int, int);
+int prep_pci_conf_hook(void *, int, int, int, pcireg_t);
 
 void prep_pci_get_chipset_tag_direct(pci_chipset_tag_t);
 void prep_pci_get_chipset_tag_indirect(pci_chipset_tag_t);
diff --git a/sys/arch/prep/pci/pci_machdep.c b/sys/arch/prep/pci/pci_machdep.c
index 3e5be3544b1d..967b3f3cd5f0 100644
--- a/sys/arch/prep/pci/pci_machdep.c
+++ b/sys/arch/prep/pci/pci_machdep.c
@@ -193,7 +193,7 @@ prep_pci_conf_interrupt(void *v, int bus, int dev, int pin,
 }
 
 int
-prep_pci_conf_hook(void *v, int bus, int dev, int func, int id)
+prep_pci_conf_hook(void *v, int bus, int dev, int func, pcireg_t id)
 {
 
 	/*
diff --git a/sys/arch/walnut/include/pci_machdep.h b/sys/arch/walnut/include/pci_machdep.h
index b3f6fb08d580..35d338ce2773 100644
--- a/sys/arch/walnut/include/pci_machdep.h
+++ b/sys/arch/walnut/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.h,v 1.2 2002/02/11 17:24:01 kleink Exp $	*/
+/*	$NetBSD: pci_machdep.h,v 1.3 2002/02/25 00:34:14 kleink Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -76,7 +76,7 @@ const struct evcnt *pci_intr_evcnt(pci_chipset_tag_t, pci_intr_handle_t);
 void		*pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
 		    int, int (*)(void *), void *);
 void		pci_intr_disestablish(pci_chipset_tag_t, void *);
-int		pci_conf_hook(pci_chipset_tag_t, int, int, int, int);
+int		pci_conf_hook(pci_chipset_tag_t, int, int, int, pcireg_t);
 
 void		pci_machdep_init(void);
 /*
diff --git a/sys/arch/walnut/pci/pci_machdep.c b/sys/arch/walnut/pci/pci_machdep.c
index 7a0fc239b5ba..bb5a66dc1e63 100644
--- a/sys/arch/walnut/pci/pci_machdep.c
+++ b/sys/arch/walnut/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.5 2001/11/08 23:28:15 eeh Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.6 2002/02/25 00:34:15 kleink Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -253,7 +253,7 @@ pci_conf_interrupt(pci_chipset_tag_t pc, int bus, int dev, int pin,
 
 /* Avoid overconfiguration */
 int
-pci_conf_hook(pci_chipset_tag_t pc, int bus, int dev, int func, int id)
+pci_conf_hook(pci_chipset_tag_t pc, int bus, int dev, int func, pcireg_t id)
 {
 
 	if ((PCI_VENDOR(id) == PCI_VENDOR_IBM && PCI_PRODUCT(id) == PCI_PRODUCT_IBM_405GP) ||