head	1.9;
access;
symbols
	RELENG_8_4:1.9.0.2
	RELENG_9_1_0_RELEASE:1.7.28.2.2.2
	RELENG_9_1:1.7.28.2.0.2
	RELENG_9_1_BP:1.7.28.2
	RELENG_8_3_0_RELEASE:1.7.22.1.8.1
	RELENG_8_3:1.7.22.1.0.8
	RELENG_8_3_BP:1.7.22.1
	RELENG_9_0_0_RELEASE:1.7.28.1.2.1
	RELENG_9_0:1.7.28.1.0.2
	RELENG_9_0_BP:1.7.28.1
	RELENG_9:1.7.0.28
	RELENG_9_BP:1.7
	RELENG_7_4_0_RELEASE:1.7.26.1
	RELENG_8_2_0_RELEASE:1.7.22.1.6.1
	RELENG_7_4:1.7.0.26
	RELENG_7_4_BP:1.7
	RELENG_8_2:1.7.22.1.0.6
	RELENG_8_2_BP:1.7.22.1
	RELENG_8_1_0_RELEASE:1.7.22.1.4.1
	RELENG_8_1:1.7.22.1.0.4
	RELENG_8_1_BP:1.7.22.1
	RELENG_7_3_0_RELEASE:1.7.24.1
	RELENG_7_3:1.7.0.24
	RELENG_7_3_BP:1.7
	RELENG_8_0_0_RELEASE:1.7.22.1.2.1
	RELENG_8_0:1.7.22.1.0.2
	RELENG_8_0_BP:1.7.22.1
	RELENG_8:1.7.0.22
	RELENG_8_BP:1.7
	RELENG_7_2_0_RELEASE:1.7.20.1
	RELENG_7_2:1.7.0.20
	RELENG_7_2_BP:1.7
	RELENG_7_1_0_RELEASE:1.7.18.1
	RELENG_6_4_0_RELEASE:1.7.16.1
	RELENG_7_1:1.7.0.18
	RELENG_7_1_BP:1.7
	RELENG_6_4:1.7.0.16
	RELENG_6_4_BP:1.7
	RELENG_7_0_0_RELEASE:1.7
	RELENG_6_3_0_RELEASE:1.7
	RELENG_7_0:1.7.0.14
	RELENG_7_0_BP:1.7
	RELENG_6_3:1.7.0.12
	RELENG_6_3_BP:1.7
	RELENG_7:1.7.0.10
	RELENG_7_BP:1.7
	RELENG_6_2_0_RELEASE:1.7
	RELENG_6_2:1.7.0.8
	RELENG_6_2_BP:1.7
	RELENG_5_5_0_RELEASE:1.5.2.2
	RELENG_5_5:1.5.2.2.0.2
	RELENG_5_5_BP:1.5.2.2
	RELENG_6_1_0_RELEASE:1.7
	RELENG_6_1:1.7.0.6
	RELENG_6_1_BP:1.7
	RELENG_6_0_0_RELEASE:1.7
	RELENG_6_0:1.7.0.4
	RELENG_6_0_BP:1.7
	RELENG_6:1.7.0.2
	RELENG_6_BP:1.7
	RELENG_5_4_0_RELEASE:1.5
	RELENG_5_4:1.5.0.6
	RELENG_5_4_BP:1.5
	RELENG_5_3_0_RELEASE:1.5
	RELENG_5_3:1.5.0.4
	RELENG_5_3_BP:1.5
	RELENG_5:1.5.0.2
	RELENG_5_BP:1.5;
locks; strict;
comment	@# @;


1.9
date	2012.11.17.01.54.50;	author svnexp;	state Exp;
branches
	1.9.2.1;
next	1.8;

1.8
date	2011.12.17.22.16.27;	author dim;	state Exp;
branches;
next	1.7;

1.7
date	2005.04.24.20.21.22;	author wpaul;	state Exp;
branches
	1.7.2.1
	1.7.10.1
	1.7.16.1
	1.7.18.1
	1.7.20.1
	1.7.22.1
	1.7.24.1
	1.7.26.1
	1.7.28.1;
next	1.6;

1.6
date	2004.09.26.09.24.15;	author ru;	state Exp;
branches;
next	1.5;

1.5
date	2004.02.23.20.21.21;	author johan;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2003.12.18.03.52.40;	author wpaul;	state Exp;
branches;
next	1.3;

1.3
date	2003.12.18.03.51.21;	author wpaul;	state Exp;
branches;
next	1.2;

1.2
date	2003.12.11.23.22.44;	author wpaul;	state Exp;
branches;
next	1.1;

1.1
date	2003.12.11.22.38.14;	author wpaul;	state Exp;
branches;
next	;

1.9.2.1
date	2012.11.17.01.54.50;	author svnexp;	state dead;
branches;
next	1.9.2.2;

1.9.2.2
date	2013.03.28.13.06.20;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2012.11.17.07.46.26;	author svnexp;	state Exp;
branches;
next	;

1.7.10.1
date	2012.11.17.08.09.03;	author svnexp;	state Exp;
branches;
next	;

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

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

1.7.20.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.7.22.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.7.22.1.2.1
	1.7.22.1.4.1
	1.7.22.1.6.1
	1.7.22.1.8.1;
next	1.7.22.2;

1.7.22.2
date	2012.11.17.10.37.24;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.7.22.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.7.22.1.8.2;

1.7.22.1.8.2
date	2012.11.17.08.25.56;	author svnexp;	state Exp;
branches;
next	;

1.7.24.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.7.26.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.7.26.2;

1.7.26.2
date	2012.11.17.08.17.48;	author svnexp;	state Exp;
branches;
next	;

1.7.28.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.7.28.1.2.1;
next	1.7.28.2;

1.7.28.2
date	2012.01.01.23.08.19;	author dim;	state Exp;
branches
	1.7.28.2.2.1;
next	1.7.28.3;

1.7.28.3
date	2012.11.17.11.37.45;	author svnexp;	state Exp;
branches;
next	;

1.7.28.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.7.28.1.2.2;

1.7.28.1.2.2
date	2012.11.17.08.37.42;	author svnexp;	state Exp;
branches;
next	;

1.7.28.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.7.28.2.2.2;

1.7.28.2.2.2
date	2012.11.17.08.48.33;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2005.05.22.18.18.13;	author wpaul;	state Exp;
branches;
next	1.5.2.2;

1.5.2.2
date	2005.10.20.17.10.21;	author wpaul;	state Exp;
branches;
next	;


desc
@@


1.9
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/usr.sbin/ndiscvt/Makefile 228665 2011-12-17 22:16:27Z dim $

.PATH:	${.CURDIR}/../../sys/compat/ndis

PROG=	ndiscvt
SRCS=	ndiscvt.c
SRCS+=	subr_pe.c
SRCS+=	inf.c inf-token.l inf-parse.y y.tab.h

MAN=	ndiscvt.8
MAN+=	ndisgen.8

WARNS?=	4
NO_WCAST_ALIGN=

DPADD=  ${LIBL}
LDADD=  -ll

YFLAGS+=-v

CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys

CLEANFILES= y.output

FILES= windrv_stub.c
FILESNAME= windrv_stub.c
FILESDIR= /usr/share/misc

SCRIPTS= ndisgen.sh

.include <bsd.prog.mk>
@


1.9.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:20 +0000
@
text
@d1 31
@


1.9.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 30
# $FreeBSD: releng/8.4/usr.sbin/ndiscvt/Makefile 145485 2005-04-24 20:21:22Z wpaul $

.PATH:	${.CURDIR}/../../sys/compat/ndis

PROG=	ndiscvt
SRCS=	ndiscvt.c
SRCS+=	subr_pe.c
SRCS+=	inf.c inf-token.l inf-parse.y y.tab.h

MAN=	ndiscvt.8
MAN+=	ndisgen.8

WARNS?=	4

DPADD=  ${LIBL}
LDADD=  -ll

YFLAGS+=-v

CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys

CLEANFILES= y.output

FILES= windrv_stub.c
FILESNAME= windrv_stub.c
FILESDIR= /usr/share/misc

SCRIPTS= ndisgen.sh

.include <bsd.prog.mk>
@


1.8
log
@SVN rev 228665 on 2011-12-17 22:16:27Z by dim

Use NO_WCAST_ALIGN for usr.sbin/ndiscvt; because this is only built for
x86, any alignment warnings can be safely ignored.  Define YY_NO_INPUT
in usr.sbin/ndiscvt/inf-token.l, so no unused lex functions are defined.

MFC after:	1 week
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.7
log
@Throw the switch on the new driver generation/loading mechanism. From
here on in, if_ndis.ko will be pre-built as a module, and can be built
into a static kernel (though it's not part of GENERIC). Drivers are
created using the new ndisgen(8) script, which uses ndiscvt(8) under
the covers, along with a few other tools. The result is a driver module
that can be kldloaded into the kernel.

A driver with foo.inf and foo.sys files will be converted into
foo_sys.ko (and foo_sys.o, for those who want/need to make static
kernels). This module contains all of the necessary info from the
.INF file and the driver binary image, converted into an ELF module.
You can kldload this module (or add it to /boot/loader.conf) to have
it loaded automatically. Any required firmware files can be bundled
into the module as well (or converted/loaded separately).

Also, add a workaround for a problem in NdisMSleep(). During system
bootstrap (cold == 1), msleep() always returns 0 without actually
sleeping. The Intel 2200BG driver uses NdisMSleep() to wait for
the NIC's firmware to come to life, and fails to load if NdisMSleep()
doesn't actually delay. As a workaround, if msleep() (and hence
ndis_thsuspend()) returns 0, use a hard DELAY() to sleep instead).
This is not really the right thing to do, but we can't really do much
else. At the very least, this makes the Intel driver happy.

There are probably other drivers that fail in this way during bootstrap.
Unfortunately, the only workaround for those is to avoid pre-loading
them and kldload them once the system is running instead.
@
text
@d14 1
@


1.7.10.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/ndiscvt/Makefile 145485 2005-04-24 20:21:22Z wpaul $
@


1.7.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/ndiscvt/Makefile 145485 2005-04-24 20:21:22Z wpaul $
@


1.7.28.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.28.2
log
@SVN rev 229228 on 2012-01-01 23:08:19Z by dim

MFC r228665:

Use NO_WCAST_ALIGN for usr.sbin/ndiscvt; because this is only built for
x86, any alignment warnings can be safely ignored.  Define YY_NO_INPUT
in usr.sbin/ndiscvt/inf-token.l, so no unused lex functions are defined.
@
text
@a13 1
NO_WCAST_ALIGN=
@


1.7.28.3
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/usr.sbin/ndiscvt/Makefile 229228 2012-01-01 23:08:19Z dim $
@


1.7.28.2.2.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.28.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/ndiscvt/Makefile 229228 2012-01-01 23:08:19Z dim $
@


1.7.28.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.28.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/ndiscvt/Makefile 145485 2005-04-24 20:21:22Z wpaul $
@


1.7.26.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.7.26.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/ndiscvt/Makefile 145485 2005-04-24 20:21:22Z wpaul $
@


1.7.24.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.7.22.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.7.22.2
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/usr.sbin/ndiscvt/Makefile 145485 2005-04-24 20:21:22Z wpaul $
@


1.7.22.1.8.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.7.22.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/ndiscvt/Makefile 145485 2005-04-24 20:21:22Z wpaul $
@


1.7.22.1.6.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.7.22.1.4.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.7.22.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.7.20.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.7.18.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.7.16.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
@@


1.6
log
@Get rid of obsolete MAN[0-9] syntax.
@
text
@d11 1
d24 6
@


1.5
log
@style.Makefile(5):
	Use WARNS?= instead of WARNS=.
@
text
@d10 1
a10 1
MAN8=	ndiscvt.8
@


1.5.2.1
log
@Sync everything up with -current, except for the WPA support, which
won't work with the 5.x version of net80211. This includes all fixes
to date, and support for new cards such as the AirGo MIMO and Ralink
RT2500. This also includes the new driver configuration/conversion
mechanism. Remember that you should use ndisgen(8) to create new
drivers now, and if_ndis.ko will always be pre-built.
@
text
@a22 6
FILES= windrv_stub.c
FILESNAME= windrv_stub.c
FILESDIR= /usr/share/misc

SCRIPTS= ndisgen.sh

@


1.5.2.2
log
@MFC updates from the head:

- install ndisgen.8 man page
- fixes for ndisgen.8 man page
- fixes for ndisgen.sh script to make it work correctly on amd64 and
  various documentation cleanups
@
text
@a10 1
MAN8=	ndisgen.8
@


1.4
log
@Grrrr. Remove -g flag that snuck in.
@
text
@d12 1
a12 1
WARNS=	4
@


1.3
log
@Deal with the duplicate sysctl leaf problem. A .inf file may contain
definitions for more than one device (usually differentiated by
the PCI subvendor/subdevice ID). Each device also has its own tree
of registry keys. In some cases, each device has the same keys, but
sometimes each device has a unique tree but with overlap. Originally,
I just had ndiscvt(8) dump out all the keys it could find, and we
would try to apply them to every device we could find. Now, each key
has an index number that matches it to a device in the device ID list.
This lets us create just the keys that apply to a particular device.

I also added an extra field to the device list to hold the subvendor
and subdevice ID.

Some devices are generic, i.e. there is no subsystem definition. If
we have a device that doesn't match a specific subsystem value and
we have a generic entry, we use the generic entry.
@
text
@d19 1
a19 1
CFLAGS+=-g -I. -I${.CURDIR} -I${.CURDIR}/../../sys
@


1.2
log
@Grrr. Put the right .PATH statements in the right Makefiles.
@
text
@d19 1
a19 1
CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys
@


1.1
log
@Commit the ndiscvt(8) utility too. (Missed it in the last import.)
@
text
@d3 1
a3 1
.PATH:	${.CURDIR}/../../sys/dev/ndis
@

