From owner-svn-src-all@FreeBSD.ORG Tue Feb 10 22:50:23 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80E13106566C; Tue, 10 Feb 2009 22:50:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E0368FC1A; Tue, 10 Feb 2009 22:50:23 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1AMoNAT006682; Tue, 10 Feb 2009 22:50:23 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1AMoN4P006678; Tue, 10 Feb 2009 22:50:23 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200902102250.n1AMoN4P006678@svn.freebsd.org> From: Warner Losh Date: Tue, 10 Feb 2009 22:50:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188461 - head/sys/dev/iicbus X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2009 22:50:23 -0000 Author: imp Date: Tue Feb 10 22:50:23 2009 New Revision: 188461 URL: http://svn.freebsd.org/changeset/base/188461 Log: Fix iicbus_intr, iicbus_write and device_read_ivar prototypes... Modified: head/sys/dev/iicbus/if_ic.c head/sys/dev/iicbus/iicbb.c head/sys/dev/iicbus/iicbus.c head/sys/dev/iicbus/iicsmb.c Modified: head/sys/dev/iicbus/if_ic.c ============================================================================== --- head/sys/dev/iicbus/if_ic.c Tue Feb 10 22:46:36 2009 (r188460) +++ head/sys/dev/iicbus/if_ic.c Tue Feb 10 22:50:23 2009 (r188461) @@ -105,7 +105,7 @@ static int icioctl(struct ifnet *, u_lon 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, c /* * 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 *pt } mtx_unlock(&sc->ic_lock); - return; + return (0); } /* Modified: head/sys/dev/iicbus/iicbb.c ============================================================================== --- head/sys/dev/iicbus/iicbb.c Tue Feb 10 22:46:36 2009 (r188460) +++ head/sys/dev/iicbus/iicbb.c Tue Feb 10 22:50:23 2009 (r188461) @@ -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; Modified: head/sys/dev/iicbus/iicbus.c ============================================================================== --- head/sys/dev/iicbus/iicbus.c Tue Feb 10 22:46:36 2009 (r188460) +++ head/sys/dev/iicbus/iicbus.c Tue Feb 10 22:50:23 2009 (r188461) @@ -173,7 +173,7 @@ iicbus_child_pnpinfo_str(device_t bus, d } 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); Modified: head/sys/dev/iicbus/iicsmb.c ============================================================================== --- head/sys/dev/iicbus/iicsmb.c Tue Feb 10 22:46:36 2009 (r188460) +++ head/sys/dev/iicbus/iicsmb.c Tue Feb 10 22:50:23 2009 (r188461) @@ -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 @@ end: } mtx_unlock(&sc->lock); - return; + return (0); } static int