Date: Sat, 3 Aug 2013 15:34:38 -0400 From: Glen Barber <gjb@FreeBSD.org> To: Marius Strobl <marius@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r253899 - head/sys/dev/scc Message-ID: <20130803193438.GH78299@glenbarber.us> In-Reply-To: <201308022328.r72NSoFK044957@svn.freebsd.org> References: <201308022328.r72NSoFK044957@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Fri, Aug 02, 2013 at 11:28:50PM +0000, Marius Strobl wrote: > Author: marius > Date: Fri Aug 2 23:28:49 2013 > New Revision: 253899 > URL: http://svnweb.freebsd.org/changeset/base/253899 > [...] > Modified: > head/sys/dev/scc/scc_dev_quicc.c > head/sys/dev/scc/scc_dev_sab82532.c > head/sys/dev/scc/scc_dev_z8530.c > > Modified: head/sys/dev/scc/scc_dev_quicc.c > ============================================================================== > --- head/sys/dev/scc/scc_dev_quicc.c Fri Aug 2 21:28:36 2013 (r253898) > +++ head/sys/dev/scc/scc_dev_quicc.c Fri Aug 2 23:28:49 2013 (r253899) > @@ -27,13 +27,10 @@ > #include <sys/cdefs.h> > __FBSDID("$FreeBSD$"); > > -#define __RMAN_RESOURCE_VISIBLE > - > #include <sys/param.h> > #include <sys/systm.h> > #include <sys/bus.h> > #include <sys/conf.h> > -#include <sys/endian.h> > #include <machine/bus.h> > #include <sys/rman.h> > #include <sys/serial.h> > @@ -63,7 +60,7 @@ static kobj_method_t quicc_methods[] = { > KOBJMETHOD(scc_iclear, quicc_bfe_iclear), > KOBJMETHOD(scc_ipend, quicc_bfe_ipend), > KOBJMETHOD(scc_probe, quicc_bfe_probe), > - { 0, 0 } > + KOBJMETHOD_END > }; > > struct scc_class scc_quicc_class = { > @@ -77,11 +74,9 @@ struct scc_class scc_quicc_class = { > }; > > static int > -quicc_bfe_attach(struct scc_softc *sc, int reset) > +quicc_bfe_attach(struct scc_softc *sc __unused, int reset __unused) > { > - struct scc_bas *bas; > > - bas = &sc->sc_bas; > return (0); > } > > @@ -104,7 +99,18 @@ quicc_bfe_enabled(struct scc_softc *sc, > static int > quicc_bfe_iclear(struct scc_softc *sc, struct scc_chan *ch) > { > + struct scc_bas *bas; > + uint16_t rb, st; > > + bas = &sc->sc_bas; > + mtx_lock_spin(&sc->sc_hwmtx); > + if (ch->ch_ipend & SER_INT_RXREADY) { > + rb = quicc_read2(bas, QUICC_PRAM_SCC_RBASE(ch->ch_nr - 1)); > + st = quicc_read2(bas, rb); > + (void)quicc_read4(bas, rb + 4); This seems to break LINT for powerpc and powerpc64. cc1: warnings being treated as errors /src/sys/modules/scc/../../dev/scc/scc_dev_quicc.c: In function 'quicc_bfe_iclear': /src/sys/modules/scc/../../dev/scc/scc_dev_quicc.c:110: warning: implicit declaration of function 'quicc_read4' /src/sys/modules/scc/../../dev/scc/scc_dev_quicc.c:110: warning: nested extern declaration of 'quicc_read4' [-Wnested-externs] *** Error code 1 Stop. bmake[3]: stopped in /src/sys/modules/scc *** Error code 1 http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-powerpc64-powerpc.full Glen [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBCAAGBQJR/VtOAAoJEFJPDDeguUaj+SkH/0nV8qjKVmOA1Wj5bW7wp5Ex c1XUfgNC2kPPf8Zke1rD+uHB+oB0T+zlbdvugT6j4p8WLIIRmeZEqqn/9BQXVudj ZaDlVhibSxe3qe/Jy7msO+EvOoxRHtCNFYi9GoivhvTaSV9pQCH9pc91CsVug30f Tkj7ubGsTTnsVchiva40RBcZmZFmkftzS5Iv1f4AhgElJExRmFt8uf1/vUyX7qjm NkHAdpcPxXht/A7BKOheg/9PrmniDfJnKG9Sd4V89Jj5f1LH5C+mvTIpI/yKl7Ul 8QVHmbymdbIaLy94ih8FYocpI9n4/WH9TcJyhlHQKgVcmcz13O6aXpr+EIrT3yo= =F76P -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130803193438.GH78299>