d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix iicbus_intr, iicbus_write and device_read_ivar prototypes...

Browse Source
This commit is contained in:
imp 2009-02-10 22:50:23 +00:00
parent 474c2e23d2
commit 201a4a90d9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/iicbus/if_ic.c
View File

@ -105,7 +105,7 @@ static int icioctl(struct ifnet *, u_long, caddr_t);
static int icoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *);
static void icintr(device_t, int, char *);
static int icintr(device_t, int, char *);
static device_method_t ic_methods[] = {
/* device interface */
@ -272,7 +272,7 @@ icioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
/*
* icintr()
*/
static void
static int
icintr(device_t dev, int event, char *ptr)
{
struct ic_softc *sc = (struct ic_softc *)device_get_softc(dev);
@ -346,7 +346,7 @@ icintr(device_t dev, int event, char *ptr)
}
mtx_unlock(&sc->ic_lock);
return;
return (0);
}
/*

4
sys/dev/iicbus/iicbb.c
View File

@ -72,7 +72,7 @@ static int iicbb_probe(device_t);
static int iicbb_callback(device_t, int, caddr_t);
static int iicbb_start(device_t, u_char, int);
static int iicbb_stop(device_t);
static int iicbb_write(device_t, char *, int, int *, int);
static int iicbb_write(device_t, const char *, int, int *, int);
static int iicbb_read(device_t, char *, int, int *, int, int);
static int iicbb_reset(device_t, u_char, u_char, u_char *);
@ -372,7 +372,7 @@ iicbb_stop(device_t dev)
}
static int
iicbb_write(device_t dev, char * buf, int len, int *sent, int timeout)
iicbb_write(device_t dev, const char *buf, int len, int *sent, int timeout)
{
int bytes, error = 0;

2
sys/dev/iicbus/iicbus.c
View File

@ -173,7 +173,7 @@ iicbus_child_pnpinfo_str(device_t bus, device_t child, char *buf,
}
static int
iicbus_read_ivar(device_t bus, device_t child, int which, u_char *result)
iicbus_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
{
struct iicbus_ivar *devi = IICBUS_IVAR(child);

6
sys/dev/iicbus/iicsmb.c
View File

@ -84,7 +84,7 @@ static int iicsmb_attach(device_t);
static int iicsmb_detach(device_t);
static void iicsmb_identify(driver_t *driver, device_t parent);
static void iicsmb_intr(device_t dev, int event, char *buf);
static int iicsmb_intr(device_t dev, int event, char *buf);
static int iicsmb_callback(device_t dev, int index, void *data);
static int iicsmb_quick(device_t dev, u_char slave, int how);
static int iicsmb_sendb(device_t dev, u_char slave, char byte);
@ -186,7 +186,7 @@ iicsmb_detach(device_t dev)
*
* iicbus interrupt handler
*/
static void
static int
iicsmb_intr(device_t dev, int event, char *buf)
{
struct iicsmb_softc *sc = (struct iicsmb_softc *)device_get_softc(dev);
@ -252,7 +252,7 @@ iicsmb_intr(device_t dev, int event, char *buf)
}
mtx_unlock(&sc->lock);
return;
return (0);
}
static int