head	1.10;
access;
symbols
	RELENG_7_4_0_RELEASE:1.4.2.1
	RELENG_7_4:1.4.2.1.0.6
	RELENG_7_4_BP:1.4.2.1
	RELENG_7_3_0_RELEASE:1.4.2.1
	RELENG_7_3:1.4.2.1.0.4
	RELENG_7_3_BP:1.4.2.1
	RELENG_7_2_0_RELEASE:1.4.2.1
	RELENG_7_2:1.4.2.1.0.2
	RELENG_7_2_BP:1.4.2.1
	RELENG_7_1_0_RELEASE:1.4.6.1
	RELENG_6_4_0_RELEASE:1.1.2.1.6.1
	RELENG_7_1:1.4.0.6
	RELENG_7_1_BP:1.4
	RELENG_6_4:1.1.2.1.0.6
	RELENG_6_4_BP:1.1.2.1
	RELENG_7_0_0_RELEASE:1.4
	RELENG_6_3_0_RELEASE:1.1.2.1
	RELENG_7_0:1.4.0.4
	RELENG_7_0_BP:1.4
	RELENG_6_3:1.1.2.1.0.4
	RELENG_6_3_BP:1.1.2.1
	RELENG_7:1.4.0.2
	RELENG_7_BP:1.4
	RELENG_6_2_0_RELEASE:1.1.2.1
	RELENG_6_2:1.1.2.1.0.2
	RELENG_6_2_BP:1.1.2.1
	RELENG_6_1_0_RELEASE:1.1
	RELENG_6_1:1.1.0.6
	RELENG_6_1_BP:1.1
	RELENG_6_0_0_RELEASE:1.1
	RELENG_6_0:1.1.0.4
	RELENG_6_0_BP:1.1
	RELENG_6:1.1.0.2
	RELENG_6_BP:1.1;
locks; strict;
comment	@# @;


1.10
date	2008.12.14.22.26.57;	author sam;	state dead;
branches;
next	1.9;

1.9
date	2008.12.02.21.37.28;	author bz;	state Exp;
branches;
next	1.8;

1.8
date	2008.12.01.16.53.01;	author sam;	state Exp;
branches;
next	1.7;

1.7
date	2008.09.01.23.59.00;	author imp;	state Exp;
branches;
next	1.6;

1.6
date	2008.05.30.03.36.52;	author sam;	state Exp;
branches;
next	1.5;

1.5
date	2008.04.20.20.35.40;	author sam;	state Exp;
branches;
next	1.4;

1.4
date	2007.06.29.19.52.31;	author sam;	state Exp;
branches
	1.4.2.1
	1.4.6.1;
next	1.3;

1.3
date	2006.09.18.16.49.15;	author sam;	state Exp;
branches;
next	1.2;

1.2
date	2005.09.27.18.10.32;	author mlaier;	state Exp;
branches;
next	1.1;

1.1
date	2004.12.08.17.38.37;	author sam;	state Exp;
branches
	1.1.2.1;
next	;

1.4.2.1
date	2009.03.12.03.09.11;	author bms;	state dead;
branches;
next	;

1.4.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1
date	2006.10.16.01.26.14;	author sam;	state Exp;
branches
	1.1.2.1.6.1;
next	1.1.2.2;

1.1.2.2
date	2012.11.17.07.44.15;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.10
log
@SVN rev 186094 on 2008-12-14 22:26:57Z by sam

Combine ath rate control modules with ath after bringing ath_hal
src into the tree.  The old split was balanced on module dependencies
and symbol exposure that no longer exists.  Users that want a module
setup with rate control algorithm other than sample must override
ATH_RATE in the ath module Makefile.

Reviewed by:	imp
@
text
@#
# Copyright (c) 2004-2008 Sam Leffler, Errno Consulting
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer,
#    without modification.
# 2. Redistributions in binary form must reproduce at minimum a disclaimer
#    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
#    redistribution must be conditioned upon including a substantially
#    similar Disclaimer requirement for further binary redistribution.
#
# NO WARRANTY
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
# THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
# THE POSSIBILITY OF SUCH DAMAGES.
#
# $FreeBSD: src/sys/modules/ath_rate_onoe/Makefile,v 1.9 2008/12/02 21:37:28 bz Exp $
#

.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe

KMOD=	ath_rate
SRCS=	onoe.c
SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h

CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal

.include <bsd.kmod.mk>
@


1.9
log
@SVN rev 185571 on 2008-12-02 21:37:28Z by bz

Rather than using hidden includes (with cicular dependencies),
directly include only the header files needed. This reduces the
unneeded spamming of various headers into lots of files.

For now, this leaves us with very few modules including vnet.h
and thus needing to depend on opt_route.h.

Reviewed by:	brooks, gnn, des, zec, imp
Sponsored by:	The FreeBSD Foundation
@
text
@d29 1
a29 1
# $FreeBSD$
@


1.8
log
@SVN rev 185522 on 2008-12-01 16:53:01Z by sam

Switch to ath hal source code. Note this removes the ath_hal
module; the ath module now brings in the hal support.  Kernel
config files are almost backwards compatible; supplying

device ath_hal

gives you the same chip support that the binary hal did but you
must also include

options AH_SUPPORT_AR5416

to enable the extended format descriptors used by 11n parts.
It is now possible to control the chip support included in a
build by specifying exactly which chips are to be supported
in the config file; consult ath_hal(4) for information.
@
text
@d36 1
a36 1
SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_route.h opt_ah.h opt_wlan.h
@


1.7
log
@SVN rev 182668 on 2008-09-01 23:59:00Z by imp

Per email to arch@@ a little while ago (that was greeted with silence),
prefer the more common > ${.TARGET} over > opt_foo.h in modules
makefiles.
@
text
@d2 1
a2 1
# Copyright (c) 2004 Sam Leffler, Errno Consulting
a14 7
# 3. Neither the names of the above-listed copyright holders nor the names
#    of any contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# Alternatively, this software may be distributed under the terms of the
# GNU General Public License ("GPL") version 2 as published by the Free
# Software Foundation.
d36 1
a36 18
SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h

HAL=	${.CURDIR}/../../contrib/dev/ath
CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${HAL}

# patch for hal naming difference
.if ${MACHINE_ARCH} == "amd64"
ATH_MODULE_ARCH=x86_64
.elif ${MACHINE_ARCH} == "sparc64"
ATH_MODULE_ARCH=sparc64-be
.elif ${MACHINE_ARCH} == "powerpc"
ATH_MODULE_ARCH=powerpc-be
.else
ATH_MODULE_ARCH=${MACHINE_ARCH}
.endif

opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h
	cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET}
d38 1
a38 5
.if !defined(KERNBUILDDIR)
opt_wlan.h:
	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
#	echo > ${.TARGET}
.endif
@


1.6
log
@don't let KERNBUILDDIR control whether we copy opt_ah.h

Submitted by:	jkim
@
text
@d64 2
a65 2
	echo "#define IEEE80211_DEBUG 1" > opt_wlan.h
#	echo > opt_wlan.h
@


1.5
log
@Multi-bss (aka vap) support for 802.11 devices.

Note this includes changes to all drivers and moves some device firmware
loading to use firmware(9) and a separate module (e.g. ral).  Also there
no longer are separate wlan_scan* modules; this functionality is now
bundled into the wlan module.

Supported by:	Hobnob and Marvell
Reviewed by:	many
Obtained from:	Atheros (some bits)
@
text
@a58 1
.if !defined(KERNBUILDDIR)
d62 1
@


1.4
log
@import opt_ah.h for newer hal's that optionally include 11n support

Approved by:	re (kensmith)
MFC after:	2 weeks
@
text
@d43 1
a43 1
SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h
d59 1
d63 5
@


1.4.2.1
log
@SVN rev 189720 on 2009-03-12 03:09:11Z by bms

Merge the open source Atheros HAL from HEAD to STABLE.

This adds support for the AH_SUPPORT_AR5416 kernel
configuration option, and removes the ath_rate*
and ath_hal modules. Their kernel options are not
however removed -- please see UPDATING.

Tested on an IBM/Lenovo T43 and ASUS EeePC 701 in both
STA and HostAP modes.

Submitted by:	sam
@
text
@d36 1
a36 1
# $FreeBSD: src/sys/modules/ath_rate_onoe/Makefile,v 1.4 2007/06/29 19:52:31 sam Exp $
@


1.4.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3
log
@o move ath hal os glue code from the hal to the driver: this code was
  part of the hal distribution early on when the hal was built for
  each os but it's been portable for a long time so move the os-specific
  code out (and off the vendor branch)
o correct the copyright on ah_osdep.?; it was mistakenly given a
  restricted license and not a dual-bsd/gpl license
o remove the module api definition as it was never used
o fixup include paths for move of ah_osdep.h

MFC after:	2 weeks
@
text
@d43 1
a43 1
SRCS+=	device_if.h bus_if.h pci_if.h opt_inet.h
d48 14
@


1.2
log
@Remove bridge(4) from the tree.  if_bridge(4) is a full functional
replacement and has additional features which make it superior.

Discussed on:	-arch
Reviewed by:	thompsa
X-MFC-after:	never (RELENG_6 as transition period)
@
text
@d46 1
a46 1
CFLAGS+=  -I. -I${HAL}/freebsd -I${HAL}
@


1.1
log
@Update/new modules for net80211 and ath changes.
@
text
@d43 1
a43 1
SRCS+=	opt_bdg.h device_if.h bus_if.h pci_if.h opt_inet.h
@


1.1.2.1
log
@MFC: move ah_osdep.[ch] from the hal to the driver; they will not
     be distributed with future versions of the hal

Approved by:	re (kensmith)
@
text
@d46 1
a46 1
CFLAGS+=  -I. -I${.CURDIR}/../../dev/ath -I${HAL}
@


1.1.2.2
log
@Switch importer
@
text
@d36 1
a36 1
# $FreeBSD: stable/6/sys/modules/ath_rate_onoe/Makefile 163396 2006-10-16 01:26:14Z sam $
@


1.1.2.1.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


