head	1.8;
access;
symbols
	RELENG_8_4:1.8.0.2
	RELENG_9_1_0_RELEASE:1.7.2.1.4.2
	RELENG_9_1:1.7.2.1.0.4
	RELENG_9_1_BP:1.7.2.1
	RELENG_8_3_0_RELEASE:1.2.2.4.2.1
	RELENG_8_3:1.2.2.4.0.2
	RELENG_8_3_BP:1.2.2.4
	RELENG_9_0_0_RELEASE:1.7.2.1.2.1
	RELENG_9_0:1.7.2.1.0.2
	RELENG_9_0_BP:1.7.2.1
	RELENG_9:1.7.0.2
	RELENG_9_BP:1.7
	RELENG_8_2_0_RELEASE:1.2.2.3.2.1
	RELENG_8_2:1.2.2.3.0.2
	RELENG_8_2_BP:1.2.2.3
	RELENG_8_1_0_RELEASE:1.2.2.2.2.1
	RELENG_8_1:1.2.2.2.0.2
	RELENG_8_1_BP:1.2.2.2
	RELENG_8_0_0_RELEASE:1.2.2.1.2.1
	RELENG_8_0:1.2.2.1.0.2
	RELENG_8_0_BP:1.2.2.1
	RELENG_8:1.2.0.2
	RELENG_8_BP:1.2;
locks; strict;
comment	@# @;


1.8
date	2012.11.17.01.52.56;	author svnexp;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2011.04.20.17.34.09;	author bschmidt;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2010.07.15.11.26.07;	author bschmidt;	state Exp;
branches;
next	1.5;

1.5
date	2009.12.29.19.47.34;	author rpaulo;	state Exp;
branches;
next	1.4;

1.4
date	2009.10.24.09.55.11;	author rpaulo;	state Exp;
branches;
next	1.3;

1.3
date	2009.10.23.22.04.18;	author rpaulo;	state Exp;
branches;
next	1.2;

1.2
date	2009.01.09.22.35.25;	author sam;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2008.04.29.21.36.17;	author sam;	state Exp;
branches;
next	;

1.8.2.1
date	2012.11.17.01.52.56;	author svnexp;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2013.03.28.13.05.21;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.11.37.17;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.7.2.1.2.2;

1.7.2.1.2.2
date	2012.11.17.08.37.14;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.7.2.1.4.2;

1.7.2.1.4.2
date	2012.11.17.08.48.04;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1;
next	1.2.2.2;

1.2.2.2
date	2010.01.20.15.22.34;	author kib;	state Exp;
branches
	1.2.2.2.2.1;
next	1.2.2.3;

1.2.2.3
date	2010.07.31.10.18.15;	author bschmidt;	state Exp;
branches
	1.2.2.3.2.1;
next	1.2.2.4;

1.2.2.4
date	2011.06.18.12.30.33;	author bschmidt;	state Exp;
branches
	1.2.2.4.2.1;
next	1.2.2.5;

1.2.2.5
date	2012.11.17.10.36.56;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.2.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.2.3.2.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.2.4.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.2.4.2.2;

1.2.2.4.2.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/iwnfw/Makefile 220893 2011-04-20 17:34:09Z bschmidt $

SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050

.include <bsd.subdir.mk>
@


1.8.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:21 +0000
@
text
@d1 5
@


1.8.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 5
# $FreeBSD: releng/8.4/sys/modules/iwnfw/Makefile 223256 2011-06-18 12:30:33Z bschmidt $

SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050

.include <bsd.subdir.mk>
@


1.7
log
@SVN rev 220893 on 2011-04-20 17:34:09Z by bschmidt

Add firmware images for the 6000 series g2a and g2b adapters.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.7.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/iwnfw/Makefile 220893 2011-04-20 17:34:09Z bschmidt $
@


1.7.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/iwnfw/Makefile 220893 2011-04-20 17:34:09Z bschmidt $
@


1.7.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/iwnfw/Makefile 220893 2011-04-20 17:34:09Z bschmidt $
@


1.6
log
@SVN rev 210113 on 2010-07-15 11:26:07Z by bschmidt

- Update 6000 firmware to 9.221.4.1
- Add 6050 firmware

MFC after:	2 weeks
@
text
@d3 1
a3 1
SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6050
@


1.5
log
@SVN rev 201209 on 2009-12-29 19:47:34Z by rpaulo

iwn(4) update. Notable changes:
* new firmware
* untested support for 1000 and 6000 series
* bgscan support
* remove unnecessary RXON changes
* allow setting of country/regdomain by enforcing channel flags read
  from the EEPROM
* suspend/resume fixes
* RF kill switch fixes
* LED adjustments
* several bus_dma*() related fixes
* addressed some LORs
* many other bug fixes

Submitted by:	Bernhard Schmidt <bschmidt at techwires.net>
Obtained from:	Brandon Gooch <jamesbrandongooch at gmail dot com> (LED
		related changes), Benjamin Kaduk <kaduk at mit dot edu>
		(LOR fixes), OpenBSD
@
text
@d3 1
a3 1
SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000
@


1.4
log
@SVN rev 198439 on 2009-10-24 09:55:11Z by rpaulo

Updates to the iwn driver:
* iwnfw has now been split into individual modules so autoloading of
  firmware module(s) does work again.
* Changes have been made to RUN -> AUTH transition, this should fix the
  issue reported by Glen and others.
* Brandon reported issues in iwn_cmd() with large commands, those have
  been fixed to.
* DEAUTH is now handled correctly.

Submitted by:	Bernhard Schmidt <bschmidt at techwires.net>
@
text
@d3 1
a3 1
SUBDIR=	iwn4965 iwn5000 iwn5150
@


1.3
log
@SVN rev 198429 on 2009-10-23 22:04:18Z by rpaulo

Updated iwn(4) driver supporting the newer series, 5000, 5150 and 5300.

Submitted by:	Bernhard Schmidt <bschmidt at techwires.net>
@
text
@d3 1
a3 2
FWDIR=	${.CURDIR}/../../contrib/dev/iwn
.PATH: ${FWDIR}
d5 1
a5 18
KMOD=	iwnfw
FIRMWS=	iwlwifi-4965-228.57.2.23.fw:iwnfw-4965:22857223 \
	iwlwifi-5000-5.4.A.11.fw:iwnfw-5000:54A11 \
	iwlwifi-5150-8.24.2.2.fw:iwnfw-5150:82422

CLEANFILES=	iwlwifi-4965-228.57.2.23.fw iwlwifi-5000-5.4.A.11.fw \
		iwlwifi-5150-8.24.2.2.fw

iwlwifi-4965-228.57.2.23.fw: ${FWDIR}/iwlwifi-4965-228.57.2.23.fw.uu
	uudecode -p ${FWDIR}/iwlwifi-4965-228.57.2.23.fw.uu > ${.TARGET}

iwlwifi-5000-5.4.A.11.fw: ${FWDIR}/iwlwifi-5000-5.4.A.11.fw.uu
	uudecode -p ${FWDIR}/iwlwifi-5000-5.4.A.11.fw.uu > ${.TARGET}

iwlwifi-5150-8.24.2.2.fw: ${FWDIR}/iwlwifi-5150-8.24.2.2.fw.uu
	uudecode -p ${FWDIR}/iwlwifi-5150-8.24.2.2.fw.uu > ${.TARGET}

.include <bsd.kmod.mk>
@


1.2
log
@SVN rev 186984 on 2009-01-09 22:35:25Z by sam

remove license ack requirement; this was never needed

Reviewed by:	core
@
text
@d3 2
a4 1
.PATH: ${.CURDIR}/../../contrib/dev/iwn
d7 3
a9 1
FIRMWS=	iwlwifi-4965-4.44.17.fw:iwnfw:44417
d11 2
a12 1
CLEANFILES=	iwlwifi-4965-4.44.17.fw
d14 8
a21 2
iwlwifi-4965-4.44.17.fw: ${.CURDIR}/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu
	uudecode -p ${.CURDIR}/../../contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu > ${.TARGET}
@


1.2.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.2.2
log
@SVN rev 202704 on 2010-01-20 15:22:34Z by kib

MFC r198429, r198439, r198468, r201209, r201822, r201882:
Syncronize iwn(4) driver in stable/8 with HEAD.

Approved by:	rpaulo
@
text
@d3 1
a3 1
SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000
d5 9
a13 1
.include <bsd.subdir.mk>
@


1.2.2.3
log
@SVN rev 210673 on 2010-07-31 10:18:15Z by bschmidt

MFC r210113:
- Update 6000 firmware to 9.221.4.1
- Add 6050 firmware
@
text
@d3 1
a3 1
SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6050
@


1.2.2.4
log
@SVN rev 223256 on 2011-06-18 12:30:33Z by bschmidt

MFC r220893:
- Add firmware images for the 6000 series g2a and g2b adapters.
@
text
@d3 1
a3 1
SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050
@


1.2.2.5
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/iwnfw/Makefile 223256 2011-06-18 12:30:33Z bschmidt $
@


1.2.2.4.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.2.4.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/iwnfw/Makefile 223256 2011-06-18 12:30:33Z bschmidt $
@


1.2.2.3.2.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.2.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.1
log
@Intel 4965 wireless driver (derived from openbsd driver of the same name)
@
text
@a6 1
FIRMWARE_LICENSE= intel_iwn
@

