From 5bdd7657ce0d480a4c52f7095b82096c4e6758c1 Mon Sep 17 00:00:00 2001 From: jmallett Date: Fri, 12 Jun 2009 22:49:35 +0000 Subject: Fix MALTA build; some prototypes were wrong and blew up when kobj method signature checking was turned on. --- sys/mips/malta/gt_pci.c | 4 ++-- sys/mips/mips/mainbus.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'sys/mips') diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c index e8f7ffd..f0180f6 100644 --- a/sys/mips/malta/gt_pci.c +++ b/sys/mips/malta/gt_pci.c @@ -370,7 +370,7 @@ gt_pci_conf_setup(struct gt_pci_softc *sc, int bus, int slot, int func, } static uint32_t -gt_pci_read_config(device_t dev, int bus, int slot, int func, int reg, +gt_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) { struct gt_pci_softc *sc = device_get_softc(dev); @@ -440,7 +440,7 @@ gt_pci_read_config(device_t dev, int bus, int slot, int func, int reg, } static void -gt_pci_write_config(device_t dev, int bus, int slot, int func, int reg, +gt_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, uint32_t data, int bytes) { struct gt_pci_softc *sc = device_get_softc(dev); diff --git a/sys/mips/mips/mainbus.c b/sys/mips/mips/mainbus.c index 1f6b003..d1571e4cd 100644 --- a/sys/mips/mips/mainbus.c +++ b/sys/mips/mips/mainbus.c @@ -76,7 +76,7 @@ static int mainbus_deactivate_resource(device_t, device_t, int, int, static int mainbus_release_resource(device_t, device_t, int, int, struct resource *); static int mainbus_setup_intr(device_t, device_t, struct resource *, - int flags, int (*)(void *), void *, void **); + int flags, driver_filter_t, void (*)(void *), void *, void **); static int mainbus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -319,7 +319,8 @@ mainbus_release_resource(device_t bus, device_t child, int type, int rid, */ static int mainbus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, int (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), void *arg, + void **cookiep) { panic("can never mainbus_setup_intr"); } -- cgit v1.1