summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/amd64/include/pci_machdep.h4
-rw-r--r--sys/arch/amd64/pci/pci_machdep.c9
-rw-r--r--sys/arch/hppa/include/pci_machdep.h4
-rw-r--r--sys/arch/hppa64/include/pci_machdep.h4
-rw-r--r--sys/arch/i386/pci/pci_machdep.h4
-rw-r--r--sys/arch/powerpc/pci/pci_machdep.h7
-rw-r--r--sys/arch/sparc64/dev/pci_machdep.c4
-rw-r--r--sys/arch/sparc64/include/pci_machdep.h4
-rw-r--r--sys/dev/pci/pccbb.c4
9 files changed, 22 insertions, 22 deletions
diff --git a/sys/arch/amd64/include/pci_machdep.h b/sys/arch/amd64/include/pci_machdep.h
index 0a3006bdbd6..48d988ece77 100644
--- a/sys/arch/amd64/include/pci_machdep.h
+++ b/sys/arch/amd64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.11 2009/04/21 19:18:09 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.12 2009/07/20 23:40:41 miod Exp $ */
/* $NetBSD: pci_machdep.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */
/*
@@ -53,7 +53,7 @@ typedef struct {
int line, pin;
} pci_intr_handle_t;
-#define pci_intr_line(ih) ((ih.line) & 0xff)
+#define pci_intr_line(pc,ih) ((ih.line) & 0xff)
/*
* amd64-specific PCI variables and functions.
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c
index 67fa23b429d..1d78b000998 100644
--- a/sys/arch/amd64/pci/pci_machdep.c
+++ b/sys/arch/amd64/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.29 2009/04/29 18:28:38 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.30 2009/07/20 23:40:43 miod Exp $ */
/* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */
/*-
@@ -309,11 +309,12 @@ pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih)
snprintf(irqstr, sizeof(irqstr), "apic %d int %d (irq %d)",
APIC_IRQ_APIC(ih.line),
APIC_IRQ_PIN(ih.line),
- pci_intr_line(ih));
+ pci_intr_line(pc, ih));
else
- snprintf(irqstr, sizeof(irqstr), "irq %d", pci_intr_line(ih));
+ snprintf(irqstr, sizeof(irqstr), "irq %d",
+ pci_intr_line(pc, ih));
#else
- snprintf(irqstr, sizeof(irqstr), "irq %d", pci_intr_line(ih));
+ snprintf(irqstr, sizeof(irqstr), "irq %d", pci_intr_line(pc, ih));
#endif
return (irqstr);
}
diff --git a/sys/arch/hppa/include/pci_machdep.h b/sys/arch/hppa/include/pci_machdep.h
index d5dca28e21a..859bfc029dd 100644
--- a/sys/arch/hppa/include/pci_machdep.h
+++ b/sys/arch/hppa/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.3 2008/12/06 19:59:38 tedu Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.4 2009/07/20 23:40:43 miod Exp $ */
/*
* Copyright (c) 2003 Michael Shalayeff
@@ -77,7 +77,7 @@ struct hppa_pci_chipset_tag {
(*(c)->pc_conf_write)((c)->_cookie, (t), (r), (v))
#define pci_intr_map(p, ihp) \
(*(p)->pa_pc->pc_intr_map)((p), (ihp))
-#define pci_intr_line(ih) (ih)
+#define pci_intr_line(c, ih) (ih)
#define pci_intr_string(c, ih) \
(*(c)->pc_intr_string)((c)->_cookie, (ih))
#define pci_intr_establish(c, ih, l, h, a, nm) \
diff --git a/sys/arch/hppa64/include/pci_machdep.h b/sys/arch/hppa64/include/pci_machdep.h
index ebfea186793..57e9bce3c3c 100644
--- a/sys/arch/hppa64/include/pci_machdep.h
+++ b/sys/arch/hppa64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.3 2008/12/06 19:59:38 tedu Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.4 2009/07/20 23:40:43 miod Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -68,7 +68,7 @@ struct hppa64_pci_chipset_tag {
(*(c)->pc_conf_write)((c)->_cookie, (t), (r), (v))
#define pci_intr_map(p, ihp) \
(*(p)->pa_pc->pc_intr_map)((p), (ihp))
-#define pci_intr_line(ih) (ih)
+#define pci_intr_line(c, ih) (ih)
#define pci_intr_string(c, ih) \
(*(c)->pc_intr_string)((c)->_cookie, (ih))
#define pci_intr_establish(c, ih, l, h, a, nm) \
diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h
index 0e840843711..cf82ced70a3 100644
--- a/sys/arch/i386/pci/pci_machdep.h
+++ b/sys/arch/i386/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.15 2009/04/11 17:13:33 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.16 2009/07/20 23:40:43 miod Exp $ */
/* $NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $ */
/*
@@ -94,7 +94,7 @@ void pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
struct pci_attach_args;
int pci_intr_map(struct pci_attach_args *,
pci_intr_handle_t *);
-#define pci_intr_line(ih) ((ih).line)
+#define pci_intr_line(c, ih) ((ih).line)
const char *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
int, int (*)(void *), void *, char *);
diff --git a/sys/arch/powerpc/pci/pci_machdep.h b/sys/arch/powerpc/pci/pci_machdep.h
index 22105772f0f..3ecddcbaa95 100644
--- a/sys/arch/powerpc/pci/pci_machdep.h
+++ b/sys/arch/powerpc/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.15 2006/05/10 00:07:40 brad Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.16 2009/07/20 23:40:43 miod Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -64,8 +64,6 @@ struct ppc_pci_chipset {
int (*pc_ether_hw_addr)(struct ppc_pci_chipset *, u_int8_t *);
};
-int pci_intr_line(pci_intr_handle_t ih);
-
/*
* Functions provided to machine-independent PCI code.
*/
@@ -84,9 +82,10 @@ int pci_intr_line(pci_intr_handle_t ih);
#define pci_intr_map(pa, ihp) \
(*((pa)->pa_pc)->pc_intr_map)((pa)->pa_pc->pc_intr_v, \
(pa)->pa_intrtag, (pa)->pa_intrpin, (pa)->pa_intrline, (ihp))
-#define pci_intr_line(ih) (ih)
#define pci_intr_string(c, ih) \
(*(c)->pc_intr_string)((c)->pc_intr_v, (ih))
+#define pci_intr_line(c, ih) \
+ (*(c)->pc_intr_line)((c)->pc_intr_v, (ih))
#define pci_intr_establish(c, ih, l, h, a, nm) \
(*(c)->pc_intr_establish)((c)->pc_intr_v, (ih), (l), (h), (a), (nm))
#define pci_intr_disestablish(c, iv) \
diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c
index 08ef6504b91..21350559d46 100644
--- a/sys/arch/sparc64/dev/pci_machdep.c
+++ b/sys/arch/sparc64/dev/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.37 2009/05/03 21:23:04 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.38 2009/07/20 23:40:43 miod Exp $ */
/* $NetBSD: pci_machdep.c,v 1.22 2001/07/20 00:07:13 eeh Exp $ */
/*
@@ -393,7 +393,7 @@ pci_intr_map(pa, ihp)
}
int
-pci_intr_line(pci_intr_handle_t ih)
+pci_intr_line(pci_chipset_tag_t pc, pci_intr_handle_t ih)
{
return (ih);
}
diff --git a/sys/arch/sparc64/include/pci_machdep.h b/sys/arch/sparc64/include/pci_machdep.h
index 1aece7a69e4..c46bedd887e 100644
--- a/sys/arch/sparc64/include/pci_machdep.h
+++ b/sys/arch/sparc64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.h,v 1.21 2008/12/06 19:59:38 tedu Exp $ */
+/* $OpenBSD: pci_machdep.h,v 1.22 2009/07/20 23:40:43 miod Exp $ */
/* $NetBSD: pci_machdep.h,v 1.7 2001/07/20 00:07:14 eeh Exp $ */
/*
@@ -83,7 +83,7 @@ pcireg_t pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
void pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
pcireg_t);
int pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
-int pci_intr_line(pci_intr_handle_t);
+int pci_intr_line(pci_chipset_tag_t, pci_intr_handle_t);
const char *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
int, int (*)(void *), void *, char *);
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index a51a97a5e87..700148b5f56 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccbb.c,v 1.64 2009/06/03 04:32:10 jsg Exp $ */
+/* $OpenBSD: pccbb.c,v 1.65 2009/07/20 23:40:43 miod Exp $ */
/* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */
/*
@@ -481,7 +481,7 @@ pccbbattach(struct device *parent, struct device *self, void *aux)
}
intrstr = pci_intr_string(pc, ih);
/* must do this after intr is mapped and established */
- sc->sc_intrline = pci_intr_line(ih);
+ sc->sc_intrline = pci_intr_line(pc, ih);
/*
* XXX pccbbintr should be called under the priority lower
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 03:11:09 +0000