diff options
| author |   miod <miod@openbsd.org> | 2009-10-22 20:51:08 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2009-10-22 20:51:08 +0000 |
| commit | 1193b521d658e41e01edc23f9ed92abe09a89718 (patch) | |
| tree | 85efe15e998d14d82e9892fe3d5651d37de686d8 /sys/arch/sgi | |
| parent | Fix a typo (diff) | |
| download | wireguard-openbsd-1193b521d658e41e01edc23f9ed92abe09a89718.tar.xz wireguard-openbsd-1193b521d658e41e01edc23f9ed92abe09a89718.zip | |
Make macebus_intr_disestablish() signature sane, and update its caller.
Still unimplemented for now.
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/localbus/macebus.c | 6 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/macebus.h | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/pci/macepcibridge.c | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c index 7c818d0347c..6bf83e7c4f4 100644 --- a/sys/arch/sgi/localbus/macebus.c +++ b/sys/arch/sgi/localbus/macebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.c,v 1.48 2009/10/22 20:39:17 miod Exp $ */ +/* $OpenBSD: macebus.c,v 1.49 2009/10/22 20:51:08 miod Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -522,8 +522,10 @@ macebus_intr_establish(void *icp, u_long irq, int type, int level, } void -macebus_intr_disestablish(void *p1, void *p2) +macebus_intr_disestablish(void *ih) { + /* XXX */ + panic("%s not implemented", __func__); } /* diff --git a/sys/arch/sgi/localbus/macebus.h b/sys/arch/sgi/localbus/macebus.h index 01aaaaf796c..63ca7f0ffd0 100644 --- a/sys/arch/sgi/localbus/macebus.h +++ b/sys/arch/sgi/localbus/macebus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.h,v 1.13 2009/08/22 02:54:51 mk Exp $ */ +/* $OpenBSD: macebus.h,v 1.14 2009/10/22 20:51:08 miod Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.com). @@ -124,6 +124,6 @@ extern struct machine_bus_dma_tag mace_bus_dma_tag; void *macebus_intr_establish(void *, u_long, int, int, int (*)(void *), void *, const char *); -void macebus_intr_disestablish(void *, void *); +void macebus_intr_disestablish(void *); #endif /* _MACEBUS_H_ */ diff --git a/sys/arch/sgi/pci/macepcibridge.c b/sys/arch/sgi/pci/macepcibridge.c index ad80218018e..a1d71961c17 100644 --- a/sys/arch/sgi/pci/macepcibridge.c +++ b/sys/arch/sgi/pci/macepcibridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macepcibridge.c,v 1.33 2009/08/22 02:54:51 mk Exp $ */ +/* $OpenBSD: macepcibridge.c,v 1.34 2009/10/22 20:51:09 miod Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. @@ -472,9 +472,9 @@ mace_pcibr_intr_establish(void *lcv, pci_intr_handle_t ih, int level, } void -mace_pcibr_intr_disestablish(void *lcv, void *cookie) +mace_pcibr_intr_disestablish(void *lcv, void *ih) { - macebus_intr_disestablish(lcv, cookie); + macebus_intr_disestablish(ih); } int |