Clean up ndiscvt a bit (leaving out the -i flag didn't work) and add

copyrights to the inf parser files.

Add a -n flag to ndiscvt to allow the user to override the default
device name of NDIS devices. Instead of "ndis0, ndis1, etc..."
you can have "foo0, foo1, etc..." This allows you to have more than
one kind of NDIS device in the kernel at the same time.

Convert from printf() to device_printf() in if_ndis.c, kern_ndis.c
and subr_ndis.c.

Create UMA zones for ndis_packet and ndis_buffer structs allocated
on transmit. The zones are created and destroyed in the modevent
handler in kern_ndis.c.

printf() and UMA changes submitted by green@freebsd.org

5 files changed, 115 insertions, 8 deletions

diff --git a/usr.sbin/ndiscvt/inf-parse.y b/usr.sbin/ndiscvt/inf-parse.y
index 05be126..8a84956 100644
--- a/usr.sbin/ndiscvt/inf-parse.y
+++ b/usr.sbin/ndiscvt/inf-parse.y
@@ -1,6 +1,34 @@
 %{
 /*
- * $Id: inf-parse.y,v 1.3 2003/11/30 21:58:16 winter Exp $
+ * Copyright (c) 2003
+ *	Bill Paul <wpaul@windriver.com>.  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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index 4f192c5..c6c08b9 100644
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -1,6 +1,34 @@
 %{
 /*
- * $Id: inf-token.l,v 1.2 2003/11/30 20:41:06 winter Exp $
+ * Copyright (c) 2003
+ *	Bill Paul <wpaul@windriver.com>.  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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/ndiscvt/inf.c b/usr.sbin/ndiscvt/inf.c
index 8a9d234..115d626 100644
--- a/usr.sbin/ndiscvt/inf.c
+++ b/usr.sbin/ndiscvt/inf.c
@@ -1,5 +1,33 @@
 /*
- * $Id: inf.c,v 1.3 2003/11/30 21:58:16 winter Exp $
+ * Copyright (c) 2003
+ *	Bill Paul <wpaul@windriver.com>.  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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
index caaa99c..7d6fb9cc1c 100644
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ b/usr.sbin/ndiscvt/ndiscvt.8
@@ -40,6 +40,7 @@
 .Nm
 .Op Fl i Ar <inffile>
 .Fl s Ar <sysfile>
+.Op Fl n Ar devname
 .Op Fl o Ar <outfile>
 .Sh DESCRIPTION
 The
@@ -93,6 +94,14 @@ a Windows(r) driver image. The
 utility will perform some manipulation of the sections within the
 executable file to make runtime linking within the kernel a little
 easier and then convert the image into a data array.
+.It Op Fl n Ar devname
+Specify an alternate name for the network device/interface which will
+be created when the driver is instantiated. If you need to load more
+than one NDIS driver into your system (i.e. if you have two different
+network cards in your system which require NDIS driver support), each
+module you create must have a unique name. Device can not be larger
+than IFNAMSIZ. If no name is specified, the driver will use the
+default a default name (``ndis'').
 .It Op Fl o Ar <outfile>
 Specify the output file in which to place the resulting data. This
 can be any file pathname. If
diff --git a/usr.sbin/ndiscvt/ndiscvt.c b/usr.sbin/ndiscvt/ndiscvt.c
index 6e34fae..1fde290 100644
--- a/usr.sbin/ndiscvt/ndiscvt.c
+++ b/usr.sbin/ndiscvt/ndiscvt.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/queue.h>
+#include <sys/socket.h>
+#include <net/if.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -156,7 +158,7 @@ static void
 usage(void)
 {
 	fprintf(stderr, "Usage: %s [-i <inffile>] -s <sysfile> "
-	    "[-o outfile]\n", __progname);
+	    "[-d devname] [-o outfile]\n", __progname);
 	exit(1);
 }
 
@@ -169,9 +171,10 @@ main(int argc, char *argv[])
 	unsigned char	*ptr;
 	int		i;
 	char		*inffile = NULL, *sysfile = NULL, *outfile = NULL;
+	char		*dname = NULL;
 	int		ch;
 
-	while((ch = getopt(argc, argv, "i:s:o:")) != -1) {
+	while((ch = getopt(argc, argv, "i:s:o:n:")) != -1) {
 		switch(ch) {
 		case 'i':
 			inffile = optarg;
@@ -182,6 +185,9 @@ main(int argc, char *argv[])
 		case 'o':
 			outfile = optarg;
 			break;
+		case 'n':
+			dname = optarg;
+			break;
 		default:
 			usage();
 			break;
@@ -218,12 +224,20 @@ main(int argc, char *argv[])
 
 	fprintf(outfp, "\n/*\n");
 	fprintf(outfp, " * Generated from %s and %s (%d bytes)\n",
-	    inffile, sysfile, fsize);
+	    inffile == NULL ? "<notused>" : inffile, sysfile, fsize);
 	fprintf(outfp, " */\n\n");
 
-	if (fp == NULL) {
+	if (dname != NULL) {
+		if (strlen(dname) > IFNAMSIZ)
+			err(1, "selected device name '%s' is "
+			    "too long (max chars: %d)", dname, IFNAMSIZ);
+		fprintf (outfp, "#define NDIS_DEVNAME \"%s\"\n", dname);
+		fprintf (outfp, "#define NDIS_MODNAME %s\n", dname);
+	}
+
+	if (inffile == NULL) {
 		fprintf (outfp, "ndis_cfg ndis_regvals[] = {\n");
-        	fprintf (outfp, "\t{ NULL, NULL, ndis_parm_int, { 0 } }\n");
+        	fprintf (outfp, "\t{ NULL, NULL, { 0 }, 0 }\n");
 
 		fprintf (outfp, "};\n\n");
 	} else {