Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

on NetBSD, cardbus_intr_establish's fifth arg's is a symbol which returns 

an int, not a void; change fwohci_intr accordingly.
This commit is contained in:
dogcow 2007-11-06 12:32:12 +00:00
parent 55d73ac843
commit 99f2863e95
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/ieee1394/fwohci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwohci.c,v 1.110 2007/11/05 19:08:56 kiyohara Exp $ */
/* $NetBSD: fwohci.c,v 1.111 2007/11/06 12:32:12 dogcow Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@ -57,16 +57,10 @@
#include <sys/endian.h>
#include <sys/kdb.h>
<<<<<<< fwohci.c
#include <machine/bus.h>
=======
#include <sys/bus.h>
#include <sys/cdefs.h>
<<<<<<< fwohci.c
__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.110 2007/11/05 19:08:56 kiyohara Exp $");
>>>>>>> 1.108
=======
__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.110 2007/11/05 19:08:56 kiyohara Exp $");
>>>>>>> 1.109
__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.111 2007/11/06 12:32:12 dogcow Exp $");
#if defined(__DragonFly__) || __FreeBSD_version < 500000
#include <machine/clock.h> /* for DELAY() */
@ -2222,12 +2216,13 @@ fwohci_filt(void *arg)
return (fwohci_check_stat(sc));
}
void
int
fwohci_intr(void *arg)
{
fwohci_filt(arg);
CTR0(KTR_DEV, "fwohci_intr end");
return 0;
}
void

4
sys/dev/ieee1394/fwohcivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwohcivar.h,v 1.27 2007/11/05 19:08:57 kiyohara Exp $ */
/* $NetBSD: fwohcivar.h,v 1.28 2007/11/06 12:32:12 dogcow Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi SHimokawa
@ -85,7 +85,7 @@ typedef struct fwohci_softc {
int cycle_lost;
} fwohci_softc_t;
void fwohci_intr (void *arg);
int fwohci_intr (void *arg);
int fwohci_filt (void *arg);
int fwohci_init (struct fwohci_softc *, device_t);
void fwohci_poll (struct firewire_comm *, int, int);