Date: Sun, 23 Jan 2011 10:35:57 +0000 From: Alexander Best <arundel@freebsd.org> To: Adrian Chadd <adrian@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r217738 - head/tools/tools/ath/athstats Message-ID: <20110123103556.GA5202@freebsd.org> In-Reply-To: <201101222337.p0MNbg8c008388@svn.freebsd.org> References: <201101222337.p0MNbg8c008388@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--GvXjxJ+pjyke8COw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat Jan 22 11, Adrian Chadd wrote: > Author: adrian > Date: Sat Jan 22 23:37:42 2011 > New Revision: 217738 > URL: http://svn.freebsd.org/changeset/base/217738 > > Log: > Patch the athstats code/Makefile to cross-compile correctly. > > Modified: > head/tools/tools/ath/athstats/Makefile > head/tools/tools/ath/athstats/athstats.c > > Modified: head/tools/tools/ath/athstats/Makefile > ============================================================================== > --- head/tools/tools/ath/athstats/Makefile Sat Jan 22 23:30:01 2011 (r217737) > +++ head/tools/tools/ath/athstats/Makefile Sat Jan 22 23:37:42 2011 (r217738) > @@ -1,28 +1,26 @@ > # $FreeBSD$ > > -PROG= athstats > +.PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal > > -SRCS= main.c statfoo.c athstats.c > +PROG= athstats > > -.include <bsd.prog.mk> > +SRCS= main.c statfoo.c athstats.c opt_ah.h ah_osdep.h > > -SRCDIR= ${.CURDIR}/../../../.. > +CLEANFILES+= opt_ah.h > > -CLEANFILES+= opt_ah.h ah_osdep.h > +.include <../Makefile.inc> > > CFLAGS+=-DATH_SUPPORT_ANI > CFLAGS+=-DATH_SUPPORT_TDMA > > -CFLAGS+=-I${.CURDIR} > -CFLAGS+=-I${SRCDIR}/sys/net80211 > - > -.include <../Makefile.inc> > - > -athstats.o: opt_ah.h ah_osdep.h > - > opt_ah.h: > - touch opt_ah.h > + echo "#define AH_DEBUG 1" > opt_ah.h > + echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h > + echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h > + > ah_osdep.h: > echo 'typedef void *HAL_SOFTC;' >ah_osdep.h > echo 'typedef int HAL_BUS_TAG;' >>ah_osdep.h > echo 'typedef void *HAL_BUS_HANDLE;' >>ah_osdep.h > + > +.include <bsd.prog.mk> > > Modified: head/tools/tools/ath/athstats/athstats.c > ============================================================================== > --- head/tools/tools/ath/athstats/athstats.c Sat Jan 22 23:30:01 2011 (r217737) > +++ head/tools/tools/ath/athstats/athstats.c Sat Jan 22 23:37:42 2011 (r217738) > @@ -29,6 +29,8 @@ > * $FreeBSD$ > */ > > +#include "opt_ah.h" > + > /* > * ath statistics class. > */ -- a13x --GvXjxJ+pjyke8COw Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="athstats.diff" diff --git a/tools/tools/ath/athstats/main.c b/tools/tools/ath/athstats/main.c index 489c0bd..82dc561 100644 --- a/tools/tools/ath/athstats/main.c +++ b/tools/tools/ath/athstats/main.c @@ -114,7 +114,7 @@ main(int argc, char *argv[]) wf->zerostats(wf); break; default: - errx(-1, "usage: %s [-a] [-i ifname] [-l] [-o fmt] [-z] [interval]\n", argv[0]); + errx(-1, "usage: %s [-b] [-i ifname] [-l] [-o fmt] [-z] [interval]\n", argv[0]); /*NOTREACHED*/ } } --GvXjxJ+pjyke8COw--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110123103556.GA5202>