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

1 files changed, 5 insertions, 4 deletions

diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c
index d93822e..975e6ee 100644
--- a/sys/compat/ndis/subr_ndis.c
+++ b/sys/compat/ndis/subr_ndis.c
@@ -769,12 +769,13 @@ ndis_syslog(ndis_handle adapter, ndis_error_code code,
 
 	block = (ndis_miniport_block *)adapter;
 
-	printf ("NDIS ERROR: %x\n", code);
-	printf ("NDIS NUMERRORS: %x\n", numerrors);
+	device_printf (block->nmb_dev, "NDIS ERROR: %x\n", code);
+	device_printf (block->nmb_dev, "NDIS NUMERRORS: %x\n", numerrors);
 
 	va_start(ap, numerrors);
 	for (i = 0; i < numerrors; i++)
-		printf ("argptr: %p\n", va_arg(ap, void *));
+		device_printf (block->nmb_dev, "argptr: %p\n",
+		    va_arg(ap, void *));
 	va_end(ap);
 
 	return;
@@ -1829,7 +1830,7 @@ ndis_assign_pcirsrc(adapter, slot, list)
 	block = (ndis_miniport_block *)adapter;
 	*list = block->nmb_rlist;
 
-	printf ("assign PCI resources...\n");
+	device_printf (block->nmb_dev, "assign PCI resources...\n");
 	return (NDIS_STATUS_SUCCESS);
 }